From 71e1cd593e0709eee21692bb336d7e61a003d761 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 29 Mar 2012 07:39:53 +1100 Subject: [PATCH] Clarify that help page count is fixed for any given language The number of pages used by the help text is fixed for any given language. Different languages, depending on the actual translation, may use differing number of pages. --- po/de.po | 57 +++++++++++++++++++++++++++++------------------------ po/en_AU.po | 12 +++++++---- po/en_CA.po | 12 +++++++---- po/en_GB.po | 12 +++++++---- po/en_US.po | 12 +++++++---- po/fr.po | 12 +++++++---- po/ru.po | 12 +++++++---- src/help.c | 4 ++++ 8 files changed, 83 insertions(+), 50 deletions(-) diff --git a/po/de.po b/po/de.po index d2df1d3..94fa641 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.4-pre1\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-27 10:37+1100\n" +"POT-Creation-Date: 2012-03-29 07:37+1100\n" "PO-Revision-Date: 2012-03-28 16:15+0200\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" @@ -160,37 +160,38 @@ msgstr "Star Traders Homepage: <%s>.\n" #. TRANSLATORS: The eight company names do NOT have to be literal #. translations of the English names. In fact, if possible, the #. names should start with successive letters of your alphabet (in -#. English, for example, "A" to "H"). No company name should be more -#. than 24 characters (column positions, to be precise) long. -#: src/globals.c:46 +#. English, for example, "A" to "H"), and, ideally, be related to +#. constellations or stars in our galaxy. No company name should be +#. more than 24 characters (column positions, to be precise) long. +#: src/globals.c:47 msgid "Altair Starways" msgstr "Altair AG" -#: src/globals.c:47 +#: src/globals.c:48 msgid "Betelgeuse, Ltd" msgstr "Beteleuse GmbH" -#: src/globals.c:48 +#: src/globals.c:49 msgid "Capella Freight Co" msgstr "Kapella Fracht" -#: src/globals.c:49 +#: src/globals.c:50 msgid "Denebola Shippers" msgstr "Denebola Spediteure" -#: src/globals.c:50 +#: src/globals.c:51 msgid "Eridani Expediters" msgstr "Eridani Lieferservice" -#: src/globals.c:51 +#: src/globals.c:52 msgid "Fornax Express" msgstr "Fornax Express" -#: src/globals.c:52 +#: src/globals.c:53 msgid "Gemeni Inc" msgstr "Gemini OHG" -#: src/globals.c:53 +#: src/globals.c:54 msgid "Hercules and Co" msgstr "Herkules und Co" @@ -202,7 +203,7 @@ msgstr "Herkules und Co" #. possible, these should be successive letters in your alphabet (in #. English, "A" to "H"). Do NOT use digits or control characters. #. Do not change or translate anything after the vertical line. -#: src/globals.c:67 +#: src/globals.c:68 msgid "ABCDEFGH|input|Companies" msgstr "ABCDEFGH|input|Companies" @@ -213,7 +214,7 @@ msgstr "ABCDEFGH|input|Companies" #. should be successive letters in your alphabet. Do NOT use digits #. or control characters. Do not change or translate anything after #. the vertical line. -#: src/globals.c:79 +#: src/globals.c:80 msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves" msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves" @@ -224,7 +225,7 @@ msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves" #. the remaining for the eight companies. Do not change or translate #. anything after the vertical line. Double-width characters ARE #. handled correctly. -#: src/globals.c:91 +#: src/globals.c:92 msgid ".+*ABCDEFGH|output|MapVals" msgstr ".+*ABCDEFGH|output|MapVals" @@ -234,7 +235,7 @@ msgstr ".+*ABCDEFGH|output|MapVals" #. to the first character in the "input|GameMoves" string, and so on. #. Do not change or translate anything after the vertical line. #. Double-width characters ARE handled correctly. -#: src/globals.c:102 +#: src/globals.c:103 msgid "abcdefghijklmnopqrst|output|GameMoves" msgstr "abcdefghijklmnopqrst|output|GameMoves" @@ -243,35 +244,35 @@ msgstr "abcdefghijklmnopqrst|output|GameMoves" #. on the gender of the player, it may be simpler to list cardinal #. numbers instead (eg, "No. 1"). Up to five characters are allowed #. (see ORDINAL_COLS in src/intf.h). -#: src/globals.c:113 +#: src/globals.c:114 msgid "1st" msgstr "Nr. 1" -#: src/globals.c:114 +#: src/globals.c:115 msgid "2nd" msgstr "Nr. 2" -#: src/globals.c:115 +#: src/globals.c:116 msgid "3rd" msgstr "Nr. 3" -#: src/globals.c:116 +#: src/globals.c:117 msgid "4th" msgstr "Nr. 4" -#: src/globals.c:117 +#: src/globals.c:118 msgid "5th" msgstr "Nr. 5" -#: src/globals.c:118 +#: src/globals.c:119 msgid "6th" msgstr "Nr. 6" -#: src/globals.c:119 +#: src/globals.c:120 msgid "7th" msgstr "Nr. 7" -#: src/globals.c:120 +#: src/globals.c:121 msgid "8th" msgstr "Nr. 8" @@ -1451,7 +1452,11 @@ msgstr "" msgid " How to Play " msgstr "" -#: src/help.c:272 +#. 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:276 #, c-format msgid "Page %d of %d" msgstr "" @@ -1459,7 +1464,7 @@ msgstr "" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:473 src/intf.c:3035 +#: src/help.c:477 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " msgstr "" @@ -1470,7 +1475,7 @@ msgstr "" #. , and almost any other key instead of #. (other than , , , , #. or <\>). -#: src/help.c:480 +#: src/help.c:484 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "" diff --git a/po/en_AU.po b/po/en_AU.po index 7edf1fa..25359d7 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.4-pre1\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-28 11:42+1100\n" +"POT-Creation-Date: 2012-03-29 07:37+1100\n" "PO-Revision-Date: 2012-03-27 08:01+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" @@ -1506,7 +1506,11 @@ msgstr "@ Help text, page 10\n" msgid " How to Play " msgstr " How to Play " -#: src/help.c:272 +#. 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:276 #, c-format msgid "Page %d of %d" msgstr "Page %d of %d" @@ -1514,7 +1518,7 @@ msgstr "Page %d of %d" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:473 src/intf.c:3035 +#: src/help.c:477 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1525,7 +1529,7 @@ msgstr "[ Press to continue ] " #. , and almost any other key instead of #. (other than , , , , #. or <\>). -#: src/help.c:480 +#: src/help.c:484 #, 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 9109f0a..ed41439 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.4-pre1\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-28 11:42+1100\n" +"POT-Creation-Date: 2012-03-29 07:37+1100\n" "PO-Revision-Date: 2012-03-27 08:02+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" @@ -1506,7 +1506,11 @@ msgstr "@ Help text, page 10\n" msgid " How to Play " msgstr " How to Play " -#: src/help.c:272 +#. 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:276 #, c-format msgid "Page %d of %d" msgstr "Page %d of %d" @@ -1514,7 +1518,7 @@ msgstr "Page %d of %d" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:473 src/intf.c:3035 +#: src/help.c:477 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1525,7 +1529,7 @@ msgstr "[ Press to continue ] " #. , and almost any other key instead of #. (other than , , , , #. or <\>). -#: src/help.c:480 +#: src/help.c:484 #, 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 2cf324c..b2e60f2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.4-pre1\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-28 11:42+1100\n" +"POT-Creation-Date: 2012-03-29 07:37+1100\n" "PO-Revision-Date: 2012-03-27 08:02+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" @@ -1506,7 +1506,11 @@ msgstr "@ Help text, page 10\n" msgid " How to Play " msgstr " How to Play " -#: src/help.c:272 +#. 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:276 #, c-format msgid "Page %d of %d" msgstr "Page %d of %d" @@ -1514,7 +1518,7 @@ msgstr "Page %d of %d" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:473 src/intf.c:3035 +#: src/help.c:477 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1525,7 +1529,7 @@ msgstr "[ Press to continue ] " #. , and almost any other key instead of #. (other than , , , , #. or <\>). -#: src/help.c:480 +#: src/help.c:484 #, 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 78ea95c..475289a 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.4-pre1\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-28 11:42+1100\n" +"POT-Creation-Date: 2012-03-29 07:37+1100\n" "PO-Revision-Date: 2012-03-27 08:02+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" @@ -1506,7 +1506,11 @@ msgstr "@ Help text, page 10\n" msgid " How to Play " msgstr " How to Play " -#: src/help.c:272 +#. 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:276 #, c-format msgid "Page %d of %d" msgstr "Page %d of %d" @@ -1514,7 +1518,7 @@ msgstr "Page %d of %d" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:473 src/intf.c:3035 +#: src/help.c:477 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1525,7 +1529,7 @@ msgstr "[ Press to continue ] " #. , and almost any other key instead of #. (other than , , , , #. or <\>). -#: src/help.c:480 +#: src/help.c:484 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Press to continue or for the previous page ] " diff --git a/po/fr.po b/po/fr.po index 21283ee..8f85c0f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.4-pre1\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-28 18:12+1100\n" +"POT-Creation-Date: 2012-03-29 07:37+1100\n" "PO-Revision-Date: 2012-03-28 18:21+1100\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" @@ -1523,7 +1523,11 @@ msgstr "@ Texte d'aide, page 10\n" msgid " How to Play " msgstr " Comment jouer " -#: src/help.c:272 +#. 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:276 #, c-format msgid "Page %d of %d" msgstr "Page %d sur %d" @@ -1531,7 +1535,7 @@ msgstr "Page %d sur %d" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:473 src/intf.c:3035 +#: src/help.c:477 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " msgstr "[ Appuyez pour continuer ] " @@ -1542,7 +1546,7 @@ msgstr "[ Appuyez pour continuer ] " #. , and almost any other key instead of #. (other than , , , , #. or <\>). -#: src/help.c:480 +#: src/help.c:484 #, 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/ru.po b/po/ru.po index 6a6a3e5..72cbe2c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.4-pre1\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-28 18:12+1100\n" +"POT-Creation-Date: 2012-03-29 07:37+1100\n" "PO-Revision-Date: 2012-03-29 06:53+1100\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -1522,7 +1522,11 @@ msgstr "@\n" msgid " How to Play " msgstr " Как играть в «Звёздные торговцы» " -#: src/help.c:272 +#. 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:276 #, c-format msgid "Page %d of %d" msgstr "Страница №%d из %d-и" @@ -1530,7 +1534,7 @@ msgstr "Страница №%d из %d-и" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:473 src/intf.c:3035 +#: src/help.c:477 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " msgstr "[ Нажмите <ПРОБЕЛ> для продолжения ] " @@ -1541,7 +1545,7 @@ msgstr "[ Нажмите <ПРОБЕЛ> для продолжения ] " #. , and almost any other key instead of #. (other than , , , , #. or <\>). -#: src/help.c:480 +#: src/help.c:484 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Нажмите <ПРОБЕЛ> для продолжения; <←> — вернуться на пред. страницу ] " diff --git a/src/help.c b/src/help.c index 99012b7..bcdb3e8 100644 --- a/src/help.c +++ b/src/help.c @@ -269,6 +269,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); wmove(curwin, 4, 2);