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