From 36b9704fa813385e0a2bb15392d505e4f94974e4 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 9 Jan 2020 10:22:15 +1100 Subject: [PATCH 01/32] Start preparing for version 7.15 --- INSTALL | 8 ++++---- NEWS | 6 ++++++ configure.ac | 2 +- po/da.po | 4 ++-- po/de.po | 4 ++-- po/en_AU.po | 4 ++-- po/en_CA.po | 4 ++-- po/en_GB.po | 4 ++-- po/en_US.po | 4 ++-- po/eo.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/hr.po | 4 ++-- po/hu.po | 4 ++-- po/nb.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ru.po | 4 ++-- po/sr.po | 4 ++-- po/sv.po | 4 ++-- 19 files changed, 43 insertions(+), 37 deletions(-) diff --git a/INSTALL b/INSTALL index c1bc25b..767b5d9 100644 --- a/INSTALL +++ b/INSTALL @@ -142,11 +142,11 @@ 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.14`, you could run something like:: +`$HOME/src/trader-7.15`, you could run something like:: - mkdir $HOME/build/trader-build-7.14 - cd $HOME/build/trader-build-7.14 - $HOME/src/trader-7.14/configure + mkdir $HOME/build/trader-build-7.15 + cd $HOME/build/trader-build-7.15 + $HOME/src/trader-7.15/configure Once again, the `Autoconf manual`__ describes these options (and many others). diff --git a/NEWS b/NEWS index 2666e48..cb26e9b 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,12 @@ __ https://www.zap.org.au/ .. contents:: +Version 7.15 (not yet released) +------------------------------- + +(No changes yet) + + Version 7.14 (9th January, 2020) -------------------------------- diff --git a/configure.ac b/configure.ac index e2373dd..1e1ee71 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 https://www.gnu.org/licenses/. -AC_INIT([Star Traders], [7.14], [J.Zaitseff@zap.org.au], [trader], +AC_INIT([Star Traders], [7.15], [J.Zaitseff@zap.org.au], [trader], [https://www.zap.org.au/projects/trader/]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) diff --git a/po/da.po b/po/da.po index 8533686..217fed4 100644 --- a/po/da.po +++ b/po/da.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:21+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" diff --git a/po/de.po b/po/de.po index fb5ae14..c7e019e 100644 --- a/po/de.po +++ b/po/de.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:21+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\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 112b4b6..afb68bc 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:35+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 9538b05..1a7da86 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index 0efdbab..eec641a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index 0724d6f..4dc9539 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" "Language: en_US\n" diff --git a/po/eo.po b/po/eo.po index 5eb2d16..f7fd61e 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-08 09:09+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" diff --git a/po/fi.po b/po/fi.po index 6a45eae..ab34f52 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr.po b/po/fr.po index 3282c13..de2c189 100644 --- a/po/fr.po +++ b/po/fr.po @@ -19,10 +19,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\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 578cdf3..e537750 100644 --- a/po/hr.po +++ b/po/hr.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" diff --git a/po/hu.po b/po/hu.po index a00b5fe..d47033e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\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 354b512..03f182c 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 83f68e5..2a81a5e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" diff --git a/po/ru.po b/po/ru.po index b73db72..56d4a9a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,10 +15,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/po/sr.po b/po/sr.po index 99918c1..a82aac5 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" diff --git a/po/sv.po b/po/sv.po index 131c296..d995ba3 100644 --- a/po/sv.po +++ b/po/sv.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.14\n" +"Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-02 08:36+1100\n" +"PO-Revision-Date: 2020-01-09 10:21+1100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" From 7574f952e6dce0c5f7975fb8af91b202301af446 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 11 Jan 2020 06:06:33 +1100 Subject: [PATCH 02/32] Update sv.po to the latest version from the Translation Project --- po/sv.po | 278 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 211 insertions(+), 67 deletions(-) diff --git a/po/sv.po b/po/sv.po index 7446e55..e79cf73 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,14 +8,14 @@ # This file is distributed under the same license as the trader package. # # Contributors: -# Anders Jonsson , 2015, 2017. +# Anders Jonsson , 2015, 2017, 2020. # msgid "" msgstr "" -"Project-Id-Version: trader 7.10-pre1\n" +"Project-Id-Version: trader 7.14\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-05-23 09:01+1000\n" -"PO-Revision-Date: 2017-05-22 07:17+1000\n" +"POT-Creation-Date: 2020-01-09 08:05+1100\n" +"PO-Revision-Date: 2020-01-09 13:09+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -24,23 +24,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.2.4\n" #. TRANSLATORS: The name of the game. You may choose to translate it into #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:22 src/intf.c:610 +#: data/trader.desktop.in:23 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:23 +#: data/trader.desktop.in:24 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Spela Star Traders, ett enkelt spel om interstellär handel" #. TRANSLATORS: A list of keywords describing Star Traders. By all means #. add your own keywords! -#: data/trader.desktop.in:26 +#: data/trader.desktop.in:27 msgid "game;interstellar;trading;strategy;" msgstr "spel;interstellär;handel;strategi;" @@ -48,7 +49,7 @@ msgstr "spel;interstellär;handel;strategi;" #. Entry Specification states it is translatable, but unless you provide a #. matching icon, please leave it as "trader": this will use trader.svg #. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:31 +#: data/trader.desktop.in:32 msgid "trader" msgstr "trader" @@ -151,9 +152,9 @@ msgstr "" #. 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 +#. the email address for reporting bugs. Please add ANOTHER line +#. with the (translated) text "Report translation bugs to +#.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. #: src/trader.c:334 #, c-format @@ -162,10 +163,10 @@ msgstr "" "Rapportera fel till %s <%s>.\n" "Rapportera synpunkter på översättningen till \n" -#. TRANSLATORS: %s is the e-mail address for reporting bugs. As +#. TRANSLATORS: %s is the email 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 +#. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. #: src/trader.c:341 #, c-format @@ -348,49 +349,54 @@ msgstr "Ange spelnummer [^{1^}-^{9^}] eller ^{^} för att avbryta: " msgid "Please enter your name: " msgstr "Ange ditt namn: " -#: src/game.c:425 +#. TRANSLATORS: Note that you should replace "Y" and "N" +#. with the localised upper-case characters used in the +#. "input|Yes" and "input|No" strings. There are other +#. strings in this game, each with "[^{Y^}/^{N^}]", that +#. need the same replacement. +#: src/game.c:430 #, c-format msgid "Do you need any instructions? [^{Y^}/^{N^}] " msgstr "Behöver du instruktioner? [^{J^}/^{N^}] " -#: src/game.c:443 +#: src/game.c:448 #, c-format msgid " Enter Player Names " msgstr " Ange spelarnamn " -#: src/game.c:451 +#: src/game.c:456 #, c-format, range: 1..8 msgid "Player %d: " msgstr "Spelare %d: " -#: src/game.c:529 +#: src/game.c:534 #, c-format msgid "Does any player need instructions? [^{Y^}/^{N^}] " msgstr "Behöver någon spelare instruktioner? [^{J^}/^{N^}] " -#: src/game.c:563 +#: src/game.c:568 #, c-format msgid " Game Over " msgstr " Spelet är slut " -#: src/game.c:564 +#: src/game.c:569 #, c-format msgid "The game is over after one turn." msgid_plural "The game is over after %d turns." msgstr[0] "Spelet är slut efter en omgång." msgstr[1] "Spelet är slut efter %d omgångar." -#: src/game.c:575 +#: src/game.c:580 #, c-format msgid " Total Value " msgstr " Totalt värde " -#: src/game.c:577 +#: src/game.c:582 #, c-format msgid "Your total value was ^{%N^}." msgstr "Ditt totala värde var ^{%N^}." -#: src/game.c:588 +#: src/game.c:593 #, c-format msgid "" "The winner is ^{%ls^}\n" @@ -399,7 +405,7 @@ msgstr "" "Vinnaren är ^{%ls^}\n" "som är ^[*** BANKRUTT ***^]" -#: src/game.c:591 +#: src/game.c:596 #, c-format msgid "" "The winner is ^{%ls^}\n" @@ -408,14 +414,14 @@ msgstr "" "Vinnaren är ^{%ls^}\n" "med ett värde på ^{%N^}." -#: src/game.c:597 +#: src/game.c:602 #, c-format msgid " Game Winner " msgstr " Vinnare av spelet " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:882 +#: src/game.c:611 src/move.c:882 #, c-format msgctxt "subtitle" msgid "Player" @@ -424,48 +430,48 @@ msgstr "Spelare" #. TRANSLATORS: "Total Value" refers to the total worth #. (shares, cash and debt) of any given player. %ls is the #. currency symbol of the current locale. -#: src/game.c:611 +#: src/game.c:616 #, c-format msgctxt "subtitle" msgid "Total Value (%ls)" msgstr "Totalt värde (%ls)" -#: src/game.c:645 src/game.c:695 src/exch.c:100 +#: src/game.c:650 src/game.c:700 src/exch.c:100 #, c-format msgid "Player: ^{%ls^}" msgstr "Spelare: ^{%ls^}" -#: src/game.c:648 +#: src/game.c:653 #, c-format msgid " Turn: ^{%d^} " msgstr " Omgång: ^{%d^} " # Turn vs move -#: src/game.c:649 +#: src/game.c:654 #, c-format msgid " ^[*** Last Turn ***^] " msgstr " ^[*** Sista omgången ***^] " -#: src/game.c:693 +#: src/game.c:698 #, c-format msgid " Stock Portfolio " msgstr " Aktieportfölj " #. TRANSLATORS: The current player is bankrupt (has no #. shares or cash, ie, whose total value is zero) -#: src/game.c:702 +#: src/game.c:707 #, c-format msgid "^[* * * B A N K R U P T * * *^]" msgstr "^[* * * B A N K R U T T * * *^]" -#: src/game.c:717 src/exch.c:112 +#: src/game.c:722 src/exch.c:112 #, c-format msgid "No companies on the map" msgstr "Inga företag på kartan" #. TRANSLATORS: "Company" is a two-line column label in #. a table containing a list of companies. -#: src/game.c:725 src/exch.c:120 +#: src/game.c:730 src/exch.c:120 #, c-format msgctxt "subtitle" msgid "" @@ -480,7 +486,7 @@ msgstr "" #. percentage ownership in any given company. The #. maximum column width is 10 characters (see #. OWNERSHIP_COLS in src/intf.h). -#: src/game.c:732 +#: src/game.c:737 #, c-format msgctxt "subtitle" msgid "" @@ -495,7 +501,7 @@ msgstr "" #. 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 +#: src/game.c:744 #, c-format msgctxt "subtitle" msgid "" @@ -509,7 +515,7 @@ msgstr "" #. 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 +#: src/game.c:751 src/exch.c:141 #, c-format msgctxt "subtitle" msgid "" @@ -525,7 +531,7 @@ msgstr "" #. 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 +#: src/game.c:760 src/exch.c:150 #, c-format msgctxt "subtitle" msgid "" @@ -544,25 +550,25 @@ msgstr "" #. #. Note that some of these labels are used for both the #. Player Status window and the Trading Bank window. -#: src/game.c:796 +#: src/game.c:801 #, c-format msgctxt "label" msgid "Total value: " msgstr "Totalt värde: " -#: src/game.c:800 src/exch.c:324 +#: src/game.c:805 src/exch.c:324 #, c-format msgctxt "label" msgid "Current cash: " msgstr "Aktuella kontanter: " -#: src/game.c:807 src/exch.c:332 +#: src/game.c:812 src/exch.c:332 #, c-format msgctxt "label" msgid "Current debt: " msgstr "Aktuell skuld: " -#: src/game.c:813 src/exch.c:337 +#: src/game.c:818 src/exch.c:337 #, c-format msgctxt "label" msgid "Interest rate: " @@ -705,8 +711,8 @@ msgstr "Gammal aktie: " #: src/move.c:875 #, c-format msgctxt "label" -msgid "New Stock: " -msgstr "Ny aktie: " +msgid "New stock: " +msgstr "Ny aktie: " #. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to #. each player after two companies merge. %ls is the currency @@ -1306,7 +1312,7 @@ msgstr "" #. ~y - Print the height of the galaxy map (MAX_Y) [**] #. ~m - Print the number of moves available (NUMBER_MOVES) [**] #. ~c - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*] -#. ~t - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**] +#. ~t - Print the default number of turns in the game (DEFAULT_MAX_TURN) [**] #. ~1 to ~9 - Print the keycode for the N-th choice of move [***] #. ~M - Print the keycode for the last choice of move [***] #. ~A to ~H - Print the character used to represent the company on the galaxy map [***] @@ -1580,7 +1586,7 @@ msgstr "Sida %1$d av %2$d" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:486 src/intf.c:3035 +#: src/help.c:486 src/intf.c:3026 #, c-format msgid "[ Press to continue ] " msgstr "[ Tryck för att fortsätta ] " @@ -1608,17 +1614,17 @@ msgstr "%s: sträng har felaktigt format: ”%s”" msgid "%s: character has illegal width: '%lc'" msgstr "%s: tecken har ogiltig bredd: ”%lc”" -#: src/intf.c:434 +#: src/intf.c:435 #, c-format msgid "terminal size is too small (%d x %d required)" msgstr "terminalstorlek är för liten (%d x %d krävs)" -#: src/intf.c:1265 +#: src/intf.c:1267 #, c-format msgid "mkchstr_conv: NUL" msgstr "mkchstr_conv: NUL" -#: src/intf.c:1568 +#: src/intf.c:1559 #, c-format msgid "mkchstr: '%s'" msgstr "mkchstr: ”%s”" @@ -1628,12 +1634,12 @@ msgstr "mkchstr: ”%s”" #. 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 +#: src/intf.c:2011 msgctxt "input|DefaultValue" msgid "=;" msgstr "=;" -#: src/intf.c:2034 src/intf.c:2079 +#: src/intf.c:2025 src/intf.c:2070 #, c-format msgid "gettxline: illegal character in string: '%ls'" msgstr "gettxline: ogiltigt tecken i sträng: ”%ls”" @@ -1642,12 +1648,12 @@ msgstr "gettxline: ogiltigt tecken i sträng: ”%ls”" #. "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 +#: src/intf.c:2943 msgctxt "input|Yes" msgid "Yy" msgstr "JjYy" -#: src/intf.c:2954 +#: src/intf.c:2945 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1655,76 +1661,214 @@ 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 +#: src/intf.c:2996 msgctxt "answer" msgid "Yes" msgstr "Ja" -#: src/intf.c:3007 +#: src/intf.c:2998 msgctxt "answer" msgid "No" msgstr "Nej" -#: src/utils.c:378 src/utils.c:399 +#: src/utils.c:417 src/utils.c:438 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:404 +#: src/utils.c:443 msgid ": " msgstr ": " -#: src/utils.c:417 +#: src/utils.c:456 #, c-format msgid "out of memory" msgstr "slut på minne" -#: src/utils.c:1041 +#: src/utils.c:1110 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ”%s”" -#: src/utils.c:1081 +#: src/utils.c:1150 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1086 +#: src/utils.c:1155 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" -#: lib/getopt.c:278 +#: lib/getopt.c:278 lib/obsolete-strings.c:45 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: flaggan ”%s%s” är tvetydig\n" -#: lib/getopt.c:284 +#: lib/getopt.c:284 lib/obsolete-strings.c:47 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: flaggan ”%s%s” är tvetydig; möjligheter:" -#: lib/getopt.c:319 +#: lib/getopt.c:319 lib/obsolete-strings.c:49 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: okänd flagga ”%s%s”\n" -#: lib/getopt.c:345 +#: lib/getopt.c:345 lib/obsolete-strings.c:51 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: flaggan ”%s%s” tar inget argument\n" -#: lib/getopt.c:360 +#: lib/getopt.c:360 lib/obsolete-strings.c:53 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: flaggan ”%s%s” kräver ett argument\n" -#: lib/getopt.c:621 +#: lib/getopt.c:621 lib/obsolete-strings.c:55 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ogiltig flagga -- ”%c”\n" -#: lib/getopt.c:636 lib/getopt.c:682 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaggan kräver ett argument -- ”%c”\n" + +#. TRANSLATORS: These strings are used in older versions of various +#. libraries, such as the GNU C Library as released with various +#. Linux distributions. +#: lib/obsolete-strings.c:44 +#, c-format +msgid "%s: option `%s%s' is ambiguous\n" +msgstr "%s: flaggan ”%s%s” är tvetydig\n" + +#: lib/obsolete-strings.c:46 +#, c-format +msgid "%s: option `%s%s' is ambiguous; possibilities:" +msgstr "%s: flaggan ”%s%s” är tvetydig; möjligheter:" + +#: lib/obsolete-strings.c:48 +#, c-format +msgid "%s: unrecognized option `%s%s'\n" +msgstr "%s: okänd flagga ”%s%s”\n" + +#: lib/obsolete-strings.c:50 +#, c-format +msgid "%s: option `%s%s' doesn't allow an argument\n" +msgstr "%s: flaggan ”%s%s” tar inget argument\n" + +#: lib/obsolete-strings.c:52 +#, c-format +msgid "%s: option `%s%s' requires an argument\n" +msgstr "%s: flaggan ”%s%s” kräver ett argument\n" + +#: lib/obsolete-strings.c:54 +#, c-format +msgid "%s: invalid option -- `%c'\n" +msgstr "%s: ogiltig flagga -- ”%c”\n" + +#: lib/obsolete-strings.c:56 +#, c-format +msgid "%s: option requires an argument -- `%c'\n" +msgstr "%s: flaggan kräver ett argument -- ”%c”\n" + +#: lib/obsolete-strings.c:59 +#, c-format +msgid "%s: option `%s' is ambiguous; possibilities:" +msgstr "%s: flaggan ”%s” är tvetydig; möjligheter:" + +#: lib/obsolete-strings.c:60 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: flaggan ”%s” är tvetydig; möjligheter:" + +#: lib/obsolete-strings.c:61 +#, c-format +msgid "%s: option `%s' is ambiguous\n" +msgstr "%s: flaggan ”%s” är tvetydig\n" + +#: lib/obsolete-strings.c:62 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: flaggan ”%s” är tvetydig\n" + +#: lib/obsolete-strings.c:63 +#, c-format +msgid "%s: option `--%s' doesn't allow an argument\n" +msgstr "%s: flaggan ”--%s” tar inget argument\n" + +#: lib/obsolete-strings.c:64 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: flaggan ”--%s” tar inget argument\n" + +#: lib/obsolete-strings.c:65 +#, c-format +msgid "%s: option `%c%s' doesn't allow an argument\n" +msgstr "%s: flaggan ”%c%s” tar inget argument\n" + +#: lib/obsolete-strings.c:66 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: flaggan ”%c%s” tar inget argument\n" + +#: lib/obsolete-strings.c:67 +#, c-format +msgid "%s: option `--%s' requires an argument\n" +msgstr "%s: flaggan ”--%s” kräver ett argument\n" + +#: lib/obsolete-strings.c:68 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: flaggan ”--%s” kräver ett argument\n" + +#: lib/obsolete-strings.c:69 +#, c-format +msgid "%s: unrecognized option `--%s'\n" +msgstr "%s: okänd flagga ”--%s”\n" + +#: lib/obsolete-strings.c:70 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: okänd flagga ”--%s”\n" + +#: lib/obsolete-strings.c:71 +#, c-format +msgid "%s: unrecognized option `%c%s'\n" +msgstr "%s: okänd flagga ”%c%s”\n" + +#: lib/obsolete-strings.c:72 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: okänd flagga ”%c%s”\n" + +#: lib/obsolete-strings.c:73 +#, c-format +msgid "%s: option `-W %s' is ambiguous\n" +msgstr "%s: flaggan ”-W %s” är tvetydig\n" + +#: lib/obsolete-strings.c:74 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: flaggan ”-W %s” är tvetydig\n" + +#: lib/obsolete-strings.c:75 +#, c-format +msgid "%s: option `-W %s' doesn't allow an argument\n" +msgstr "%s: flaggan ”-W %s” tar inget argument\n" + +#: lib/obsolete-strings.c:76 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: flaggan ”-W %s” tar inget argument\n" + +#: lib/obsolete-strings.c:77 +#, c-format +msgid "%s: option `-W %s' requires an argument\n" +msgstr "%s: flaggan ”-W %s” kräver ett argument\n" + +#: lib/obsolete-strings.c:78 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "%s: flaggan ”-W %s” kräver ett argument\n" From f7de3e27d53ca2292a33e0dd99ada687791dd7ad Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sun, 12 Jan 2020 07:15:36 +1100 Subject: [PATCH 03/32] Update sv.po to the latest version from the Translation Project --- po/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sv.po b/po/sv.po index e79cf73..49db0cb 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Swedish Translations for Star Traders * -# * Copyright (C) 2015-17, John Zaitseff * +# * Copyright (C) 2015-20, John Zaitseff * # * * # ************************************************************************* # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: trader 7.14\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 13:09+0100\n" +"PO-Revision-Date: 2020-01-11 21:06+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -712,7 +712,7 @@ msgstr "Gammal aktie: " #, c-format msgctxt "label" msgid "New stock: " -msgstr "Ny aktie: " +msgstr "Ny aktie: " #. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to #. each player after two companies merge. %ls is the currency From d86362ceecd7ebe3282e19a7aa6e55355ec94326 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 28 Mar 2020 21:10:31 +1100 Subject: [PATCH 04/32] Update INSTALL file for NetBSD 9.0 --- INSTALL | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 767b5d9..2c56d45 100644 --- a/INSTALL +++ b/INSTALL @@ -230,7 +230,7 @@ OpenSUSE Leap 15.1 x86_64 2.26 GNU C Compiler 7.4.1 Operating system Arch Compiler Notes ======================= ====== ============================ ============ FreeBSD 12.1 x86_64 Clang (LLVM) 8.0.1 [#freebsd1]_ -NetBSD 8.1 x86_64 GNU C Compiler 5.5.0 [#netbsd1]_ +NetBSD 9.0 x86_64 GNU C Compiler 7.4.0 [#netbsd1]_ macOS 10.15 x86_64 Apple Clang (LLVM) 11.0.0 [#macos1]_ macOS 10.15 x86_64 Apple Clang (LLVM) 11.0.0 [#macos2]_ Solaris 11.4 (x86_64) x86_64 GNU C Compiler 7.3.0 [#solaris1]_ @@ -250,7 +250,8 @@ Notes: --with-libintl-prefix=/usr/local .. [#netbsd1] NetBSD with the ``gettext``, ``libiconv`` and ``ncursesw`` - packages installed with ``pkg_add``\(1), using:: + packages installed with ``pkgin``\(1) (or ``pkg_add``\(1) in older + versions of NetBSD), using:: ./configure --with-libiconv-prefix=/usr/pkg \ --with-libintl-prefix=/usr/pkg \ From fa32d1882ad873408fe7062b626d16ef51918d4b Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 9 May 2020 06:50:45 +1000 Subject: [PATCH 05/32] Update ignored files for the latest version of Gnulib --- lib/.gitignore | 1 + m4/.gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/.gitignore b/lib/.gitignore index b37a0e8..62cdfeb 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -1,6 +1,7 @@ Makefile.am /_Noreturn.h +/attribute.h /btowc.c /c-ctype.c /c-ctype.h diff --git a/m4/.gitignore b/m4/.gitignore index 1fec5d3..5021bf1 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -94,3 +94,4 @@ /wint_t.m4 /wmemcpy.m4 /xsize.m4 +/zzgnulib.m4 From becdff9f4b66fd6b744ca001cb137688170b9acd Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 9 May 2020 07:02:00 +1000 Subject: [PATCH 06/32] Update INSTALL file for Ubuntu 20.04 LTS --- INSTALL | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 2c56d45..6484768 100644 --- a/INSTALL +++ b/INSTALL @@ -213,11 +213,9 @@ Debian GNU/Linux Sid i686 2.29 GNU C Compiler 9.2.1 Debian GNU/Linux Sid i686 2.29 Clang (LLVM) 8.0.1 Debian GNU/Linux 10.1 x86_64 2.28 GNU C Compiler 8.3.0 Debian GNU/Linux 10.1 x86_64 2.28 Clang (LLVM) 7.0.1 -Ubuntu 19.10 x86_64 2.30 GNU C Compiler 9.2.1 -Ubuntu 19.10 x86_64 2.30 Clang (LLVM) 9.0.0 -Ubuntu 19.10 x86_64 2.30 Portland PGI C/C++ 19.10 -Ubuntu 18.04.3 LTS x86_64 2.27 GNU C Compiler 7.4.0 -Ubuntu 18.04.3 LTS x86_64 2.27 Clang (LLVM) 6.0.0 +Ubuntu 20.04 LTS x86_64 2.31 GNU C Compiler 9.3.0 +Ubuntu 20.04 LTS x86_64 2.31 Clang (LLVM) 10.0.0 +Ubuntu 20.04 LTS x86_64 2.31 Portland PGI C/C++ 19.10 Fedora 31 x86_64 2.30 GNU C Compiler 9.2.1 CentOS 8.0 x86_64 2.28 GNU C Compiler 8.2.1 CentOS 7.7 x86_64 2.17 GNU C Compiler 4.8.5 From 9be03381794e99bbe1d85a5b29aef6832b6fbd21 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 9 May 2020 07:17:21 +1000 Subject: [PATCH 07/32] Update INSTALL file for the latest Debian Sid --- INSTALL | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 6484768..309d1a8 100644 --- a/INSTALL +++ b/INSTALL @@ -207,12 +207,12 @@ tested with this version of Star Traders: ===================== ====== ===== ======================== Linux distribution Arch Glibc Compiler ===================== ====== ===== ======================== -Debian GNU/Linux Sid x86_64 2.29 GNU C Compiler 9.2.1 -Debian GNU/Linux Sid x86_64 2.29 Clang (LLVM) 8.0.1 -Debian GNU/Linux Sid i686 2.29 GNU C Compiler 9.2.1 -Debian GNU/Linux Sid i686 2.29 Clang (LLVM) 8.0.1 -Debian GNU/Linux 10.1 x86_64 2.28 GNU C Compiler 8.3.0 -Debian GNU/Linux 10.1 x86_64 2.28 Clang (LLVM) 7.0.1 +Debian GNU/Linux Sid x86_64 2.30 GNU C Compiler 9.3.0 +Debian GNU/Linux Sid x86_64 2.30 Clang (LLVM) 9.0.1 +Debian GNU/Linux Sid i686 2.30 GNU C Compiler 9.3.0 +Debian GNU/Linux Sid i686 2.30 Clang (LLVM) 9.0.1 +Debian GNU/Linux 10.3 x86_64 2.28 GNU C Compiler 8.3.0 +Debian GNU/Linux 10.3 x86_64 2.28 Clang (LLVM) 7.0.1 Ubuntu 20.04 LTS x86_64 2.31 GNU C Compiler 9.3.0 Ubuntu 20.04 LTS x86_64 2.31 Clang (LLVM) 10.0.0 Ubuntu 20.04 LTS x86_64 2.31 Portland PGI C/C++ 19.10 From ce9e34cc9e61602b92307440fba2bff2d7f65ac4 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 9 May 2020 08:10:16 +1000 Subject: [PATCH 08/32] Update INSTALL file for CentOS 7.8 and CentOS 8.1 --- INSTALL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 309d1a8..98231e1 100644 --- a/INSTALL +++ b/INSTALL @@ -217,8 +217,8 @@ Ubuntu 20.04 LTS x86_64 2.31 GNU C Compiler 9.3.0 Ubuntu 20.04 LTS x86_64 2.31 Clang (LLVM) 10.0.0 Ubuntu 20.04 LTS x86_64 2.31 Portland PGI C/C++ 19.10 Fedora 31 x86_64 2.30 GNU C Compiler 9.2.1 -CentOS 8.0 x86_64 2.28 GNU C Compiler 8.2.1 -CentOS 7.7 x86_64 2.17 GNU C Compiler 4.8.5 +CentOS 8.1 x86_64 2.28 GNU C Compiler 8.3.1 +CentOS 7.8 x86_64 2.17 GNU C Compiler 4.8.5 CentOS 6.10 x86_64 2.12 GNU C Compiler 4.4.7 CentOS 6.10 x86_64 2.12 Intel C/C++ 19.0.3.199 OpenSUSE Leap 15.1 x86_64 2.26 GNU C Compiler 7.4.1 From 85aa5e39b6d285412041c38354be655db1e42948 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 9 May 2020 08:31:59 +1000 Subject: [PATCH 09/32] Update INSTALL file for Fedora 32 --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 98231e1..71d2576 100644 --- a/INSTALL +++ b/INSTALL @@ -216,7 +216,7 @@ Debian GNU/Linux 10.3 x86_64 2.28 Clang (LLVM) 7.0.1 Ubuntu 20.04 LTS x86_64 2.31 GNU C Compiler 9.3.0 Ubuntu 20.04 LTS x86_64 2.31 Clang (LLVM) 10.0.0 Ubuntu 20.04 LTS x86_64 2.31 Portland PGI C/C++ 19.10 -Fedora 31 x86_64 2.30 GNU C Compiler 9.2.1 +Fedora 32 x86_64 2.31 GNU C Compiler 10.0.1 CentOS 8.1 x86_64 2.28 GNU C Compiler 8.3.1 CentOS 7.8 x86_64 2.17 GNU C Compiler 4.8.5 CentOS 6.10 x86_64 2.12 GNU C Compiler 4.4.7 From 69c6ab14739697a1511a52aeadd283449aa2905d Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 1 Dec 2020 19:16:26 +1100 Subject: [PATCH 10/32] Update ignored files for the latest version of Gnulib --- m4/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m4/.gitignore b/m4/.gitignore index 5021bf1..cd0ea5f 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -59,6 +59,7 @@ /nls.m4 /nocrash.m4 /off_t.m4 +/pid_t.m4 /po.m4 /printf-posix.m4 /progtest.m4 @@ -66,6 +67,7 @@ /setlocale_null.m4 /size_max.m4 /ssize_t.m4 +/std-gnu11.m4 /stdbool.m4 /stddef_h.m4 /stdint.m4 From d7845c59a4291b75780dad263fa95a1e85795c66 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Mon, 21 Dec 2020 18:25:02 +1100 Subject: [PATCH 11/32] Update INSTALL file for Haiku R1/beta2 --- INSTALL | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL b/INSTALL index 71d2576..7099ee0 100644 --- a/INSTALL +++ b/INSTALL @@ -234,6 +234,7 @@ macOS 10.15 x86_64 Apple Clang (LLVM) 11.0.0 [#macos2]_ Solaris 11.4 (x86_64) x86_64 GNU C Compiler 7.3.0 [#solaris1]_ Solaris 11.4 (x86_64) i386 Oracle Developer Studio 12.6 [#solaris2]_ Solaris 11.4 (x86_64) x86_64 Oracle Developer Studio 12.6 [#solaris3]_ +Haiku R1/beta2 x86_64 GNU C Compiler 8.3.0 Cygwin 3.1.2 (Win7 SP1) i686 GNU C Compiler 7.4.0 Cygwin 3.1.2 (Win10) x86_64 GNU C Compiler 7.4.0 ======================= ====== ============================ ============ From 69967706318853274ebef92d5c9535c698802a30 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Wed, 30 Dec 2020 10:56:27 +1100 Subject: [PATCH 12/32] Tweak reStructuredText files using the default interpreted text role --- INSTALL | 2 ++ NEWS | 2 ++ README | 2 ++ build-aux/README | 2 ++ data/README | 2 ++ doc/README | 2 ++ lib/README | 2 ++ m4/README | 2 ++ po/README | 2 ++ src/README | 2 ++ 10 files changed, 20 insertions(+) diff --git a/INSTALL b/INSTALL index 7099ee0..3ae581b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/NEWS b/NEWS index cb26e9b..4873e96 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/README b/README index 6acc8f5..2ff3134 100644 --- a/README +++ b/README @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/build-aux/README b/build-aux/README index ed186fd..2ea9a9b 100644 --- a/build-aux/README +++ b/build-aux/README @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/data/README b/data/README index 6806512..c8d0c6e 100644 --- a/data/README +++ b/data/README @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/doc/README b/doc/README index c09bd9b..fc6f5bb 100644 --- a/doc/README +++ b/doc/README @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/lib/README b/lib/README index af32813..e105b7c 100644 --- a/lib/README +++ b/lib/README @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/m4/README b/m4/README index ed3e53d..66c3408 100644 --- a/m4/README +++ b/m4/README @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/po/README b/po/README index f961f35..afcb427 100644 --- a/po/README +++ b/po/README @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading diff --git a/src/README b/src/README index 35b1bdd..77dcb8c 100644 --- a/src/README +++ b/src/README @@ -1,4 +1,6 @@ .. -*- mode: rst; coding: utf-8 -*- +.. role:: filename(literal) +.. default-role:: filename ============================================ Star Traders: A Game of Interstellar Trading From 0d2462ef41a6b7bb0d14da783d74c5e25a1c1654 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 17:07:55 +1100 Subject: [PATCH 13/32] Update the copyright year to 2021 --- COPYING | 2 +- Makefile.am | 2 +- README | 2 +- configure.ac | 2 +- data/Makefile.am | 2 +- data/trader.desktop.in | 2 +- data/trader.svg | 2 +- doc/Makefile.am | 2 +- doc/trader.6 | 6 +++--- lib/xopen-source.h | 2 +- m4/Makefile.am | 2 +- m4/gnulib-cache.m4 | 2 +- m4/xopen-source.m4 | 2 +- po/LINGUAS | 2 +- po/Makevars | 2 +- po/POTFILES.in | 2 +- po/da.po | 6 +++--- po/de.po | 6 +++--- po/en_AU.po | 8 ++++---- po/en_CA.po | 8 ++++---- po/en_GB.po | 8 ++++---- po/en_US.po | 8 ++++---- po/eo.po | 6 +++--- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/hr.po | 6 +++--- po/hu.po | 6 +++--- po/nb.po | 6 +++--- po/pt_BR.po | 6 +++--- po/ru.po | 8 ++++---- po/sr.po | 6 +++--- po/sv.po | 6 +++--- 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 | 4 ++-- src/trader.h | 2 +- src/utils.c | 2 +- src/utils.h | 2 +- 52 files changed, 92 insertions(+), 92 deletions(-) diff --git a/COPYING b/COPYING index 098a995..13ffd26 100644 --- a/COPYING +++ b/COPYING @@ -4,7 +4,7 @@ Star Traders: A Game of Interstellar Trading ============================================ -**Copyright © 1990–2020, John Zaitseff.** +**Copyright © 1990–2021, John Zaitseff.** The Star Traders game is free software that is distributed under the terms of the GNU General Public License. The actual copyright on this diff --git a/Makefile.am b/Makefile.am index 6ac3caf..39412eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/README b/README index 2ff3134..48f9016 100644 --- a/README +++ b/README @@ -71,7 +71,7 @@ warmly welcomed! Please send these to: Copyright ========= -**Copyright © 1990–2020, John Zaitseff.** +**Copyright © 1990–2021, 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/configure.ac b/configure.ac index 1e1ee71..6de4fc5 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-2020, John Zaitseff * +dnl * Copyright (C) 1990-2021, John Zaitseff * dnl * * dnl ********************************************************************* dnl diff --git a/data/Makefile.am b/data/Makefile.am index 6b3dd89..783f3ec 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/data/trader.desktop.in b/data/trader.desktop.in index ea09a46..79f5dd5 100644 --- a/data/trader.desktop.in +++ b/data/trader.desktop.in @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/data/trader.svg b/data/trader.svg index ef89715..21ff9d7 100644 --- a/data/trader.svg +++ b/data/trader.svg @@ -11,7 +11,7 @@ ************************************************************************* * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************* diff --git a/doc/Makefile.am b/doc/Makefile.am index 6979917..9222ead 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/doc/trader.6 b/doc/trader.6 index 7b834aa..07eedef 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -1,7 +1,7 @@ .\" ********************************************************************* .\" * * .\" * Star Traders: A Game of Interstellar Trading * -.\" * Copyright (C) 1990-2020, John Zaitseff * +.\" * Copyright (C) 1990-2021, John Zaitseff * .\" * * .\" ********************************************************************* .\" @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "9th January, 2020" "Unix-like systems" +.TH TRADER 6 "7th January, 2021" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* @@ -219,7 +219,7 @@ Australia .PP .\" ********************************************************************* .SH COPYRIGHT -Copyright \(co 1990\-2020, John Zaitseff. +Copyright \(co 1990\-2021, 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/xopen-source.h b/lib/xopen-source.h index 4ef7c15..97d26ff 100644 --- a/lib/xopen-source.h +++ b/lib/xopen-source.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/m4/Makefile.am b/m4/Makefile.am index 77a16b0..3bdbb3c 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 6edf97a..f5dd585 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff --git a/m4/xopen-source.m4 b/m4/xopen-source.m4 index a479b09..fe75a4b 100644 --- a/m4/xopen-source.m4 +++ b/m4/xopen-source.m4 @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/po/LINGUAS b/po/LINGUAS index 142819d..33e15ca 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/po/Makevars b/po/Makevars index 2180ed1..a68f222 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/po/POTFILES.in b/po/POTFILES.in index ec5bc01..05875d1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/po/da.po b/po/da.po index 217fed4..91bd028 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Danish Translations for Star Traders * -# * Copyright (C) 2012-20, John Zaitseff * +# * Copyright (C) 2012-21, John Zaitseff * # * * # ************************************************************************* # @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" diff --git a/po/de.po b/po/de.po index c7e019e..e246e6b 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * German Translations for Star Traders * -# * Copyright (C) 2012-20, John Zaitseff * +# * Copyright (C) 2012-21, John Zaitseff * # * * # ************************************************************************* # @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:55+1100\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 afb68bc..778df62 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (Australian) Translations for Star Traders * -# * Copyright (C) 1990-2020, John Zaitseff * +# * Copyright (C) 1990-2021, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same license as the trader package. # # Contributors: -# John Zaitseff , 2011-2020. +# John Zaitseff , 2011-2021. # msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 1a7da86..0ade84e 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (Canadian) Translations for Star Traders * -# * Copyright (C) 1990-2020, John Zaitseff * +# * Copyright (C) 1990-2021, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same license as the trader package. # # Contributors: -# John Zaitseff , 2011-2020. +# John Zaitseff , 2011-2021. # msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index eec641a..582c40e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (British) Translations for Star Traders * -# * Copyright (C) 1990-2020, John Zaitseff * +# * Copyright (C) 1990-2021, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same license as the trader package. # # Contributors: -# John Zaitseff , 2011-2020. +# John Zaitseff , 2011-2021. # msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index 4dc9539..7a4c9c1 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1,21 +1,21 @@ # ************************************************************************* # * * # * English (US) Translations for Star Traders * -# * Copyright (C) 1990-2020, John Zaitseff * +# * Copyright (C) 1990-2021, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same license as the trader package. # # Contributors: -# John Zaitseff , 2011-2020. +# John Zaitseff , 2011-2021. # msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" "Language: en_US\n" diff --git a/po/eo.po b/po/eo.po index f7fd61e..cfe636a 100644 --- a/po/eo.po +++ b/po/eo.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Esperanto Translations for Star Traders * -# * Copyright (C) 2013-20, John Zaitseff * +# * Copyright (C) 2013-21, John Zaitseff * # * Copyright (C) 2013-20, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" diff --git a/po/fi.po b/po/fi.po index ab34f52..e6b8274 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Finnish Translations for Star Traders * -# * Copyright (C) 2012-20, John Zaitseff * +# * Copyright (C) 2012-21, John Zaitseff * # * Copyright (C) 2012, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr.po b/po/fr.po index de2c189..53e37a5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * French Translations for Star Traders * -# * Copyright (C) 2012-20, John Zaitseff * +# * Copyright (C) 2012-21, John Zaitseff * # * Copyright (C) 2012-19, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:57+1100\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 e537750..36f5102 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Croatian Translations for Star Traders * -# * Copyright (C) 2012-20, John Zaitseff * +# * Copyright (C) 2012-21, John Zaitseff * # * * # ************************************************************************* # @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" diff --git a/po/hu.po b/po/hu.po index d47033e..957bab4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Hungarian Translations for Star Traders * -# * Copyright (C) 2012-20, John Zaitseff * +# * Copyright (C) 2012-21, John Zaitseff * # * * # ************************************************************************* # @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:58+1100\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 03f182c..b06a3df 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Norwegian Bokmål Translations for Star Traders * -# * Copyright (C) 2012-20, John Zaitseff * +# * Copyright (C) 2012-21, John Zaitseff * # * * # ************************************************************************* # @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2a81a5e..4c765b5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # * * # * Brazilian Portuguese Translations for Star Traders * # * Traduções em português brasileiro para o pacote trader * -# * Copyright (C) 2019-20, John Zaitseff * +# * Copyright (C) 2019-21, John Zaitseff * # * * # ************************************************************************* # @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" diff --git a/po/ru.po b/po/ru.po index 56d4a9a..c7069ca 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,14 +2,14 @@ # * * # * Russian Translations for Star Traders * # * Русский перевод для игры «Звёздные торговцы» * -# * Copyright (C) 1990-2020, John Zaitseff * +# * Copyright (C) 1990-2021, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same license as the trader package. # # Contributors: -# John Zaitseff , 2011-2020. +# John Zaitseff , 2011-2021. # Vladimir B. Tsarkov , 2012. # Pavel Maryanov , 2012. # @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 16:59+1100\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/po/sr.po b/po/sr.po index a82aac5..56fad6f 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Serbian Translation for Star Traders * -# * Copyright (C) 2016-20, John Zaitseff * +# * Copyright (C) 2016-21, John Zaitseff * # * Copyright (C) 2016-17, Free Software Foundation, Inc. * # * * # ************************************************************************* @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-09 10:21+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" diff --git a/po/sv.po b/po/sv.po index 470f04d..04e94b5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # ************************************************************************* # * * # * Swedish Translations for Star Traders * -# * Copyright (C) 2015-20, John Zaitseff * +# * Copyright (C) 2015-21, John Zaitseff * # * * # ************************************************************************* # @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2020-01-09 08:05+1100\n" -"PO-Revision-Date: 2020-01-12 07:18+1100\n" +"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" diff --git a/src/Makefile.am b/src/Makefile.am index e123d28..3fcac4a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2020, John Zaitseff # +# Copyright (C) 1990-2021, John Zaitseff # # # ######################################################################### diff --git a/src/exch.c b/src/exch.c index 5afcafc..9946fc0 100644 --- a/src/exch.c +++ b/src/exch.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/exch.h b/src/exch.h index 8b42e8e..c45427e 100644 --- a/src/exch.h +++ b/src/exch.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.c b/src/fileio.c index 7e135e6..4333f4e 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.h b/src/fileio.h index 42885c9..7347d52 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.c b/src/game.c index 70e66dc..5baaf5b 100644 --- a/src/game.c +++ b/src/game.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.h b/src/game.h index bc28b4a..422ef93 100644 --- a/src/game.h +++ b/src/game.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.c b/src/globals.c index 3fa022b..bf70839 100644 --- a/src/globals.c +++ b/src/globals.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.h b/src/globals.h index baafd77..21283cf 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.c b/src/help.c index c0d4a71..23fb785 100644 --- a/src/help.c +++ b/src/help.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.h b/src/help.h index c6df089..7f095fc 100644 --- a/src/help.h +++ b/src/help.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.c b/src/intf.c index a0592ab..3e04a0c 100644 --- a/src/intf.c +++ b/src/intf.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.h b/src/intf.h index 258b8b5..639eee5 100644 --- a/src/intf.h +++ b/src/intf.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.c b/src/move.c index d4aec39..9bcd51b 100644 --- a/src/move.c +++ b/src/move.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.h b/src/move.h index d270e30..68d3cbf 100644 --- a/src/move.h +++ b/src/move.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/system.h b/src/system.h index 1d53708..52a518e 100644 --- a/src/system.h +++ b/src/system.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/trader.c b/src/trader.c index 88564ec..ed0bb80 100644 --- a/src/trader.c +++ b/src/trader.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ @@ -293,7 +293,7 @@ This program is free software that is distributed under the terms of the\n\ GNU General Public License, version 3 or later. You are welcome to\n\ modify and/or distribute it under certain conditions. This program has\n\ NO WARRANTY, to the extent permitted by law; see the License for details.\n\ -"), program_name, PACKAGE_VERSION, "1990-2020"); +"), program_name, PACKAGE_VERSION, "1990-2021"); exit(EXIT_SUCCESS); } diff --git a/src/trader.h b/src/trader.h index 0b22b77..ed3ac12 100644 --- a/src/trader.h +++ b/src/trader.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.c b/src/utils.c index 03bd86c..c708e20 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.h b/src/utils.h index 7b774df..ff408a9 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2020, John Zaitseff * +* Copyright (C) 1990-2021, John Zaitseff * * * ************************************************************************/ From b725ba871cead08255de2d1bcb9dbdc59d5c2209 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 18:50:48 +1100 Subject: [PATCH 14/32] Update the NEWS file to mention current changes --- NEWS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 4873e96..7188662 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,9 @@ __ https://www.zap.org.au/ Version 7.15 (not yet released) ------------------------------- -(No changes yet) +Updated to the latest snapshot of the Gnulib GNU Portability Library. +Also updated the `INSTALL` file to list the latest tested versions of +operating systems, including a new listing for Haiku R1/beta2. Version 7.14 (9th January, 2020) From 528cdd461997c89d52af0eca785c149895a2b2b9 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 18:57:51 +1100 Subject: [PATCH 15/32] Newer versions of xgettext(1) do not translate desktop Icon values --- data/trader.desktop.in | 6 +----- lib/obsolete-strings.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/data/trader.desktop.in b/data/trader.desktop.in index 79f5dd5..84bd585 100644 --- a/data/trader.desktop.in +++ b/data/trader.desktop.in @@ -9,7 +9,7 @@ # $Id$ # This file provides a translated desktop entry for Star Traders and -# conforms to the Desktop Entry Specification v1.1. +# conforms to the Desktop Entry Specification v1.5. # # This file is distributed under the same licence as Star Traders itself: # the GNU General Public License, version 3 or later. @@ -24,10 +24,6 @@ Comment=Play Star Traders, a simple game of interstellar trading # TRANSLATORS: A list of keywords describing Star Traders. By all means # add your own keywords! Keywords=game;interstellar;trading;strategy; -# TRANSLATORS: This string is the name of the icon to use. The Desktop -# Entry Specification states it is translatable, but unless you provide a -# matching icon, please leave it as "trader": this will use trader.svg -# and the various trader.png files in the data source code directory. Icon=trader Exec=trader TryExec=trader diff --git a/lib/obsolete-strings.c b/lib/obsolete-strings.c index bbe4ebe..e20a910 100644 --- a/lib/obsolete-strings.c +++ b/lib/obsolete-strings.c @@ -33,6 +33,24 @@ */ +/************************************************************************ +* From data/trader.desktop.in * +************************************************************************/ + +const char *trader_desktop_strings[] = { + /* TRANSLATORS: Older versions of the GNU Gettext library utilities + treat the Icon value in data/trader.desktop.in as a translatable + string. That string, the name of the icon to use, is defined here + for those older versions of xgettext(1). Unless you provide a + matching icon, please leave it as "trader": this will use + trader.svg and the various trader.png files in the data source + code directory. */ + N_("trader"), + + "" +}; + + /************************************************************************ * From GNU C Library posix/getopt.c * ************************************************************************/ From 7f94be8da65dc06c5dcbce9c229cbf066f8348b5 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 19:04:54 +1100 Subject: [PATCH 16/32] Update to GNU Gettext 0.20 or later --- INSTALL | 9 ++- NEWS | 7 ++- configure.ac | 2 +- po/Makefile.in.in | 129 +++++++++++++++++++++++++---------------- po/Rules-quot | 6 +- po/en@boldquot.header | 2 +- po/en@quot.header | 2 +- po/insert-header.sin | 5 ++ po/remove-potcdate.sin | 8 ++- 9 files changed, 106 insertions(+), 64 deletions(-) diff --git a/INSTALL b/INSTALL index 3ae581b..5a70911 100644 --- a/INSTALL +++ b/INSTALL @@ -46,11 +46,10 @@ and installation: wide-character version of Curses, such as NcursesW, to work correctly. -4. The GNU Gettext library, version 0.19.8 or later, to allow the game - to use languages other than English; this is also called Native - Language Support. If you do not have this library (and do not wish - to install it), you may pass ``--disable-nls`` to the configure - script. +4. The GNU Gettext library, version 0.20 or later, to allow the game to + use languages other than English; this is also called Native Language + Support. If you do not have this library (and do not wish to install + it), you may pass ``--disable-nls`` to the configure script. 5. The GNU ``libiconv`` library for supporting multiple character encodings, if required by the GNU Gettext library. This is not diff --git a/NEWS b/NEWS index 7188662..5fcc5c7 100644 --- a/NEWS +++ b/NEWS @@ -25,9 +25,10 @@ __ https://www.zap.org.au/ Version 7.15 (not yet released) ------------------------------- -Updated to the latest snapshot of the Gnulib GNU Portability Library. -Also updated the `INSTALL` file to list the latest tested versions of -operating systems, including a new listing for Haiku R1/beta2. +Updated all references to GNU Gettext to version 0.20. Updated to the +latest snapshot of the Gnulib GNU Portability Library. Also updated the +`INSTALL` file to list the latest tested versions of operating systems, +including a new listing for Haiku R1/beta2. Version 7.14 (9th January, 2020) diff --git a/configure.ac b/configure.ac index 6de4fc5..4ce867a 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_TYPE_SIZE_T AC_TYPE_SSIZE_T AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT_VERSION([0.20]) gl_INIT diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 38c293d..6b25f0d 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,13 +1,14 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper +# Copyright (C) 1995-2000 Ulrich Drepper +# Copyright (C) 2000-2020 Free Software Foundation, Inc. # # 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.19.8 -GETTEXT_MACRO_VERSION = 0.19 +# Origin: gettext-0.21 +GETTEXT_MACRO_VERSION = 0.20 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -52,16 +53,13 @@ GMSGFMT_ = @GMSGFMT@ GMSGFMT_no = @GMSGFMT@ GMSGFMT_yes = @GMSGFMT_015@ GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) -MSGFMT_ = @MSGFMT@ -MSGFMT_no = @MSGFMT@ -MSGFMT_yes = @MSGFMT_015@ -MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) XGETTEXT_ = @XGETTEXT@ XGETTEXT_no = @XGETTEXT@ XGETTEXT_yes = @XGETTEXT_015@ XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) -MSGMERGE = msgmerge +MSGMERGE = @MSGMERGE@ MSGMERGE_UPDATE = @MSGMERGE@ --update +MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@ MSGINIT = msginit MSGCONV = msgconv MSGFILTER = msgfilter @@ -92,27 +90,44 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) # Makevars gets inserted here. (Don't remove this line!) +all: all-@USE_NLS@ + + .SUFFIXES: -.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update +.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update -.po.mo: - @echo "$(MSGFMT) -c -o $@ $<"; \ - $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ +# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs. +# The GNU Coding Standards say in +# : +# "GNU distributions usually contain some files which are not source files +# ... . Since these files normally appear in the source directory, they +# should always appear in the source directory, not in the build directory. +# So Makefile rules to update them should put the updated files in the +# source directory." +# Therefore we put these files in the source directory, not the build directory. +# During .po -> .gmo conversion, take into account the most recent changes to +# the .pot file. This eliminates the need to update the .po files when the +# .pot file has changed, which would be troublesome if the .po files are put +# under version control. +$(GMOFILES): $(srcdir)/$(DOMAIN).pot .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \ + cd $(srcdir) && \ + rm -f $${lang}.gmo && \ + $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \ + $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \ + mv t-$${lang}.gmo $${lang}.gmo && \ + rm -f $${lang}.1po .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ -all: all-@USE_NLS@ - -all-yes: stamp-po +all-yes: $(srcdir)/stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. @@ -126,24 +141,24 @@ CHECK_MACRO_VERSION = \ # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because # we don't want to bother translators with empty POT files). We assume that # LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. -# In this case, stamp-po is a nop (i.e. a phony target). +# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target). -# stamp-po is a timestamp denoting the last time at which the CATALOGS have -# been loosely updated. Its purpose is that when a developer or translator -# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, -# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent -# invocations of "make" will do nothing. This timestamp would not be necessary -# if updating the $(CATALOGS) would always touch them; however, the rule for -# $(POFILES) has been designed to not touch files that don't need to be -# changed. -stamp-po: $(srcdir)/$(DOMAIN).pot +# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS +# have been loosely updated. Its purpose is that when a developer or translator +# checks out the package from a version control system, and the $(DOMAIN).pot +# file is not under version control, "make" will update the $(DOMAIN).pot and +# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This +# timestamp would not be necessary if updating the $(CATALOGS) would always +# touch them; however, the rule for $(POFILES) has been designed to not touch +# files that don't need to be changed. +$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ - echo "touch stamp-po" && \ - echo timestamp > stamp-poT && \ - mv stamp-poT stamp-po; \ + echo "touch $(srcdir)/stamp-po" && \ + echo timestamp > $(srcdir)/stamp-poT && \ + mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \ } # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', @@ -159,11 +174,9 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ - LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ - -size -10000000c -exec grep 'GNU @PACKAGE@' \ - /dev/null '{}' ';' 2>/dev/null; \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ else \ - LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ fi; \ } | grep -v 'libtool:' >/dev/null; then \ package_gnu=yes; \ @@ -184,26 +197,29 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --add-comments=TRANSLATORS: \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --msgid-bugs-address="$$msgid_bugs_address" \ + $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ ;; \ *) \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --add-comments=TRANSLATORS: \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --package-name="$${package_prefix}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ + $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ ;; \ esac test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot-header; then \ sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \ - cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \ - rm -f $(DOMAIN).1po; \ + cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \ + rm -f $(DOMAIN).1po \ + || exit 1; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ @@ -228,17 +244,19 @@ $(srcdir)/$(DOMAIN).pot: # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. $(POFILES): $(POFILESDEPS) + @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ - test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ - && { 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].*) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + 0.1[6-7] | 0.1[6-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -373,34 +391,41 @@ check: all info dvi ps pdf html tags TAGS ctags CTAGS ID: +install-dvi install-ps install-pdf install-html: + mostlyclean: rm -f remove-potcdate.sed - rm -f stamp-poT + rm -f $(srcdir)/stamp-poT rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo + rm -f Makefile Makefile.in POTFILES maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f stamp-po $(GMOFILES) + rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. -dist2: stamp-po $(DISTFILES) - dists="$(DISTFILES)"; \ +dist2: $(srcdir)/stamp-po $(DISTFILES) + @dists="$(DISTFILES)"; \ if test "$(PACKAGE)" = "gettext-tools"; then \ dists="$$dists Makevars.template"; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ + else \ + case $(XGETTEXT) in \ + :) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because a suitable 'xgettext' program was not found in PATH." 1>&2;; \ + *) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because 'xgettext' found no strings to extract. Check the contents of the POTFILES.in file and the XGETTEXT_OPTIONS in the Makevars file." 1>&2;; \ + esac; \ fi; \ if test -f $(srcdir)/ChangeLog; then \ dists="$$dists ChangeLog"; \ @@ -439,13 +464,15 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if { 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].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + 0.1[6-7] | 0.1[6-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ esac; \ }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff --git a/po/Rules-quot b/po/Rules-quot index baf6528..18c024b 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -1,5 +1,9 @@ -# This file, Rules-quot, can be copied and used freely without restrictions. # Special Makefile rules for English message catalogs with quotation marks. +# +# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# This file, Rules-quot, and its auxiliary files (listed under +# DISTFILES.common.extra1) are free software; the Free Software Foundation +# gives unlimited permission to use, copy, distribute, and modify them. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot diff --git a/po/en@boldquot.header b/po/en@boldquot.header index fedb6a0..506ca9e 100644 --- a/po/en@boldquot.header +++ b/po/en@boldquot.header @@ -2,7 +2,7 @@ # The msgids must be ASCII and therefore cannot contain real quotation # characters, only substitutes like grave accent (0x60), apostrophe (0x27) # and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html +# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html # # This catalog translates grave accent (0x60) and apostrophe (0x27) to # left single quotation mark (U+2018) and right single quotation mark (U+2019). diff --git a/po/en@quot.header b/po/en@quot.header index a9647fc..6522f0c 100644 --- a/po/en@quot.header +++ b/po/en@quot.header @@ -2,7 +2,7 @@ # The msgids must be ASCII and therefore cannot contain real quotation # characters, only substitutes like grave accent (0x60), apostrophe (0x27) # and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html +# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html # # This catalog translates grave accent (0x60) and apostrophe (0x27) to # left single quotation mark (U+2018) and right single quotation mark (U+2019). diff --git a/po/insert-header.sin b/po/insert-header.sin index b26de01..ceeebb9 100644 --- a/po/insert-header.sin +++ b/po/insert-header.sin @@ -1,5 +1,10 @@ # Sed script that inserts the file called HEADER before the header entry. # +# Copyright (C) 2001 Free Software Foundation, Inc. +# Written by Bruno Haible , 2001. +# This file is free software; the Free Software Foundation gives +# unlimited permission to use, copy, distribute, and modify it. +# # At each occurrence of a line starting with "msgid ", we execute the following # commands. At the first occurrence, insert the file. At the following # occurrences, do nothing. The distinction between the first and the following diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin index 2436c49..8c70dfb 100644 --- a/po/remove-potcdate.sin +++ b/po/remove-potcdate.sin @@ -1,6 +1,12 @@ -# Sed script that remove the POT-Creation-Date line in the header entry +# Sed script that removes the POT-Creation-Date line in the header entry # from a POT file. # +# Copyright (C) 2002 Free Software Foundation, Inc. +# 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. +# # The distinction between the first and the following occurrences of the # pattern is achieved by looking at the hold space. /^"POT-Creation-Date: .*"$/{ From 4b27db0553c2c4ca30b5ca810259037c843560c9 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 19:16:53 +1100 Subject: [PATCH 17/32] Update translations for Gettext 0.20 or later --- po/da.po | 89 +++++++++++++++++++++++++++-------------------------- po/de.po | 89 +++++++++++++++++++++++++++-------------------------- po/en_AU.po | 89 +++++++++++++++++++++++++++-------------------------- po/en_CA.po | 89 +++++++++++++++++++++++++++-------------------------- po/en_GB.po | 89 +++++++++++++++++++++++++++-------------------------- po/en_US.po | 89 +++++++++++++++++++++++++++-------------------------- po/eo.po | 89 +++++++++++++++++++++++++++-------------------------- po/fi.po | 89 +++++++++++++++++++++++++++-------------------------- po/fr.po | 89 +++++++++++++++++++++++++++-------------------------- po/hr.po | 89 +++++++++++++++++++++++++++-------------------------- po/hu.po | 89 +++++++++++++++++++++++++++-------------------------- po/nb.po | 89 +++++++++++++++++++++++++++-------------------------- po/pt_BR.po | 89 +++++++++++++++++++++++++++-------------------------- po/ru.po | 89 +++++++++++++++++++++++++++-------------------------- po/sr.po | 89 +++++++++++++++++++++++++++-------------------------- po/sv.po | 89 +++++++++++++++++++++++++++-------------------------- 16 files changed, 736 insertions(+), 688 deletions(-) diff --git a/po/da.po b/po/da.po index 91bd028..18357d5 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -44,14 +44,6 @@ msgstr "Spil Star Traders, et simpelt spil med rumhandel" msgid "game;interstellar;trading;strategy;" msgstr "spil;interstellar;handel;strategi;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1702,175 +1694,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: »%lc«" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: tilvalget »%s%s« er tvetydigt\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: tilvalget »%s%s« er tvetydigt; muligheder:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: tilvalget blev ikke genkendt »%s%s«\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: tilvalget »%s%s« tillader ikke et argument\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: tilvalget »%s%s« kræver et argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ugyldigt tilvalg -- »%c«\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: tilvalget kræver et argument -- »%c«\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: tilvalget »%s%s« er tvetydigt\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: tilvalget »%s%s« er tvetydigt; muligheder:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: tilvalget blev ikke genkendt »%s%s«\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: tilvalget »%s%s« tillader ikke et argument\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: tilvalget »%s%s« kræver et argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: ugyldigt tilvalg -- »%c«\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: tilvalget kræver et argument -- »%c«\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: tilvalget »%s« er tvetydigt; muligheder:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: tilvalget »%s« er tvetydigt; muligheder:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: tilvalget »%s« er tvetydigt\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: tilvalget »%s« er tvetydigt\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: tilvalget »--%s« tillader ikke et argument\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: tilvalget »--%s« tillader ikke et argument\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: tilvalget »%c%s« tillader ikke et argument\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: tilvalget »%c%s« tillader ikke et argument\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: tilvalget »--%s« kræver et argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: tilvalget »--%s« kræver et argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: tilvalget blev ikke genkendt »--%s«\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tilvalget blev ikke genkendt »--%s«\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: tilvalget blev ikke genkendt »%c%s«\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tilvalget blev ikke genkendt »%c%s«\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: tilvalget »-W %s« er tvetydigt\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: tilvalget »-W %s« er tvetydigt\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: tilvalget »-W %s« tillader ikke et argument\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: tilvalget »-W %s« tillader ikke et argument\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: tilvalget »-W %s« kræver et argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: tilvalget »-W %s« kræver et argument\n" diff --git a/po/de.po b/po/de.po index e246e6b..d6e0e95 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" @@ -44,14 +44,6 @@ msgstr "Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel" msgid "game;interstellar;trading;strategy;" msgstr "spiel;universum;galaxie;handel;strategie;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1703,175 +1695,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: Option „%s%s“ ist mehrdeutig\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: Option „%s%s“ ist mehrdeutig; möglich wären:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: unbekannte Option „%s%s“\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: Option „%s%s“ akzeptiert keine Argumente\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: Option „%s%s“ erfordert ein Argumente\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ungültige Option -- „%c“\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: die Option erfordert ein Argument -- „%c“\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: Option „%s%s“ ist mehrdeutig\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: Option „%s%s“ ist mehrdeutig; möglich wären:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: unbekannte Option „%s%s“\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: Option „%s%s“ akzeptiert keine Argumente\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: Option „%s%s“ erfordert ein Argumente\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: ungültige Option -- „%c“\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: die Option erfordert ein Argument -- „%c“\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: Option „%s“ ist mehrdeutig; möglich wären:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: Option „%s“ ist mehrdeutig; möglich wären:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: Option „%s“ ist mehrdeutig\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: Option „%s“ ist mehrdeutig\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: Option „--%s“ akzeptiert keine Argumente\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: Option „--%s“ akzeptiert keine Argumente\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: Option „%c%s“ akzeptiert keine Argumente\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: Option „%c%s“ akzeptiert keine Argumente\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: Option „--%s“ erfordert ein Argumente\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: Option „--%s“ erfordert ein Argumente\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unbekannte Option „--%s“\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unbekannte Option „--%s“\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unbekannte Option „%c%s“\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unbekannte Option „%c%s“\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: Option „-W %s“ ist mehrdeutig\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: Option „-W %s“ ist mehrdeutig\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: Option „-W %s“ akzeptiert keine Argumente\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: Option „-W %s“ akzeptiert keine Argumente\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: Option „-W %s“ erfordert ein Argumente\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: Option „-W %s“ erfordert ein Argumente\n" diff --git a/po/en_AU.po b/po/en_AU.po index 778df62..976284c 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" @@ -43,14 +43,6 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1687,175 +1679,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: option ‘%s%s’ is ambiguous\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: unrecognised option ‘%s%s’\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: option ‘%s%s’ requires an argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- ‘%c’\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- ‘%c’\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: option ‘%s%s’ is ambiguous\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: unrecognised option ‘%s%s’\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: option ‘%s%s’ requires an argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: invalid option -- ‘%c’\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: option requires an argument -- ‘%c’\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, 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/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, 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/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: option ‘--%s’ requires an argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: option ‘--%s’ requires an argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognised option ‘--%s’\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unrecognised option ‘--%s’\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognised option ‘%c%s’\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unrecognised option ‘%c%s’\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, 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/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, 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/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: option ‘-W %s’ requires an argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, 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 0ade84e..e3eb334 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" @@ -43,14 +43,6 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1687,175 +1679,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: option ‘%s%s’ is ambiguous\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: unrecognized option ‘%s%s’\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: option ‘%s%s’ requires an argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- ‘%c’\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- ‘%c’\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: option ‘%s%s’ is ambiguous\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: unrecognized option ‘%s%s’\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: option ‘%s%s’ requires an argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: invalid option -- ‘%c’\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: option requires an argument -- ‘%c’\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, 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/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, 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/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: option ‘--%s’ requires an argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: option ‘--%s’ requires an argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognized option ‘--%s’\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unrecognized option ‘--%s’\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognized option ‘%c%s’\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unrecognized option ‘%c%s’\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, 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/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, 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/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: option ‘-W %s’ requires an argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, 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 582c40e..4159575 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" @@ -43,14 +43,6 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1687,175 +1679,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: option ‘%s%s’ is ambiguous\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: unrecognised option ‘%s%s’\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: option ‘%s%s’ requires an argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- ‘%c’\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- ‘%c’\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: option ‘%s%s’ is ambiguous\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: unrecognised option ‘%s%s’\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: option ‘%s%s’ requires an argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: invalid option -- ‘%c’\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: option requires an argument -- ‘%c’\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, 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/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, 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/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: option ‘--%s’ requires an argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: option ‘--%s’ requires an argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognised option ‘--%s’\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unrecognised option ‘--%s’\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognised option ‘%c%s’\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unrecognised option ‘%c%s’\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, 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/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, 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/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: option ‘-W %s’ requires an argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, 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 7a4c9c1..4262963 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" @@ -43,14 +43,6 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1687,175 +1679,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: option ‘%s%s’ is ambiguous\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: unrecognized option ‘%s%s’\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: option ‘%s%s’ requires an argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: invalid option -- ‘%c’\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: option requires an argument -- ‘%c’\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: option ‘%s%s’ is ambiguous\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: unrecognized option ‘%s%s’\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: option ‘%s%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: option ‘%s%s’ requires an argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: invalid option -- ‘%c’\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: option requires an argument -- ‘%c’\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: option ‘%s’ is ambiguous; possibilities:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn’t allow an argument\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, 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/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, 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/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: option ‘--%s’ requires an argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: option ‘--%s’ requires an argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognized option ‘--%s’\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: unrecognized option ‘--%s’\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognized option ‘%c%s’\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: unrecognized option ‘%c%s’\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, 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/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, 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/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: option ‘-W %s’ requires an argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, 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 cfe636a..cb6e93f 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -45,14 +45,6 @@ msgstr "Ludi Star Traders, simpla ludo pri interstelara komerco" msgid "game;interstellar;trading;strategy;" msgstr "ludo;kosmo;negoco;strategio;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1694,175 +1686,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: '%lc'" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: la modifilo '%s%s' estas plursenca\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: la modifilo '%s%s' estas plursenca; eblecoj:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: nerekonata modifilo '%s%s'\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: la modifilo '%s%s' ne permesas argumenton\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: la modifilo '%s%s' postulas argumenton\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: malvalida modifilo -- '%c'\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la modifilo postulas argumenton -- '%c'\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: la modifilo '%s%s' estas plursenca\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: la modifilo '%s%s' estas plursenca; eblecoj:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: nerekonata modifilo '%s%s'\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: la modifilo '%s%s' ne permesas argumenton\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: la modifilo '%s%s' postulas argumenton\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: malvalida modifilo -- '%c'\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: la modifilo postulas argumenton -- '%c'\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: la modifilo '%s' estas plursenca; eblecoj:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: la modifilo '%s' estas plursenca; eblecoj:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: la modifilo '%s' estas plursenca\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: la modifilo '%s' estas plursenca\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: la modifilo '--%s' ne permesas argumenton\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: la modifilo '--%s' ne permesas argumenton\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: la modifilo '%c%s' ne permesas argumenton\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: la modifilo '%c%s' ne permesas argumenton\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: la modifilo '--%s' postulas argumenton\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: la modifilo '--%s' postulas argumenton\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: nerekonata modifilo '--%s'\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nerekonata modifilo '--%s'\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: nerekonata modifilo '%c%s'\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nerekonata modifilo '%c%s'\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: la modifilo '-W %s' estas plursenca\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: la modifilo '-W %s' estas plursenca\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: la modifilo '-W %s' ne permesas argumenton\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: la modifilo '-W %s' ne permesas argumenton\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: la modifilo '-W %s' postulas argumenton\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, 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 e6b8274..cb7e344 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -45,14 +45,6 @@ msgstr "Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä" msgid "game;interstellar;trading;strategy;" msgstr "" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1698,175 +1690,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: valitsin ’%s%s’ ei ole yksiselitteinen\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: valitsin ’%s%s’ ei ole yksiselitteinen; mahdollisuudet:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: tunnistamaton valitsin ’%s%s’\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: valitsin ’%s%s’ ei salli argumenttia\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: valitsin ’%s%s’ vaatii argumentin\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: virheellinen valitsin -- ’%c’\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valitsin vaatii argumentin -- ’%c’\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: valitsin ’%s%s’ ei ole yksiselitteinen\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: valitsin ’%s%s’ ei ole yksiselitteinen; mahdollisuudet:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: tunnistamaton valitsin ’%s%s’\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: valitsin ’%s%s’ ei salli argumenttia\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: valitsin ’%s%s’ vaatii argumentin\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: virheellinen valitsin -- ’%c’\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: valitsin vaatii argumentin -- ’%c’\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: valitsin ’--%s’ vaatii argumentin\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: valitsin ’--%s’ vaatii argumentin\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: tunnistamaton valitsin ’--%s’\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tunnistamaton valitsin ’--%s’\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: tunnistamaton valitsin ’%c%s’\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tunnistamaton valitsin ’%c%s’\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, 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 53e37a5..c4f5bfd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" @@ -51,14 +51,6 @@ msgstr "Jouer à Star Traders, un simple jeu de commerce interstellaire" msgid "game;interstellar;trading;strategy;" msgstr "jeu;interstellaire;commerce;stratégie;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1713,175 +1705,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: « %lc »" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: l'option « %s%s » est ambiguë\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: option « %s%s » non reconnue\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: l'option « %s%s » exige un argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: option invalide -- « %c »\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'option exige un argument -- « %c »\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: l'option « %s%s » est ambiguë\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: l'option « %s%s » est ambiguë; les possibilités sont:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: option « %s%s » non reconnue\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: l'option « %s%s » n'accepte pas d'argument\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: l'option « %s%s » exige un argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: option invalide -- « %c »\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: l'option exige un argument -- « %c »\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: l'option « %s » est ambiguë; les possibilités sont:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: l'option « %s » est ambiguë; les possibilités sont:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: l'option « %s » est ambiguë\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: l'option « %s » est ambiguë\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: l'option « --%s » n'accepte pas d'argument\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l'option « --%s » n'accepte pas d'argument\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: l'option « %c%s » n'accepte pas d'argument\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l'option « %c%s » n'accepte pas d'argument\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: l'option « --%s » exige un argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: l'option « --%s » exige un argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: option « --%s » non reconnue\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: option « --%s » non reconnue\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: option « %c%s » non reconnue\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: option « %c%s » non reconnue\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: l'option « -W %s » est ambiguë\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l'option « -W %s » est ambiguë\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'option « -W %s » n'accepte pas d'argument\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l'option « -W %s » n'accepte pas d'argument\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: l'option « -W %s » exige un argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: l'option « -W %s » exige un argument\n" diff --git a/po/hr.po b/po/hr.po index 36f5102..892621d 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -44,14 +44,6 @@ msgstr "Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja" msgid "game;interstellar;trading;strategy;" msgstr "" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1698,175 +1690,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc”" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opcija „%s%s” je višeznačna\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: opcija „%s%s” je višeznačna; mogućnosti:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: neprepoznata opcija „%s%s”\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opcija „%s%s” ne dozvoljava argument\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opcija „%s%s” zahtijeva argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neispravna opcija -- „%c”\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcija zahtijeva argument -- „%c”\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: opcija „%s%s” je višeznačna\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: opcija „%s%s” je višeznačna; mogućnosti:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: neprepoznata opcija „%s%s”\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: opcija „%s%s” ne dozvoljava argument\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: opcija „%s%s” zahtijeva argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: neispravna opcija -- „%c”\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: opcija zahtijeva argument -- „%c”\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: opcija „%s” je višeznačna; mogućnosti:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: opcija „%s” je višeznačna; mogućnosti:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opcija „%s” je višeznačna\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcija „%s” je višeznačna\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opcija „--%s” ne dozvoljava argument\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcija „--%s” ne dozvoljava argument\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opcija „%c%s” ne dozvoljava argument\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcija „%c%s” ne dozvoljava argument\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: opcija „--%s” zahtijeva argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: opcija „--%s” zahtijeva argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neprepoznata opcija „--%s”\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neprepoznata opcija „--%s”\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neprepoznata opcija „%c%s”\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neprepoznata opcija „%c%s”\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opcija „-W %s” je višeznačna\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcija „-W %s” je višeznačna\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcija „-W %s” ne dozvoljava argument\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcija „-W %s” ne dozvoljava argument\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: opcija „-W %s” zahtijeva argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, 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 957bab4..4ccbb63 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -44,14 +44,6 @@ msgstr "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítá msgid "game;interstellar;trading;strategy;" msgstr "játék;csillagközi;kereskedés;stratégia;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1692,175 +1684,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc”" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű; lehetőségek:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: ismeretlen „%s%s” kapcsoló\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a(z) „%s%s” kapcsoló nem enged meg argumentumot\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a(z) „%s%s” kapcsolóhoz egy argumentum szükséges\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: érvénytelen kapcsoló -- „%c”\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a kapcsolóhoz egy argumentum szükséges -- „%c”\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: a(z) „%s%s” kapcsoló nem egyértelmű; lehetőségek:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: ismeretlen „%s%s” kapcsoló\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: a(z) „%s%s” kapcsoló nem enged meg argumentumot\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: a(z) „%s%s” kapcsolóhoz egy argumentum szükséges\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: érvénytelen kapcsoló -- „%c”\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: a kapcsolóhoz egy argumentum szükséges -- „%c”\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű; lehetőségek:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, 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/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, 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/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ismeretlen „--%s” kapcsoló\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ismeretlen „--%s” kapcsoló\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ismeretlen „%c%s” kapcsoló\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ismeretlen „%c%s” kapcsoló\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, 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/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, 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/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: a „-W %s” kapcsolóhoz egy argumentum szükséges\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, 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 b06a3df..3f9b133 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" @@ -44,14 +44,6 @@ msgstr "Spill Star Traders, et enkelt spill med interstellar handel" msgid "game;interstellar;trading;strategy;" msgstr "spill;interstellar;handel;strategi;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1693,175 +1685,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: «%lc»" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: valget «%s%s» er tvetydig\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: valget «%s%s» er tvetydig; muligheter:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: ukjent valg «%s%s»\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: valget «%s%s» tillater ikke argumenter\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: valget «%s%s» krever et argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ugyldig valg -- «%c»\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valget krever et argument -- «%c»\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: valget «%s%s» er tvetydig\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: valget «%s%s» er tvetydig; muligheter:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: ukjent valg «%s%s»\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: valget «%s%s» tillater ikke argumenter\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: valget «%s%s» krever et argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: ugyldig alternativ -- «%c»\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: valget krever et argument -- «%c»\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: valget «%s» er tvetydig; muligheter:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: valget «%s» er tvetydig; muligheter:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: valget «%s» er tvetydig\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: valget «%s» er tvetydig\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: valget «--%s» tillater ikke argumenter\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: valget «--%s» tillater ikke argumenter\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: valget «%c%s» tillater ikke argumenter\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: valget «%c%s» tillater ikke argumenter\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: valget «--%s» krever et argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: valget «--%s» krever et argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ukjent valg «--%s»\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ukjent valg «--%s»\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ukjent valg «%c%s»\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ukjent valg «%c%s»\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: valget «-W %s» er tvetydig\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: valget «-W %s» er tvetydig\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: valget «-W %s» tillater ikke argumenter\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: valget «-W %s» tillater ikke argumenter\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: valg «-W %s» trenger et argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: valg «-W %s» trenger et argument\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4c765b5..def7b62 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -45,14 +45,6 @@ msgstr "Jogue Comerciantes Estelares, um jogo simples de comércio interestelar" msgid "game;interstellar;trading;strategy;" msgstr "jogo;interestelar;comércio;estratégia;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1694,175 +1686,186 @@ msgstr "xwcrtomb: NULO" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: “%lc”" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a opção “%s%s” é ambígua\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: a opção “%s%s” é ambígua; possibilidades:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: opção desconhecida “%s%s”\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a opção “%s%s” não permite um argumento\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a opção “%s%s” exige um argumento\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opção inválida -- “%c”\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opção exige um argumento -- “%c”\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: a opção “%s%s” é ambígua\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: a opção “%s%s” é ambígua; possibilidades:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: opção desconhecida “%s%s”\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: a opção “%s%s” não permite um argumento\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: a opção “%s%s” exige um argumento\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: opção inválida -- “%c”\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: a opção exige um argumento -- “%c”\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: a opção “%s” é ambígua; possibilidades:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: a opção “%s” é ambígua; possibilidades:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: a opção “%s” é ambígua\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: a opção “%s” é ambígua\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: a opção “--%s” não permite um argumento\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a opção “--%s” não permite um argumento\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: a opção “%c%s” não permite um argumento\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a opção “%c%s” não permite um argumento\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: a opção “--%s” exige um argumento\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: a opção “--%s” requer um argumento\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opção desconhecida “--%s”\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opção desconhecida “--%s”\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opção desconhecida “%c%s”\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opção desconhecida “%c%s”\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: a opção “-W %s” é ambígua\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a opção “-W %s” é ambígua\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: a opção “-W %s” não permite um argumento\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a opção “-W %s” não permite um argumento\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: a opção “-W %s” exige um argumento\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: a opção “-W %s” exige um argumento\n" diff --git a/po/ru.po b/po/ru.po index c7069ca..c10ec13 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 16:59+1100\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -47,14 +47,6 @@ msgstr "Играть в «Звёздные торговцы», простую и msgid "game;interstellar;trading;strategy;" msgstr "игра;межзвёздная;торговля;стратегия;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1704,175 +1696,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: «%lc»" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: неоднозначный ключ «%s%s»\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: неоднозначный ключ «%s%s»; возможности:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: неизвестный ключ «%s%s»\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: ключ «%s%s» должен использоваться без аргумента\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: ключ «%s%s» должен использоваться с аргументом\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неверный ключ «%c»\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: ключ «%c» должен использоваться с аргументом\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: неоднозначный ключ «%s%s»\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: неоднозначный ключ «%s%s»; возможности:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: неизвестный ключ «%s%s»\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: ключ «%s%s» должен использоваться без аргумента\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: ключ «%s%s» должен использоваться с аргументом\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: неверный ключ «%c»\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: ключ «%c» должен использоваться с аргументом\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: неоднозначный ключ «%s»; возможности:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: неоднозначный ключ «%s»; возможности:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: неоднозначный ключ «%s»\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: неоднозначный ключ «%s»\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ключ «--%s» должен использоваться без аргумента\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: ключ «--%s» должен использоваться без аргумента\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ключ «%c%s» должен использоваться без аргумента\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: ключ «%c%s» должен использоваться без аргумента\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: ключ «--%s» должен использоваться с аргументом\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: ключ «--%s» должен использоваться с аргументом\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: неизвестный ключ «--%s»\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: неизвестный ключ «--%s»\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: неизвестный ключ «%c%s»\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: неизвестный ключ «%c%s»\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: неоднозначный ключ «-W %s»\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: неоднозначный ключ «-W %s»\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ключ «-W %s» должен использоваться без аргумента\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: ключ «-W %s» должен использоваться без аргумента\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: ключ «-W %s» должен использоваться с аргументом\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: ключ «-W %s» должен использоваться с аргументом\n" diff --git a/po/sr.po b/po/sr.po index 56fad6f..518aa6e 100644 --- a/po/sr.po +++ b/po/sr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -45,14 +45,6 @@ msgstr "Играјте Звездане трговце, једноставну msgid "game;interstellar;trading;strategy;" msgstr "игра;међузвездано;трговање;стратегиј;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1695,175 +1687,186 @@ msgstr "xwcrtomb: НИШТА" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: опција „%s%s“ је нејасна\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: опција „%s%s“ је нејасна; могућности:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: непозната опција „%s%s“\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: опција „%s%s“ не дозвољава аргумент\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: опција „%s%s“ захтева аргумент\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неисправна опција -- „%c“\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: опција захтева аргумент -- „%c“\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: опција „%s%s“ је нејасна\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: опција „%s%s“ је нејасна; могућности:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: непозната опција „%s%s“\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: опција „%s%s“ не дозвољава аргумент\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: опција „%s%s“ захтева аргумент\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: неисправна опција -- „%c“\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: опција захтева аргумент -- „%c“\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: опција „%s“ је нејасна; могућности:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: опција „%s“ је нејасна; могућности:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: опција „%s“ је нејасна\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: опција „%s“ је нејасна\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: опција „--%s“ не дозвољава аргумент\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: опција „--%s“ не дозвољава аргумент\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: опција „%c%s“ не дозвољава аргумент\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: опција „%c%s“ не дозвољава аргумент\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: опција „--%s“ захтева аргумент\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: опција „--%s“ захтева аргумент\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: непозната опција „--%s“\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: непозната опција „--%s“\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: непозната опција „%c%s“\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: непозната опција „%c%s“\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: опција „-W %s“ је нејасна\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: опција „-W %s“ је нејасна\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: опција „-W %s“ захтева аргумент\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: опција „-W %s“ захтева аргумент\n" diff --git a/po/sv.po b/po/sv.po index 04e94b5..6e2c38a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 17:06+1100\n" +"POT-Creation-Date: 2021-01-07 18:59+1100\n" "PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -44,14 +44,6 @@ msgstr "Spela Star Traders, ett enkelt spel om interstellär handel" msgid "game;interstellar;trading;strategy;" msgstr "spel;interstellär;handel;strategi;" -#. TRANSLATORS: This string is the name of the icon to use. The Desktop -#. Entry Specification states it is translatable, but unless you provide a -#. matching icon, please leave it as "trader": this will use trader.svg -#. and the various trader.png files in the data source code directory. -#: data/trader.desktop.in:32 -msgid "trader" -msgstr "trader" - #: src/trader.c:235 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" @@ -1698,175 +1690,186 @@ msgstr "xwcrtomb: NUL" msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" -#: lib/getopt.c:278 lib/obsolete-strings.c:45 +#: lib/getopt.c:278 lib/obsolete-strings.c:63 #, c-format msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: flaggan ”%s%s” är tvetydig\n" -#: lib/getopt.c:284 lib/obsolete-strings.c:47 +#: lib/getopt.c:284 lib/obsolete-strings.c:65 #, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: flaggan ”%s%s” är tvetydig; möjligheter:" -#: lib/getopt.c:319 lib/obsolete-strings.c:49 +#: lib/getopt.c:319 lib/obsolete-strings.c:67 #, c-format msgid "%s: unrecognized option '%s%s'\n" msgstr "%s: okänd flagga ”%s%s”\n" -#: lib/getopt.c:345 lib/obsolete-strings.c:51 +#: lib/getopt.c:345 lib/obsolete-strings.c:69 #, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: flaggan ”%s%s” tar inget argument\n" -#: lib/getopt.c:360 lib/obsolete-strings.c:53 +#: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: flaggan ”%s%s” kräver ett argument\n" -#: lib/getopt.c:621 lib/obsolete-strings.c:55 +#: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ogiltig flagga -- ”%c”\n" -#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:57 +#: lib/getopt.c:636 lib/getopt.c:682 lib/obsolete-strings.c:75 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaggan kräver ett argument -- ”%c”\n" +#. TRANSLATORS: Older versions of the GNU Gettext library utilities +#. treat the Icon value in data/trader.desktop.in as a translatable +#. string. That string, the name of the icon to use, is defined here +#. for those older versions of xgettext(1). Unless you provide a +#. matching icon, please leave it as "trader": this will use +#. trader.svg and the various trader.png files in the data source +#. code directory. +#: lib/obsolete-strings.c:48 +msgid "trader" +msgstr "trader" + #. TRANSLATORS: These strings are used in older versions of various #. libraries, such as the GNU C Library as released with various #. Linux distributions. -#: lib/obsolete-strings.c:44 +#: lib/obsolete-strings.c:62 #, c-format msgid "%s: option `%s%s' is ambiguous\n" msgstr "%s: flaggan ”%s%s” är tvetydig\n" -#: lib/obsolete-strings.c:46 +#: lib/obsolete-strings.c:64 #, c-format msgid "%s: option `%s%s' is ambiguous; possibilities:" msgstr "%s: flaggan ”%s%s” är tvetydig; möjligheter:" -#: lib/obsolete-strings.c:48 +#: lib/obsolete-strings.c:66 #, c-format msgid "%s: unrecognized option `%s%s'\n" msgstr "%s: okänd flagga ”%s%s”\n" -#: lib/obsolete-strings.c:50 +#: lib/obsolete-strings.c:68 #, c-format msgid "%s: option `%s%s' doesn't allow an argument\n" msgstr "%s: flaggan ”%s%s” tar inget argument\n" -#: lib/obsolete-strings.c:52 +#: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" msgstr "%s: flaggan ”%s%s” kräver ett argument\n" -#: lib/obsolete-strings.c:54 +#: lib/obsolete-strings.c:72 #, c-format msgid "%s: invalid option -- `%c'\n" msgstr "%s: ogiltig flagga -- ”%c”\n" -#: lib/obsolete-strings.c:56 +#: lib/obsolete-strings.c:74 #, c-format msgid "%s: option requires an argument -- `%c'\n" msgstr "%s: flaggan kräver ett argument -- ”%c”\n" -#: lib/obsolete-strings.c:59 +#: lib/obsolete-strings.c:77 #, c-format msgid "%s: option `%s' is ambiguous; possibilities:" msgstr "%s: flaggan ”%s” är tvetydig; möjligheter:" -#: lib/obsolete-strings.c:60 +#: lib/obsolete-strings.c:78 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: flaggan ”%s” är tvetydig; möjligheter:" -#: lib/obsolete-strings.c:61 +#: lib/obsolete-strings.c:79 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: flaggan ”%s” är tvetydig\n" -#: lib/obsolete-strings.c:62 +#: lib/obsolete-strings.c:80 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: flaggan ”%s” är tvetydig\n" -#: lib/obsolete-strings.c:63 +#: lib/obsolete-strings.c:81 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: flaggan ”--%s” tar inget argument\n" -#: lib/obsolete-strings.c:64 +#: lib/obsolete-strings.c:82 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flaggan ”--%s” tar inget argument\n" -#: lib/obsolete-strings.c:65 +#: lib/obsolete-strings.c:83 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: flaggan ”%c%s” tar inget argument\n" -#: lib/obsolete-strings.c:66 +#: lib/obsolete-strings.c:84 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flaggan ”%c%s” tar inget argument\n" -#: lib/obsolete-strings.c:67 +#: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" msgstr "%s: flaggan ”--%s” kräver ett argument\n" -#: lib/obsolete-strings.c:68 +#: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: flaggan ”--%s” kräver ett argument\n" -#: lib/obsolete-strings.c:69 +#: lib/obsolete-strings.c:87 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: okänd flagga ”--%s”\n" -#: lib/obsolete-strings.c:70 +#: lib/obsolete-strings.c:88 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: okänd flagga ”--%s”\n" -#: lib/obsolete-strings.c:71 +#: lib/obsolete-strings.c:89 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: okänd flagga ”%c%s”\n" -#: lib/obsolete-strings.c:72 +#: lib/obsolete-strings.c:90 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: okänd flagga ”%c%s”\n" -#: lib/obsolete-strings.c:73 +#: lib/obsolete-strings.c:91 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: flaggan ”-W %s” är tvetydig\n" -#: lib/obsolete-strings.c:74 +#: lib/obsolete-strings.c:92 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flaggan ”-W %s” är tvetydig\n" -#: lib/obsolete-strings.c:75 +#: lib/obsolete-strings.c:93 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flaggan ”-W %s” tar inget argument\n" -#: lib/obsolete-strings.c:76 +#: lib/obsolete-strings.c:94 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flaggan ”-W %s” tar inget argument\n" -#: lib/obsolete-strings.c:77 +#: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" msgstr "%s: flaggan ”-W %s” kräver ett argument\n" -#: lib/obsolete-strings.c:78 +#: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: flaggan ”-W %s” kräver ett argument\n" From 1870fedc682db96d30c85ad202ccdac99565a0e4 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 22:57:02 +1100 Subject: [PATCH 18/32] Use ASCII single-quote instead of right quote characters --- doc/trader.6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/trader.6 b/doc/trader.6 index 07eedef..0180fb7 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -136,7 +136,7 @@ experience, try (again, typed all on one line): .sp .nh .na -.B "xterm \-g 80x24 \-fa Mono \-fs 18 \-bg '#181818' \-fg '#2CAB00' \-bc +sb +bdc +fbx \-xrm 'XTerm*colorBD: #41FF00' \-e trader \-\-no\-colour &" +.B "xterm \-g 80x24 \-fa Mono \-fs 18 \-bg \(aq#181818\(aq \-fg \(aq#2CAB00\(aq \-bc +sb +bdc +fbx \-xrm \(aqXTerm*colorBD: #41FF00\(aq \-e trader \-\-no\-colour &" .ad .hy 14 .sp @@ -146,7 +146,7 @@ Or, if you prefer the old amber screens of yesteryear: .sp .nh .na -.B "xterm \-g 80x24 \-fa Mono \-fs 18 \-bg '#101010' \-fg '#AB7A00' \-bc +sb +bdc +fbx \-xrm 'XTerm*colorBD: #FFB700' \-e trader \-\-no\-colour &" +.B "xterm \-g 80x24 \-fa Mono \-fs 18 \-bg \(aq#101010\(aq \-fg \(aq#AB7A00\(aq \-bc +sb +bdc +fbx \-xrm \(aqXTerm*colorBD: #FFB700\(aq \-e trader \-\-no\-colour &" .ad .hy 14 .sp From 88dc3b54a53f6e1734db15dc6b97b051e6bead4a Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 23:17:44 +1100 Subject: [PATCH 19/32] Reword an entry in NEWS --- NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 5fcc5c7..c89531d 100644 --- a/NEWS +++ b/NEWS @@ -25,10 +25,10 @@ __ https://www.zap.org.au/ Version 7.15 (not yet released) ------------------------------- -Updated all references to GNU Gettext to version 0.20. Updated to the -latest snapshot of the Gnulib GNU Portability Library. Also updated the -`INSTALL` file to list the latest tested versions of operating systems, -including a new listing for Haiku R1/beta2. +Updated to GNU Gettext 0.20 or later. Updated to the latest snapshot of +the Gnulib GNU Portability Library. Also updated the `INSTALL` file to +list the latest tested versions of operating systems, including a new +listing for Haiku R1/beta2. Version 7.14 (9th January, 2020) From b132686a6390b8d1fea6b6b2179838f0bf4b8616 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 23:19:41 +1100 Subject: [PATCH 20/32] Use the XDG Base Directory Specification for storing game files --- NEWS | 8 +++++ doc/trader.6 | 23 +++++++++++--- src/utils.c | 84 +++++++++++++++++++++++++++++++++++++++++++++------- src/utils.h | 18 +++++++---- 4 files changed, 113 insertions(+), 20 deletions(-) diff --git a/NEWS b/NEWS index c89531d..3bf4fee 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,14 @@ __ https://www.zap.org.au/ Version 7.15 (not yet released) ------------------------------- +Changed the default location where game files are saved from `~/.trader` +to `~/.local/share/trader`, so as to follow the `XDG Base Directory +Specification`__. If set, the ``XDG_DATA_HOME`` environment variable +will override this location. If the `~/.trader` directory is already +present, it will continue to be used. Updated the manual page to suit. + +__ https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html + Updated to GNU Gettext 0.20 or later. Updated to the latest snapshot of the Gnulib GNU Portability Library. Also updated the `INSTALL` file to list the latest tested versions of operating systems, including a new diff --git a/doc/trader.6 b/doc/trader.6 index 0180fb7..85edde9 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -154,6 +154,15 @@ Or, if you prefer the old amber screens of yesteryear: .\" ********************************************************************* .SH ENVIRONMENT .TP +.BR XDG_DATA_HOME ", " HOME +If \fBXDG_DATA_HOME\fR is set to an absolute pathname (that is, a path +that starts with \*(lq\fI/\fR\*(rq), Star Traders will use that +directory, with a subdirectory \fItrader\fR, to store game files. If +this environment variable is not set or does not start with +\*(lq\fI/\fR\*(rq, \fI\(ti/.local/share/trader\fR will be used instead, +where \*(lq\fI\(ti\fR\*(rq represents your home directory, as contained +in the \fBHOME\fR environment variable. +.TP .BR LINES ", " COLUMNS Star Traders uses the Curses library for displaying text on the screen. As such, it will access these two environment variables if the underlying @@ -177,11 +186,17 @@ manual pages for more details on locale settings. .\" ********************************************************************* .SH FILES .TP +.IB \(ti/.local/share/trader/game N +Star Traders stores saved game files in the \fI.local/share/trader\fR +subdirectory in your home directory (unless overriden by the +\fBXDG_DATA_HOME\fR environment variable). \fIN\fR is a number between +\fB1\fR and \fB9\fR inclusive. The game file is scrambled to prevent you +or others from casually cheating! +.TP .IB \(ti/.trader/game N -Star Traders stores saved game files in the \fI.trader\fR subdirectory in -your home directory. \fIN\fR is a number between \fB1\fR and \fB9\fR -inclusive. The game file is scrambled to prevent you or others from -casually cheating! +If the \fI\(ti/.trader\fR directory exists, game files will be read from +and saved to this location instead. This is for compatibility with +versions of Star Traders prior to version 7.15. .\" ********************************************************************* .SH BUGS None yet known... diff --git a/src/utils.c b/src/utils.c index c708e20..4fe5af0 100644 --- a/src/utils.c +++ b/src/utils.c @@ -53,6 +53,10 @@ wchar_t *mon_thousands_sep; // Locale's monetary thousands separator * Module-specific constants and macros * ************************************************************************/ +#define DIRSEP "/" // Directory separator +#define HIDDEN_PATH "." // Hidden file start char +#define XDG_DATA_DEFAULT ".local" DIRSEP "share" + #define GAME_FILENAME_PROTO "game%d" #define GAME_FILENAME_BUFSIZE 16 @@ -306,10 +310,15 @@ void init_program_name (const char *argv0) /* This implementation assumes a POSIX environment with an ASCII-safe character encoding (such as ASCII or UTF-8). */ + const char *dirsep = DIRSEP; + + + assert(strlen(dirsep) == 1); + if (argv0 == NULL || *argv0 == '\0') { program_name = PACKAGE; } else { - char *p = strrchr(argv0, '/'); + char *p = strrchr(argv0, dirsep[0]); if (p != NULL && *++p != '\0') { program_name = xstrdup(p); @@ -343,21 +352,74 @@ const char *home_directory (void) const char *data_directory (void) { - /* This implementation assumes a POSIX environment by using "/" as + /* This implementation assumes a POSIX environment by using DIRSEP as the directory separator. It also assumes a dot-starting directory name is permissible (again, true on POSIX systems) and that the character encoding is ASCII-safe. */ + const char *dirsep = DIRSEP; + const char *dirsep_hiddenpath = DIRSEP HIDDEN_PATH; + const char *datahome_part = DIRSEP XDG_DATA_DEFAULT DIRSEP; + + struct stat statbuf; + + + assert(strlen(dirsep) == 1); + if (data_directory_str == NULL) { const char *home = home_directory(); + const char *xdg_data_home = getenv("XDG_DATA_HOME"); - if (program_name != NULL && home != NULL) { - char *p = xmalloc(strlen(home) + strlen(program_name) + 3); + if (program_name != NULL) { + int len_program_name = strlen(program_name); - strcpy(p, home); - strcat(p, "/."); - strcat(p, program_name); - data_directory_str = p; + if (home != NULL) { + char *p = xmalloc(strlen(home) + strlen(dirsep_hiddenpath) + + len_program_name + 1); + + strcpy(p, home); + strcat(p, dirsep_hiddenpath); + strcat(p, program_name); + + if (stat(p, &statbuf) == 0 && S_ISDIR(statbuf.st_mode)) { + // Directory "$HOME/.trader" exists: use that + data_directory_str = p; + } else { + free(p); + } + } + + if (data_directory_str == NULL && xdg_data_home != NULL + && *xdg_data_home != '\0' && *xdg_data_home == dirsep[0]) { + // Use directory "$XDG_DATA_HOME/trader" + + /* Note that the XDG Base Directory Specification v0.7 + requires XDG_DATA_HOME to contain an absolute path: + the variable must be ignored if it does not start with + the directory separator DIRSEP ("/") */ + + char *p = xmalloc(strlen(xdg_data_home) + strlen(DIRSEP) + + len_program_name + 1); + + strcpy(p, xdg_data_home); + strcat(p, dirsep); + strcat(p, program_name); + + data_directory_str = p; + } + + if (data_directory_str == NULL && home != NULL) { + // Use directory "$HOME/.local/share/trader" + + char *p = xmalloc(strlen(home) + strlen(datahome_part) + + len_program_name + 1); + + strcpy(p, home); + strcat(p, datahome_part); + strcat(p, program_name); + + data_directory_str = p; + } } } @@ -373,6 +435,8 @@ char *game_filename (int gamenum) /* This implementation assumes a POSIX environment and an ASCII-safe character encoding. */ + const char *dirsep = DIRSEP; + char buf[GAME_FILENAME_BUFSIZE]; // Buffer for part of filename const char *dd; // Data directory @@ -387,10 +451,10 @@ char *game_filename (int gamenum) if (dd == NULL) { return xstrdup(buf); } else { - char *p = xmalloc(strlen(dd) + strlen(buf) + 2); + char *p = xmalloc(strlen(dd) + strlen(dirsep) + strlen(buf) + 1); strcpy(p, dd); - strcat(p, "/"); + strcat(p, dirsep); strcat(p, buf); return p; } diff --git a/src/utils.h b/src/utils.h index ff408a9..a513f7f 100644 --- a/src/utils.h +++ b/src/utils.h @@ -99,12 +99,18 @@ extern const char *home_directory (void); Parameters: (none) Returns: const char * - Pointer to data directory - This function returns the full pathname to a potentially-writable - subdirectory within the user's home directory. Essentially, this - function returns home_directory() + "/." + program_name. Note that - this path is NOT created by this function, nor is the ability to write - to this path checked. NULL is returned if this path cannot be - determined. + This function returns the full pathname to a potentially-writable data + directory, usually within the user's home directory. + + Assuming program_name is set to "trader", if "$HOME/.trader" exists, + that directory is returned as the data directory. Otherwise, if the + environment variable XDG_DATA_HOME is set and contains an absolute + pathname, "$XDG_DATA_HOME/trader" is returned. Otherwise, + "$HOME/.local/share/trader" is returned. + + Note that the returned path is NOT created by this function, nor is the + ability to read from or write to this path checked. NULL is returned + if the path cannot be determined. */ extern const char *data_directory (void); From 1829cdd8d2e2e4d9a1ef42c4d4d34ad9b7a3502a Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 23:27:19 +1100 Subject: [PATCH 21/32] Use previous font rather than roman font in the manual page --- doc/trader.6 | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/trader.6 b/doc/trader.6 index 85edde9..afafce0 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -57,15 +57,15 @@ trader \- a game of interstellar trading .RB [ \-V | \-\-version ] .\" ********************************************************************* .SH DESCRIPTION -\fBStar Traders\fR is a simple game of interstellar trading, where the +\fBStar Traders\fP is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow and repay money, in order to become the wealthiest player (the winner). .\" ********************************************************************* .SH OPTIONS .TP .I GAME -If \fIGAME\fR is specified as a number between \fB1\fR and \fB9\fR -(inclusive), load and continue playing that game. If \fIGAME\fR is not +If \fIGAME\fP is specified as a number between \fB1\fP and \fB9\fP +(inclusive), load and continue playing that game. If \fIGAME\fP is not specified, start a new game. .TP .BR \-\-no\-color ", " \-\-no\-colour @@ -75,8 +75,8 @@ for a \*(lqretro-computing\*(rq look (as shown in the below). .TP .BI \-\-max\-turn= NUM -Set the number of turns in the game to \fINUM\fR. In this version of -Star Traders, \fINUM\fR must be greater or equal to 10. If this option +Set the number of turns in the game to \fINUM\fP. In this version of +Star Traders, \fINUM\fP must be greater or equal to 10. If this option is not specified, the default is 50 turns. .TP .BR \-h ", " \-\-help @@ -155,18 +155,18 @@ Or, if you prefer the old amber screens of yesteryear: .SH ENVIRONMENT .TP .BR XDG_DATA_HOME ", " HOME -If \fBXDG_DATA_HOME\fR is set to an absolute pathname (that is, a path -that starts with \*(lq\fI/\fR\*(rq), Star Traders will use that -directory, with a subdirectory \fItrader\fR, to store game files. If +If \fBXDG_DATA_HOME\fP is set to an absolute pathname (that is, a path +that starts with \*(lq\fI/\fP\*(rq), Star Traders will use that +directory, with a subdirectory \fItrader\fP, to store game files. If this environment variable is not set or does not start with -\*(lq\fI/\fR\*(rq, \fI\(ti/.local/share/trader\fR will be used instead, -where \*(lq\fI\(ti\fR\*(rq represents your home directory, as contained -in the \fBHOME\fR environment variable. +\*(lq\fI/\fP\*(rq, \fI\(ti/.local/share/trader\fP will be used instead, +where \*(lq\fI\(ti\fP\*(rq represents your home directory, as contained +in the \fBHOME\fP environment variable. .TP .BR LINES ", " COLUMNS Star Traders uses the Curses library for displaying text on the screen. As such, it will access these two environment variables if the underlying -Curses library does so (see, for example, the \fBENVIRONMENT\fR section +Curses library does so (see, for example, the \fBENVIRONMENT\fP section in the .BR ncurses (3) manual page for in-depth details). It requires a text console or window @@ -175,10 +175,10 @@ of at least 80\(mu24 in size. .BR LANG ", " LC_ALL ", etc." This version of Star Traders has full support for locales and will use appropriate settings. In particular, messages will be displayed using -\fBLC_MESSAGES\fR and \fBLANGUAGE\fR (if Star Traders has been translated +\fBLC_MESSAGES\fP and \fBLANGUAGE\fP (if Star Traders has been translated into that language). In addition, numeric quantities will be displayed -using \fBLC_NUMERIC\fR and monetary quantities will use -\fBLC_MONETARY\fR. See the +using \fBLC_NUMERIC\fP and monetary quantities will use +\fBLC_MONETARY\fP. See the .BR locale (7) or .BR setlocale (3) @@ -187,14 +187,14 @@ manual pages for more details on locale settings. .SH FILES .TP .IB \(ti/.local/share/trader/game N -Star Traders stores saved game files in the \fI.local/share/trader\fR +Star Traders stores saved game files in the \fI.local/share/trader\fP subdirectory in your home directory (unless overriden by the -\fBXDG_DATA_HOME\fR environment variable). \fIN\fR is a number between -\fB1\fR and \fB9\fR inclusive. The game file is scrambled to prevent you +\fBXDG_DATA_HOME\fP environment variable). \fIN\fP is a number between +\fB1\fP and \fB9\fP inclusive. The game file is scrambled to prevent you or others from casually cheating! .TP .IB \(ti/.trader/game N -If the \fI\(ti/.trader\fR directory exists, game files will be read from +If the \fI\(ti/.trader\fP directory exists, game files will be read from and saved to this location instead. This is for compatibility with versions of Star Traders prior to version 7.15. .\" ********************************************************************* @@ -205,7 +205,7 @@ None yet known... Your comments, suggestions, corrections and enhancements are always warmly welcomed! Please send these to: .IP Postal: 10n -\fBJohn Zaitseff\fR, +\fBJohn Zaitseff\fP, .br The ZAP Group, .br @@ -236,7 +236,7 @@ Australia .SH COPYRIGHT Copyright \(co 1990\-2021, John Zaitseff. .PP -\fBStar Traders\fR is free software that is distributed under the terms +\fBStar Traders\fP is free software that is distributed under the terms of the GNU General Public License. You can redistribute it and/or modify it under the terms of that License as published by the Free Software Foundation, either version 3 or (at your option) any later version. @@ -250,7 +250,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see the .URL https://www.gnu.org/licenses/ "GNU licenses web page" . .PP -Even though the GNU General Public License does \fInot\fR require you to +Even though the GNU General Public License does \fInot\fP require you to send your modifications back to the author, it is considered \*(lqgood form\*(rq to do so, as this allows your modifications to be incorporated into future versions of the program, allowing others to benefit from From 07271d07919ac8a811348e8ba4e42fdac4f0ecfd Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 7 Jan 2021 23:31:50 +1100 Subject: [PATCH 22/32] Update line numbers in all PO files --- po/da.po | 14 +++++++------- po/de.po | 14 +++++++------- po/en_AU.po | 14 +++++++------- po/en_CA.po | 14 +++++++------- po/en_GB.po | 14 +++++++------- po/en_US.po | 14 +++++++------- po/eo.po | 14 +++++++------- po/fi.po | 14 +++++++------- po/fr.po | 14 +++++++------- po/hr.po | 14 +++++++------- po/hu.po | 14 +++++++------- po/nb.po | 14 +++++++------- po/pt_BR.po | 14 +++++++------- po/ru.po | 14 +++++++------- po/sr.po | 14 +++++++------- po/sv.po | 14 +++++++------- 16 files changed, 112 insertions(+), 112 deletions(-) diff --git a/po/da.po b/po/da.po index 18357d5..ed00ac3 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -1665,31 +1665,31 @@ msgctxt "answer" msgid "No" msgstr "Nej" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "ikke nok hukommelse" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: »%s«" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: »%lc«" diff --git a/po/de.po b/po/de.po index d6e0e95..bd53cd8 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" @@ -1666,31 +1666,31 @@ msgctxt "answer" msgid "No" msgstr "Nein" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "Kein frier Speicer mehr vorhanden" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s“" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" diff --git a/po/en_AU.po b/po/en_AU.po index 976284c..2816d15 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" @@ -1650,31 +1650,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_CA.po b/po/en_CA.po index e3eb334..9355678 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" @@ -1650,31 +1650,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_GB.po b/po/en_GB.po index 4159575..8caf553 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" @@ -1650,31 +1650,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_US.po b/po/en_US.po index 4262963..c21d7d3 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" @@ -1650,31 +1650,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/eo.po b/po/eo.po index cb6e93f..762a27e 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -1657,31 +1657,31 @@ msgctxt "answer" msgid "No" msgstr "Ne" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "memoro plenpleniĝas" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: '%s'" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: '%lc'" diff --git a/po/fi.po b/po/fi.po index cb7e344..607dfdc 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -1661,31 +1661,31 @@ msgctxt "answer" msgid "No" msgstr "Ei" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "muisti loppui" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ”%s”" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" diff --git a/po/fr.po b/po/fr.po index c4f5bfd..dc204a3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" @@ -1676,31 +1676,31 @@ msgctxt "answer" msgid "No" msgstr "Non" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "pas assez de mémoire" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: « %s »" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: « %lc »" diff --git a/po/hr.po b/po/hr.po index 892621d..fd4a24b 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -1661,31 +1661,31 @@ msgctxt "answer" msgid "No" msgstr "Ne" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "nema dovoljno memorije" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s”" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc”" diff --git a/po/hu.po b/po/hu.po index 4ccbb63..08f4ba5 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -1655,31 +1655,31 @@ msgctxt "answer" msgid "No" msgstr "Nem" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "nincs elég memória" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s”" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc”" diff --git a/po/nb.po b/po/nb.po index 3f9b133..2f5d87b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" @@ -1656,31 +1656,31 @@ msgctxt "answer" msgid "No" msgstr "Nei" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "ikke mer minne" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: «%s»" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: «%lc»" diff --git a/po/pt_BR.po b/po/pt_BR.po index def7b62..094ec04 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -1657,31 +1657,31 @@ msgctxt "answer" msgid "No" msgstr "Não" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "memória esgotada" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: “%s”" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NULO" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: “%lc”" diff --git a/po/ru.po b/po/ru.po index c10ec13..82dd329 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 16:59+1100\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -1667,31 +1667,31 @@ msgctxt "answer" msgid "No" msgstr "Нет" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "недостаточно памяти" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: «%s»" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: «%lc»" diff --git a/po/sr.po b/po/sr.po index 518aa6e..6e0fd09 100644 --- a/po/sr.po +++ b/po/sr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -1658,31 +1658,31 @@ msgctxt "answer" msgid "No" msgstr "Не" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "нема више меморије" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s“" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: НИШТА" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" diff --git a/po/sv.po b/po/sv.po index 6e2c38a..b739a4b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 18:59+1100\n" +"POT-Creation-Date: 2021-01-07 23:30+1100\n" "PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -1661,31 +1661,31 @@ msgctxt "answer" msgid "No" msgstr "Nej" -#: src/utils.c:417 src/utils.c:438 +#: src/utils.c:481 src/utils.c:502 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:443 +#: src/utils.c:507 msgid ": " msgstr ": " -#: src/utils.c:456 +#: src/utils.c:520 #, c-format msgid "out of memory" msgstr "slut på minne" -#: src/utils.c:1110 +#: src/utils.c:1174 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ”%s”" -#: src/utils.c:1150 +#: src/utils.c:1214 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1155 +#: src/utils.c:1219 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" From 89e1f2eca5d78f0bb43ba22bb2f493901091e775 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 8 Jan 2021 00:16:20 +1100 Subject: [PATCH 23/32] Use uppercase polite singluar forms in the Russian translation --- NEWS | 3 +++ po/ru.po | 45 ++++++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/NEWS b/NEWS index 3bf4fee..3c9fd36 100644 --- a/NEWS +++ b/NEWS @@ -33,6 +33,9 @@ present, it will continue to be used. Updated the manual page to suit. __ https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html +Updated the Russian translation to use the uppercase polite singular +forms «Вы» and «Ваш», as is customary in written documents. + Updated to GNU Gettext 0.20 or later. Updated to the latest snapshot of the Gnulib GNU Portability Library. Also updated the `INSTALL` file to list the latest tested versions of operating systems, including a new diff --git a/po/ru.po b/po/ru.po index 82dd329..0c6fd3f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -18,14 +18,13 @@ msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2021-01-07 23:30+1100\n" -"PO-Revision-Date: 2021-01-07 16:59+1100\n" -"Last-Translator: Pavel Maryanov \n" +"PO-Revision-Date: 2021-01-08 00:14+1100\n" +"Last-Translator: John Zaitseff \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. TRANSLATORS: The name of the game. You may choose to translate it into @@ -820,7 +819,7 @@ msgstr "" "Ваш долг составляет %N!\n" "\n" "^{Межзвёздный торговый банк конфисковал^}\n" -"%N^{ из ваших наличных денег.^}" +"%N^{ из Ваших наличных денег.^}" #: src/exch.c:98 #, c-format @@ -926,12 +925,12 @@ msgstr " Недостаточный предел кредита " #: src/exch.c:427 #, c-format msgid "The Bank will not lend you any more money." -msgstr "Банк не готов предоставлять вам больше денег." +msgstr "Банк не готов предоставлять Вам больше денег." #: src/exch.c:447 #, c-format msgid "How much do you wish to borrow? " -msgstr "Сколько вы хотите взять в кредит? " +msgstr "Сколько Вы хотите взять в кредит? " #: src/exch.c:479 #, c-format @@ -941,7 +940,7 @@ msgstr " Нет долга " #: src/exch.c:480 #, c-format msgid "You have no debt to repay." -msgstr "У вас нет долга для погашения." +msgstr "У Вас нет долга для погашения." #: src/exch.c:484 #, c-format @@ -951,12 +950,12 @@ msgstr " Нет наличных " #: src/exch.c:485 #, c-format msgid "You have no cash with which to repay the debt!" -msgstr "У вас нет наличных для погашения долга!" +msgstr "У Вас нет наличных для погашения долга!" #: src/exch.c:505 #, c-format msgid "How much do you wish to repay? " -msgstr "Сколько вы хотите вернуть? " +msgstr "Сколько Вы хотите вернуть? " #. TRANSLATORS: %ls represents the company name. #: src/exch.c:581 @@ -1077,7 +1076,7 @@ msgid "" "You do not have enough cash\n" "to purchase additional shares." msgstr "" -"У вас недостаточно наличных денег, чтобы\n" +"У Вас недостаточно наличных денег, чтобы\n" "приобрести дополнительные акции." #: src/exch.c:736 @@ -1091,7 +1090,7 @@ msgstr[2] "Вы можете приобрести до ^{%'ld^} акций." #: src/exch.c:742 #, c-format msgid "How many shares do you wish to purchase? " -msgstr "Сколько акций вы хотите приобрести? " +msgstr "Сколько акций Вы хотите приобрести? " #: src/exch.c:763 #, c-format @@ -1101,7 +1100,7 @@ msgstr " Нет акций " #: src/exch.c:764 #, c-format msgid "You do not have any shares to sell." -msgstr "У вас нет ни одной акции для продажи." +msgstr "У Вас нет ни одной акции для продажи." #: src/exch.c:771 #, c-format @@ -1114,7 +1113,7 @@ msgstr[2] "Вы можете продать до ^{%'ld^} акций." #: src/exch.c:777 #, c-format msgid "How many shares do you wish to sell? " -msgstr "Сколько акций вы хотите продать? " +msgstr "Сколько акций Вы хотите продать? " #: src/exch.c:805 #, c-format @@ -1431,12 +1430,12 @@ msgid "" msgstr "" "При выборе позиции рядом со звездой (или рядом с форпостом), будет сформи-\n" "ровано ^Bновое торговое предприятие^N, и код этой новой фирмы появится на карте\n" -"галактики. В качестве награды за создание компании, вы получите первые пять\n" +"галактики. В качестве награды за создание компании, Вы получите первые пять\n" "акций. До ^B~c-и^N компаний могут быть созданы таким образом.\n" "\n" "При выборе позиции рядом с уже существующей компанией, эта компания расширит\n" "свою деятельность на одну клетку. Это увеличивает стоимость её акций и,\n" -"следовательно, вашего дохода. Таким образом, выбор позиции ^k~6^N или ^k~8^N на ука-\n" +"следовательно, Вашего дохода. Таким образом, выбор позиции ^k~6^N или ^k~8^N на ука-\n" "занной ниже карте расширяет маршруты компании ^B~B^N:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1463,7 +1462,7 @@ msgid "" "more valuable: the company's share price will increase by a greater amount\n" "than it would for outposts not next to stars.\n" msgstr "" -"Выбор позиции рядом со звездой увеличивает стоимость ваших акций примерно в\n" +"Выбор позиции рядом со звездой увеличивает стоимость Ваших акций примерно в\n" "пять раз, по сравнению с расширением фирмы клеткой не рядом со звездой.\n" "Таким образом, позиция ^k~6^N является более предпочтительной, чем позиция ^k~8^N.\n" "\n" @@ -1534,21 +1533,21 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" -"После выбора позиции, вы оказываетесь на ^BМежзвёздной фондовой бирже^N. Здесь\n" -"вы можете приобретать акции, продавать их, занимать деньги у торгового банка\n" +"После выбора позиции, Вы оказываетесь на ^BМежзвёздной фондовой бирже^N. Здесь\n" +"Вы можете приобретать акции, продавать их, занимать деньги у торгового банка\n" "или погашать часть своего долга (если применимо). Обратите внимание, что\n" "каждая компания выпускает ограниченное количество акций ― нельзя просто бес-\n" "конечно покупать! Однако, можно предлагать фирме выпустить больше акций.\n" -"Чем больше ваше владение в фирме, тем больше шансов получить больше акций.\n" +"Чем больше Ваше владение в фирме, тем больше шансов получить больше акций.\n" "\n" "Игра обычно заканчивается после ^B~t-и^N ходов. Однако, можно закончить игру\n" "раньше, нажав ^K^N вместо выбора позиции. Кроме того, отдельные игроки\n" -"могут объявить себя банкротом в любой момент. Если ваш долг достаточно\n" -"велик, банк может сделать это за вас! Если не хватает времени закончить\n" -"игру, вы можете сохранить её и продолжить позже.\n" +"могут объявить себя банкротом в любой момент. Если Ваш долг достаточно\n" +"велик, банк может сделать это за Вас! Если не хватает времени закончить\n" +"игру, Вы можете сохранить её и продолжить позже.\n" "\n" "^BПобедителем игры^N является игрок с самой большой нетто-стоимостью, то есть,\n" -"разностью между активами (наличные деньги + акции) и долгом. ^HУдачи вам^N ― да\n" +"разностью между активами (наличные деньги + акции) и долгом. ^HУдачи Вам^N ― да\n" "победит лучший игрок!\n" #: src/help.c:225 From 0d1bc30f6aaa71927a59f86aca8a00116ebda8ec Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 9 Jan 2021 07:27:52 +1100 Subject: [PATCH 24/32] Update INSTALL to reflect extensive testing --- INSTALL | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/INSTALL b/INSTALL index 5a70911..e97b00a 100644 --- a/INSTALL +++ b/INSTALL @@ -208,36 +208,37 @@ tested with this version of Star Traders: ===================== ====== ===== ======================== Linux distribution Arch Glibc Compiler ===================== ====== ===== ======================== -Debian GNU/Linux Sid x86_64 2.30 GNU C Compiler 9.3.0 -Debian GNU/Linux Sid x86_64 2.30 Clang (LLVM) 9.0.1 -Debian GNU/Linux Sid i686 2.30 GNU C Compiler 9.3.0 -Debian GNU/Linux Sid i686 2.30 Clang (LLVM) 9.0.1 +Debian GNU/Linux Sid x86_64 2.31 GNU C Compiler 10.2.1 +Debian GNU/Linux Sid x86_64 2.31 Clang (LLVM) 11.0.1 +Debian GNU/Linux Sid i686 2.31 GNU C Compiler 10.2.1 +Debian GNU/Linux Sid i686 2.31 Clang (LLVM) 11.0.1 Debian GNU/Linux 10.3 x86_64 2.28 GNU C Compiler 8.3.0 Debian GNU/Linux 10.3 x86_64 2.28 Clang (LLVM) 7.0.1 +Ubuntu 20.10 x86_64 2.32 GNU C Compiler 10.2.0 +Ubuntu 20.10 x86_64 2.32 Clang (LLVM) 11.0.0 +Ubuntu 20.10 x86_64 2.32 NVIDIA HPC SDK 20.11 Ubuntu 20.04 LTS x86_64 2.31 GNU C Compiler 9.3.0 Ubuntu 20.04 LTS x86_64 2.31 Clang (LLVM) 10.0.0 -Ubuntu 20.04 LTS x86_64 2.31 Portland PGI C/C++ 19.10 -Fedora 32 x86_64 2.31 GNU C Compiler 10.0.1 -CentOS 8.1 x86_64 2.28 GNU C Compiler 8.3.1 -CentOS 7.8 x86_64 2.17 GNU C Compiler 4.8.5 -CentOS 6.10 x86_64 2.12 GNU C Compiler 4.4.7 -CentOS 6.10 x86_64 2.12 Intel C/C++ 19.0.3.199 -OpenSUSE Leap 15.1 x86_64 2.26 GNU C Compiler 7.4.1 +Fedora 33 x86_64 2.32 GNU C Compiler 10.2.1 +CentOS 8.3 x86_64 2.28 GNU C Compiler 8.3.1 +CentOS 8.3 x86_64 2.28 Intel C/C++ 19.1.2.254 +CentOS 7.9 x86_64 2.17 GNU C Compiler 4.8.5 +OpenSUSE Leap 15.2 x86_64 2.26 GNU C Compiler 7.5.0 ===================== ====== ===== ======================== ======================= ====== ============================ ============ Operating system Arch Compiler Notes ======================= ====== ============================ ============ -FreeBSD 12.1 x86_64 Clang (LLVM) 8.0.1 [#freebsd1]_ -NetBSD 9.0 x86_64 GNU C Compiler 7.4.0 [#netbsd1]_ -macOS 10.15 x86_64 Apple Clang (LLVM) 11.0.0 [#macos1]_ -macOS 10.15 x86_64 Apple Clang (LLVM) 11.0.0 [#macos2]_ +FreeBSD 12.2 x86_64 Clang (LLVM) 10.0.1 [#freebsd1]_ +NetBSD 9.1 x86_64 GNU C Compiler 7.5.0 [#netbsd1]_ +macOS 11.0 x86_64 Apple Clang (LLVM) 11.0.0 [#macos1]_ +macOS 11.0 x86_64 Apple Clang (LLVM) 11.0.0 [#macos2]_ Solaris 11.4 (x86_64) x86_64 GNU C Compiler 7.3.0 [#solaris1]_ Solaris 11.4 (x86_64) i386 Oracle Developer Studio 12.6 [#solaris2]_ Solaris 11.4 (x86_64) x86_64 Oracle Developer Studio 12.6 [#solaris3]_ Haiku R1/beta2 x86_64 GNU C Compiler 8.3.0 -Cygwin 3.1.2 (Win7 SP1) i686 GNU C Compiler 7.4.0 -Cygwin 3.1.2 (Win10) x86_64 GNU C Compiler 7.4.0 +Cygwin 3.1.7 (Win10) x86_64 GNU C Compiler 10.2.0 +Cygwin 3.1.7 (Win7 SP1) i686 GNU C Compiler 10.2.0 ======================= ====== ============================ ============ Notes: @@ -285,8 +286,8 @@ list is almost certainly not exhaustive: ================ ====== ==================== ============ Operating system Arch Compiler Notes ================ ====== ==================== ============ -OpenBSD 6.6 x86_64 GNU C Compiler 4.2.1 [#openbsd1]_ -OpenBSD 6.6 x86_64 Clang (LLVM) 8.0.1 [#openbsd1]_ +OpenBSD 6.8 x86_64 GNU C Compiler 4.2.1 [#openbsd1]_ +OpenBSD 6.8 x86_64 Clang (LLVM) 10.0.1 [#openbsd1]_ ================ ====== ==================== ============ Notes: From 4e1378cbb5fbb286b95b5ee34c15f308b7cbdde0 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 9 Jan 2021 10:08:19 +1100 Subject: [PATCH 25/32] Include libraries recommended by gnulib-tool --- src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3fcac4a..099f55e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,8 +41,10 @@ trader_SOURCES = \ utils.c utils.h \ system.h -trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ +trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ @CURSES_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -trader_LDADD = @CURSES_LIBS@ $(top_builddir)/lib/libgnu.a @LIBICONV@ @LIBINTL@ +trader_LDADD = @CURSES_LIBS@ $(top_builddir)/lib/libgnu.a \ + @LIB_HARD_LOCALE@ @LIB_MBRTOWC@ @LIB_SETLOCALE_NULL@ \ + @LIBICONV@ @LIBINTL@ EXTRA_DIST = README From 9631b64b45462adff692dbc12e72a4d3b3352600 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Sat, 9 Jan 2021 10:08:32 +1100 Subject: [PATCH 26/32] Use make variables instead of autoconf replacements --- src/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 099f55e..bb7c04c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,10 +41,10 @@ trader_SOURCES = \ utils.c utils.h \ system.h -trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ - @CURSES_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -trader_LDADD = @CURSES_LIBS@ $(top_builddir)/lib/libgnu.a \ - @LIB_HARD_LOCALE@ @LIB_MBRTOWC@ @LIB_SETLOCALE_NULL@ \ - @LIBICONV@ @LIBINTL@ +trader_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ + $(CURSES_CFLAGS) -DLOCALEDIR=\"$(localedir)\" +trader_LDADD = $(CURSES_LIBS) $(top_builddir)/lib/libgnu.a \ + $(LIB_HARD_LOCALE) $(LIB_MBRTOWC) $(LIB_SETLOCALE_NULL) \ + $(LIBICONV) $(LIBINTL) EXTRA_DIST = README From 28e7cc450cbc5480311d6d54b1bafb1663e0d9d7 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 12 Jan 2021 09:16:53 +1100 Subject: [PATCH 27/32] Tweak the wording of XDG_DATA_HOME in NEWS --- NEWS | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 3c9fd36..04a6b12 100644 --- a/NEWS +++ b/NEWS @@ -27,9 +27,10 @@ Version 7.15 (not yet released) Changed the default location where game files are saved from `~/.trader` to `~/.local/share/trader`, so as to follow the `XDG Base Directory -Specification`__. If set, the ``XDG_DATA_HOME`` environment variable -will override this location. If the `~/.trader` directory is already -present, it will continue to be used. Updated the manual page to suit. +Specification`__. If set to an absolute path, the ``XDG_DATA_HOME`` +environment variable will override this location. If the `~/.trader` +directory is already present, it will continue to be used. Updated the +manual page to suit. __ https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html From 90a815afbb9093c8759f5a25af243c42139c2d34 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 12 Jan 2021 09:48:05 +1100 Subject: [PATCH 28/32] Create parent directories if required during mkdir --- src/fileio.c | 29 +++++++++--------------- src/utils.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/utils.h | 14 ++++++++++++ 3 files changed, 87 insertions(+), 19 deletions(-) diff --git a/src/fileio.c b/src/fileio.c index 4333f4e..b56b672 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -444,7 +444,6 @@ bool save_game (int num) char *codeset; int saved_errno; char *prev_locale; - struct stat statbuf; int i, j, x, y; unsigned int crypt_key; unsigned int *crypt_key_p; @@ -466,25 +465,19 @@ bool save_game (int num) // Create the data directory, if needed data_dir = data_directory(); if (data_dir != NULL) { - if (mkdir(data_dir, S_IRWXU | S_IRWXG | S_IRWXO) != 0) { + if (xmkdir(data_dir, S_IRWXU | S_IRWXG | S_IRWXO) != 0) { + // Data directory could not be created saved_errno = errno; - if (saved_errno == EEXIST && stat(data_dir, &statbuf) == 0 - && S_ISDIR(statbuf.st_mode)) { - ; // Do nothing: directory already exists - } else { - // Data directory could not be created - txdlgbox(MAX_DLG_LINES, 60, 7, WCENTER, attr_error_window, - attr_error_title, attr_error_highlight, - attr_error_normal, 0, attr_error_waitforkey, - _(" Game Not Saved "), - _("Game %d could not be saved to disk.\n\n" - "^{Directory %s: %s^}"), num, data_dir, - strerror(saved_errno)); + txdlgbox(MAX_DLG_LINES, 60, 7, WCENTER, attr_error_window, + attr_error_title, attr_error_highlight, attr_error_normal, + 0, attr_error_waitforkey, _(" Game Not Saved "), + _("Game %d could not be saved to disk.\n\n" + "^{Directory %s: %s^}"), num, data_dir, + strerror(saved_errno)); - free(buf); - free(encbuf); - return false; - } + free(buf); + free(encbuf); + return false; } } diff --git a/src/utils.c b/src/utils.c index 4fe5af0..fa9c8de 100644 --- a/src/utils.c +++ b/src/utils.c @@ -967,7 +967,7 @@ size_t b64encode (const void *restrict in, size_t inlen, if (padding > 0) { assert(count + 2 < outlen); - for (; padding < 3; padding++) { + for ( ; padding < 3; padding++) { *u_out++ = SCRAMBLE_PAD_CHAR; count++; } @@ -1067,6 +1067,67 @@ ssize_t b64decode (const void *restrict in, size_t inlen, // These functions are documented in the file "utils.h" +/***********************************************************************/ +// xmkdir: Check and create directory with its parents + +int xmkdir (const char *pathname, mode_t mode) +{ + const char *dirsep = DIRSEP; + struct stat statbuf; + char *pathcopy; + char *pcomp, *pend; + int ret; + + + assert(strlen(dirsep) == 1); + + if (pathname == NULL || *pathname == '\0') { + errno = ENOENT; // As documented by POSIX + return -1; + } + + // Check that pathname already exists and is a directory + if (stat(pathname, &statbuf) == 0) { + if (S_ISDIR(statbuf.st_mode)) { + return 0; + } else { + errno = ENOTDIR; + return -1; + } + } + + // Try creating the directory + ret = mkdir(pathname, mode); + if (ret == 0 || (errno != ENOENT && errno != ENOTDIR)) { + return ret; + } + + // Try creating directory components, except the last, one by one + pathcopy = xstrdup(pathname); + pcomp = pend = pathcopy; + for ( ; *pend != '\0'; pend++) { + if (*pend == dirsep[0] && pcomp != pend) { + *pend = '\0'; + + ret = mkdir(pathcopy, mode); + if (ret != 0 && errno != EEXIST) { + free(pathcopy); + return ret; + } + + *pend = dirsep[0]; + pcomp = pend + 1; + } + } + + // Try creating the last directory component + ret = mkdir(pathcopy, mode); + + free(pathcopy); + return ret; +} + + /***********************************************************************/ // xmalloc: Allocate a new block of memory, with checking diff --git a/src/utils.h b/src/utils.h index a513f7f..54089cd 100644 --- a/src/utils.h +++ b/src/utils.h @@ -324,6 +324,20 @@ extern char *unscramble (char *restrict dest, const char *restrict src, * Miscellaneous function prototypes * ************************************************************************/ +/* + Function: xmkdir - Check and create directory with its parents + Parameters: pathname - Directory to create + mode - Mode for any new directories + Returns: int - 0 on success, -1 if an error occurred + + This function checks whether pathname exists and is a directory: if so, + 0 is returned. Otherwise, it creates the directory and any parents + that do not already exist. If an error occurs, -1 is returned and + errno is set appropriately. +*/ +extern int xmkdir (const char *pathname, mode_t mode); + + /* Function: xmalloc - Allocate a new block of memory, with checking Parameters: size - Size of new block of memory in bytes From 24165bd66bb7afba21db1d854b62c97baf3697be Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 12 Jan 2021 09:51:29 +1100 Subject: [PATCH 29/32] Update line numbers in all PO files --- po/da.po | 14 +++++++------- po/de.po | 14 +++++++------- po/en_AU.po | 14 +++++++------- po/en_CA.po | 14 +++++++------- po/en_GB.po | 14 +++++++------- po/en_US.po | 14 +++++++------- po/eo.po | 14 +++++++------- po/fi.po | 14 +++++++------- po/fr.po | 14 +++++++------- po/hr.po | 14 +++++++------- po/hu.po | 14 +++++++------- po/nb.po | 14 +++++++------- po/pt_BR.po | 14 +++++++------- po/ru.po | 14 +++++++------- po/sr.po | 14 +++++++------- po/sv.po | 14 +++++++------- 16 files changed, 112 insertions(+), 112 deletions(-) diff --git a/po/da.po b/po/da.po index ed00ac3..c5cf890 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -1238,12 +1238,12 @@ msgstr "%s: gemt med en tegnkodning der ikke er kompatibel" msgid "%s: illegal or missing field on line %d" msgstr "%s: ugyldigt eller manglende felt på linje %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Spil blev ikke gemt " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1254,7 +1254,7 @@ msgstr "" "\n" "^{Mappe %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1679,17 +1679,17 @@ msgstr ": " msgid "out of memory" msgstr "ikke nok hukommelse" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: »%s«" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: »%lc«" diff --git a/po/de.po b/po/de.po index bd53cd8..6b2c367 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" @@ -1241,12 +1241,12 @@ msgstr "%s: unter einer inkompatiblen Zeichenkodierung abgespeichert" msgid "%s: illegal or missing field on line %d" msgstr "%s: unzulässiges oder fehlendes Feld in Zeile %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Spiel Nicht Gespeichert " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1257,7 +1257,7 @@ msgstr "" "\n" "^{Verzeichnis %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1680,17 +1680,17 @@ msgstr ": " msgid "out of memory" msgstr "Kein frier Speicer mehr vorhanden" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s“" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" diff --git a/po/en_AU.po b/po/en_AU.po index 2816d15..421ea74 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" @@ -1227,12 +1227,12 @@ msgstr "%s: saved under an incompatible character encoding" msgid "%s: illegal or missing field on line %d" msgstr "%s: illegal or missing field on line %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1243,7 +1243,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1664,17 +1664,17 @@ msgstr ": " msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_CA.po b/po/en_CA.po index 9355678..b42e0e9 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" @@ -1227,12 +1227,12 @@ msgstr "%s: saved under an incompatible character encoding" msgid "%s: illegal or missing field on line %d" msgstr "%s: illegal or missing field on line %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1243,7 +1243,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1664,17 +1664,17 @@ msgstr ": " msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_GB.po b/po/en_GB.po index 8caf553..2393fb4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" @@ -1227,12 +1227,12 @@ msgstr "%s: saved under an incompatible character encoding" msgid "%s: illegal or missing field on line %d" msgstr "%s: illegal or missing field on line %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1243,7 +1243,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1664,17 +1664,17 @@ msgstr ": " msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_US.po b/po/en_US.po index c21d7d3..a556714 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" @@ -1227,12 +1227,12 @@ msgstr "%s: saved under an incompatible character encoding" msgid "%s: illegal or missing field on line %d" msgstr "%s: illegal or missing field on line %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Game Not Saved " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1243,7 +1243,7 @@ msgstr "" "\n" "^{Directory %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1664,17 +1664,17 @@ msgstr ": " msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/eo.po b/po/eo.po index 762a27e..355c8d8 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -1234,12 +1234,12 @@ msgstr "%s: konservita sub nekongrua signa enkodigo" msgid "%s: illegal or missing field on line %d" msgstr "%s: malpermesata aŭ mankanta kampo en linio %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Seanco ne konservita " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1250,7 +1250,7 @@ msgstr "" "\n" "^{Dosierujo %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1671,17 +1671,17 @@ msgstr ": " msgid "out of memory" msgstr "memoro plenpleniĝas" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: '%s'" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: '%lc'" diff --git a/po/fi.po b/po/fi.po index 607dfdc..cf85b13 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -1238,12 +1238,12 @@ msgstr "%s: tallennettu yhteensopimattomana merkkikoodauksena" msgid "%s: illegal or missing field on line %d" msgstr "%s: virheellinen tai puuttuva kenttä rivillä %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Peliä ei tallennettu " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1254,7 +1254,7 @@ msgstr "" "\n" "^{Hakemisto %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1675,17 +1675,17 @@ msgstr ": " msgid "out of memory" msgstr "muisti loppui" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ”%s”" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" diff --git a/po/fr.po b/po/fr.po index dc204a3..b81a679 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" @@ -1241,12 +1241,12 @@ msgstr "%s: enregistré avec un encodage des caractères incompatible" msgid "%s: illegal or missing field on line %d" msgstr "%s: champ illégal ou manquant à la ligne %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Jeu pas enregistré " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1257,7 +1257,7 @@ msgstr "" "\n" "^{Répertoire %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1690,17 +1690,17 @@ msgstr ": " msgid "out of memory" msgstr "pas assez de mémoire" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: « %s »" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: « %lc »" diff --git a/po/hr.po b/po/hr.po index fd4a24b..2e2a9f4 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -1238,12 +1238,12 @@ msgstr "%s: spremljena s nekompatibilnim kodiranjem znakova" msgid "%s: illegal or missing field on line %d" msgstr "%s: nedozvoljeno ili nedostaje polje u retku %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Igra nije spremljena " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1254,7 +1254,7 @@ msgstr "" "\n" "^{Direktorij %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1675,17 +1675,17 @@ msgstr ": " msgid "out of memory" msgstr "nema dovoljno memorije" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s”" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc”" diff --git a/po/hu.po b/po/hu.po index 08f4ba5..da87efc 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -1231,12 +1231,12 @@ msgstr "%s: egy nem kompatibilis karakterkódolással lett elmentve" 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 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " A játék nincs elmentve " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1247,7 +1247,7 @@ msgstr "" "\n" "^{Könyvtár %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1669,17 +1669,17 @@ msgstr ": " msgid "out of memory" msgstr "nincs elég memória" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s”" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc”" diff --git a/po/nb.po b/po/nb.po index 2f5d87b..163e07b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" @@ -1233,12 +1233,12 @@ msgstr "%s: lagret med en inkompatibel tegnkoding" msgid "%s: illegal or missing field on line %d" msgstr "%s: ulovlig eller manglende felt på linje %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Spill ikke lagret " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1249,7 +1249,7 @@ msgstr "" "\n" "^{Mappe %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1670,17 +1670,17 @@ msgstr ": " msgid "out of memory" msgstr "ikke mer minne" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: «%s»" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: «%lc»" diff --git a/po/pt_BR.po b/po/pt_BR.po index 094ec04..adba52d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -1233,12 +1233,12 @@ msgstr "%s: salvo com uma codificação de caracteres incompatível" msgid "%s: illegal or missing field on line %d" msgstr "%s: campo ilegal ou faltando na linha %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Jogo não salvo " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1249,7 +1249,7 @@ msgstr "" "\n" "^{Diretório %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1671,17 +1671,17 @@ msgstr ": " msgid "out of memory" msgstr "memória esgotada" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: “%s”" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NULO" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: “%lc”" diff --git a/po/ru.po b/po/ru.po index 0c6fd3f..2d4c609 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-08 00:14+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: Russian \n" @@ -1243,12 +1243,12 @@ msgstr "%s: в файле используется неподдерживаем msgid "%s: illegal or missing field on line %d" msgstr "%s: неверное поле или отсутствующее поле в строке %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Игра не сохранена " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1259,7 +1259,7 @@ msgstr "" "\n" "^{Папка %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1680,17 +1680,17 @@ msgstr ": " msgid "out of memory" msgstr "недостаточно памяти" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: «%s»" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: «%lc»" diff --git a/po/sr.po b/po/sr.po index 6e0fd09..47d82be 100644 --- a/po/sr.po +++ b/po/sr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -1235,12 +1235,12 @@ msgstr "%s: сачувана под несагласним кодирањем з msgid "%s: illegal or missing field on line %d" msgstr "%s: недозвољено или недостаје поље у %d. реду" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Игра није сачувана " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1251,7 +1251,7 @@ msgstr "" "\n" "^{Директоријум „%s“: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1672,17 +1672,17 @@ msgstr ": " msgid "out of memory" msgstr "нема више меморије" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s“" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: НИШТА" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" diff --git a/po/sv.po b/po/sv.po index b739a4b..7448ce8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-07 23:30+1100\n" +"POT-Creation-Date: 2021-01-12 09:50+1100\n" "PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -1237,12 +1237,12 @@ msgstr "%s: sparat med en inkompatibel teckenkodning" msgid "%s: illegal or missing field on line %d" msgstr "%s: ogiltigt eller saknat fält på rad %d" -#: src/fileio.c:479 src/fileio.c:501 +#: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " msgstr " Spel ej sparat " -#: src/fileio.c:480 +#: src/fileio.c:474 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1253,7 +1253,7 @@ msgstr "" "\n" "^{Katalog %s: %s^}" -#: src/fileio.c:502 +#: src/fileio.c:495 #, c-format msgid "" "Game %d could not be saved to disk.\n" @@ -1675,17 +1675,17 @@ msgstr ": " msgid "out of memory" msgstr "slut på minne" -#: src/utils.c:1174 +#: src/utils.c:1235 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ”%s”" -#: src/utils.c:1214 +#: src/utils.c:1275 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1219 +#: src/utils.c:1280 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" From 64411226c8665862d31b75decc5cf4bd8ffa028d Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 12 Jan 2021 11:13:20 +1100 Subject: [PATCH 30/32] Update installation instructions for NetBSD --- INSTALL | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index e97b00a..9c10bf3 100644 --- a/INSTALL +++ b/INSTALL @@ -254,11 +254,7 @@ Notes: packages installed with ``pkgin``\(1) (or ``pkg_add``\(1) in older versions of NetBSD), using:: - ./configure --with-libiconv-prefix=/usr/pkg \ - --with-libintl-prefix=/usr/pkg \ - --with-ncursesw --with-ncurses \ - CURSES_CFLAGS=-I/usr/pkg/include \ - LDFLAGS=-L/usr/pkg/lib + ./configure LDFLAGS=-L/usr/pkg/lib .. [#macos1] macOS with Xcode command line tools, with the ``gettext`` package installed with Homebrew, using:: From bcba52c95248f28c0a9a3a25091f97c1ff12816d Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 12 Jan 2021 11:22:40 +1100 Subject: [PATCH 31/32] Update the release date: today! --- NEWS | 4 ++-- doc/trader.6 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 04a6b12..a3b26f5 100644 --- a/NEWS +++ b/NEWS @@ -22,8 +22,8 @@ __ https://www.zap.org.au/ .. contents:: -Version 7.15 (not yet released) -------------------------------- +Version 7.15 (12th January, 2021) +--------------------------------- Changed the default location where game files are saved from `~/.trader` to `~/.local/share/trader`, so as to follow the `XDG Base Directory diff --git a/doc/trader.6 b/doc/trader.6 index afafce0..66bd069 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "7th January, 2021" "Unix-like systems" +.TH TRADER 6 "12th January, 2021" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* From c4f804ac177215e3a0977b4047b09e827c246fe5 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 12 Jan 2021 11:34:56 +1100 Subject: [PATCH 32/32] Update POT creation date in all PO files --- po/da.po | 2 +- po/de.po | 2 +- po/en_AU.po | 2 +- po/en_CA.po | 2 +- po/en_GB.po | 2 +- po/en_US.po | 2 +- po/eo.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/nb.po | 2 +- po/pt_BR.po | 2 +- po/ru.po | 2 +- po/sr.po | 2 +- po/sv.po | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/po/da.po b/po/da.po index c5cf890..428b00c 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 6b2c367..47993d8 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:55+1100\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" diff --git a/po/en_AU.po b/po/en_AU.po index 421ea74..0a0084f 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" diff --git a/po/en_CA.po b/po/en_CA.po index b42e0e9..c2628ed 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" diff --git a/po/en_GB.po b/po/en_GB.po index 2393fb4..5226700 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" diff --git a/po/en_US.po b/po/en_US.po index a556714..0e69a3d 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" diff --git a/po/eo.po b/po/eo.po index 355c8d8..91e3c57 100644 --- a/po/eo.po +++ b/po/eo.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" diff --git a/po/fi.po b/po/fi.po index cf85b13..bba9909 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index b81a679..5ef43b2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" diff --git a/po/hr.po b/po/hr.po index 2e2a9f4..cd22724 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:57+1100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" diff --git a/po/hu.po b/po/hu.po index da87efc..b6be4a1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" diff --git a/po/nb.po b/po/nb.po index 163e07b..19f767b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index adba52d..59b10e6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 16:58+1100\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" diff --git a/po/ru.po b/po/ru.po index 2d4c609..6e1ab14 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-08 00:14+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: Russian \n" diff --git a/po/sr.po b/po/sr.po index 47d82be..142d405 100644 --- a/po/sr.po +++ b/po/sr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" diff --git a/po/sv.po b/po/sv.po index 7448ce8..faaaf24 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.15\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 09:50+1100\n" +"POT-Creation-Date: 2021-01-12 11:31+1100\n" "PO-Revision-Date: 2021-01-07 17:00+1100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n"