From 4ca99815b84c77fda0e803ddc26195dcc5ff1585 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Mon, 29 Aug 2011 14:13:29 +1000 Subject: [PATCH 01/16] Be a little more diligent when it comes to wchar_t vs. wint_t The %lc format is actually of type wint_t, according to printf(3), not wchar_t, even though these are of the same underlying type on most (all?) platforms. --- src/game.c | 2 +- src/intf.c | 11 ++++++----- src/intf.h | 2 +- src/move.c | 6 ++++-- src/utils.c | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/game.c b/src/game.c index 3ee99bf..1521fa1 100644 --- a/src/game.c +++ b/src/game.c @@ -290,7 +290,7 @@ static int ask_number_players (void) done = true; } else if (wcschr(keycode_contgame, key) != NULL) { left(curwin, getcury(curwin), getcurx(curwin), A_BOLD, - 0, 0, 1, "%lc", *keycode_contgame); + 0, 0, 1, "%lc", (wint_t) *keycode_contgame); wrefresh(curwin); ret = 0; diff --git a/src/intf.c b/src/intf.c index 9aa2fdf..e8eb0af 100644 --- a/src/intf.c +++ b/src/intf.c @@ -156,7 +156,7 @@ typedef struct txwin { enum argument_type { TYPE_NONE, // No type yet assigned TYPE_CHAR, // char - TYPE_WCHAR, // wchar_t + TYPE_WCHAR, // wint_t TYPE_INT, // int TYPE_LONGINT, // long int TYPE_DOUBLE, // double @@ -168,7 +168,7 @@ struct argument { enum argument_type a_type; union a { char a_char; - wchar_t a_wchar; + wint_t a_wchar; int a_int; long int a_longint; double a_double; @@ -1092,9 +1092,10 @@ int mkchstr_parse (const wchar_t *restrict format, break; case TYPE_WCHAR: - format_arg->a.a_wchar = (wchar_t) (sizeof(wchar_t) < sizeof(int) ? - va_arg(args, int) : - va_arg(args, wchar_t)); + format_arg->a.a_wchar = + (wint_t) (sizeof(wint_t) < sizeof(int) ? + va_arg(args, int) : + va_arg(args, wint_t)); break; case TYPE_INT: diff --git a/src/intf.h b/src/intf.h index 322ded0..db73c8a 100644 --- a/src/intf.h +++ b/src/intf.h @@ -365,7 +365,7 @@ extern int txdlgbox (int maxlines, int ncols, int begin_y, int begin_x, %% - Insert the ASCII percent sign (ASCII code U+0025) %c - Insert the next parameter as a character (type char) - %lc - Insert the next parameter as a wide char (type wchar_t) + %lc - Insert the next parameter as a wide char (type wint_t) %s - Insert the next parameter as a string (type char *) %ls - Insert the next parameter as a wide string (type wchar_t *) %d - Insert the next parameter as an integer (type int) diff --git a/src/move.c b/src/move.c index 5e5271a..03c819e 100644 --- a/src/move.c +++ b/src/move.c @@ -243,7 +243,8 @@ selection_t get_move (void) right(curwin, 1, getmaxx(curwin) / 2, attr_normal, attr_keycode, attr_choice, 1, _("Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: "), - PRINTABLE_GAME_MOVE(0), PRINTABLE_GAME_MOVE(NUMBER_MOVES - 1)); + (wint_t) PRINTABLE_GAME_MOVE(0), + (wint_t) PRINTABLE_GAME_MOVE(NUMBER_MOVES - 1)); curs_set(CURS_ON); wrefresh(curwin); @@ -274,7 +275,8 @@ selection_t get_move (void) /* TRANSLATORS: "Move" refers to the choice of moves made by the current player (out of a selection of 20 moves). */ - _("Move ^{%lc^}"), PRINTABLE_GAME_MOVE(i)); + _("Move ^{%lc^}"), + (wint_t) PRINTABLE_GAME_MOVE(i)); break; } diff --git a/src/utils.c b/src/utils.c index 39abf31..0d6cc6f 100644 --- a/src/utils.c +++ b/src/utils.c @@ -613,7 +613,7 @@ size_t xwcrtomb (char *restrict dest, wchar_t wc, mbstate_t *restrict mbstate) dest[n] = EILSEQ_REPL; dest[n++] = '\0'; } else { - errno_exit(_("xwcrtomb: `%lc'"), wc); + errno_exit(_("xwcrtomb: `%lc'"), (wint_t) wc); } } From 6b36465f7d0a1a71c775503113ebb9fcfef012f8 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Mon, 29 Aug 2011 14:14:44 +1000 Subject: [PATCH 02/16] Update source line numbers in the translation PO files --- po/en_AU.po | 72 ++++++++++++++++++++++++++--------------------------- po/en_CA.po | 72 ++++++++++++++++++++++++++--------------------------- po/en_GB.po | 72 ++++++++++++++++++++++++++--------------------------- po/en_US.po | 72 ++++++++++++++++++++++++++--------------------------- 4 files changed, 144 insertions(+), 144 deletions(-) diff --git a/po/en_AU.po b/po/en_AU.po index 678b878..38a05e6 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.2\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-29 10:48+1000\n" +"POT-Creation-Date: 2011-08-29 14:13+1000\n" "PO-Revision-Date: 2011-08-28 17:03+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" @@ -302,7 +302,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: src/game.c:341 src/move.c:380 +#: src/game.c:341 src/move.c:382 msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:847 +#: src/game.c:606 src/move.c:849 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -536,51 +536,51 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. TRANSLATORS: "Move" refers to the choice of #. moves made by the current player (out of a #. selection of 20 moves). -#: src/move.c:277 +#: src/move.c:278 #, c-format msgid "Move ^{%lc^}" msgstr "Move ^{%lc^}" -#: src/move.c:297 +#: src/move.c:299 msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:306 +#: src/move.c:308 msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:327 +#: src/move.c:329 msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:342 +#: src/move.c:344 msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:359 src/move.c:437 +#: src/move.c:361 src/move.c:439 #, c-format msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:667 src/move.c:674 src/move.c:1018 src/move.c:1052 +#: src/move.c:669 src/move.c:676 src/move.c:1020 src/move.c:1054 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:668 +#: src/move.c:670 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:675 +#: src/move.c:677 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:743 +#: src/move.c:745 msgid " New Company " msgstr " New Company " -#: src/move.c:744 +#: src/move.c:746 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +589,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:803 +#: src/move.c:805 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +598,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:809 +#: src/move.c:811 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +609,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:829 +#: src/move.c:831 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:840 +#: src/move.c:842 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +626,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:854 +#: src/move.c:856 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +635,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:859 +#: src/move.c:861 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +644,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:866 +#: src/move.c:868 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +652,12 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:872 +#: src/move.c:874 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1019 +#: src/move.c:1021 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +668,7 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1041 +#: src/move.c:1043 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +687,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1069 +#: src/move.c:1071 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +696,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1077 +#: src/move.c:1079 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1170 src/exch.c:320 +#: src/move.c:1172 src/exch.c:320 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1172 +#: src/move.c:1174 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -1409,7 +1409,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:3024 +#: src/help.c:473 src/intf.c:3025 msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1442,16 +1442,16 @@ msgstr "terminal size is too small (%d x %d required)" msgid "Star Traders" msgstr "Star Traders" -#: src/intf.c:1264 +#: src/intf.c:1265 msgid "mkchstr_conv: NUL" msgstr "mkchstr_conv: NUL" -#: src/intf.c:1567 +#: src/intf.c:1568 #, c-format msgid "mkchstr: `%s'" msgstr "mkchstr: ‘%s’" -#: src/intf.c:2024 src/intf.c:2069 +#: src/intf.c:2025 src/intf.c:2070 #, c-format msgid "gettxline: illegal character in string: `%ls'" msgstr "gettxline: illegal character in string: ‘%ls’" @@ -1460,12 +1460,12 @@ msgstr "gettxline: illegal character in string: ‘%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:2941 +#: src/intf.c:2942 msgctxt "input|Yes" msgid "Yy" msgstr "Yy" -#: src/intf.c:2943 +#: src/intf.c:2944 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1473,12 +1473,12 @@ 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:2994 +#: src/intf.c:2995 msgctxt "answer" msgid "Yes" msgstr "Yes" -#: src/intf.c:2996 +#: src/intf.c:2997 msgctxt "answer" msgid "No" msgstr "No" diff --git a/po/en_CA.po b/po/en_CA.po index 8487d55..dd009cf 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.2\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-29 10:48+1000\n" +"POT-Creation-Date: 2011-08-29 14:13+1000\n" "PO-Revision-Date: 2011-08-28 17:01+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" @@ -302,7 +302,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: src/game.c:341 src/move.c:380 +#: src/game.c:341 src/move.c:382 msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:847 +#: src/game.c:606 src/move.c:849 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -536,51 +536,51 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. TRANSLATORS: "Move" refers to the choice of #. moves made by the current player (out of a #. selection of 20 moves). -#: src/move.c:277 +#: src/move.c:278 #, c-format msgid "Move ^{%lc^}" msgstr "Move ^{%lc^}" -#: src/move.c:297 +#: src/move.c:299 msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:306 +#: src/move.c:308 msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:327 +#: src/move.c:329 msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:342 +#: src/move.c:344 msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:359 src/move.c:437 +#: src/move.c:361 src/move.c:439 #, c-format msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:667 src/move.c:674 src/move.c:1018 src/move.c:1052 +#: src/move.c:669 src/move.c:676 src/move.c:1020 src/move.c:1054 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:668 +#: src/move.c:670 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:675 +#: src/move.c:677 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:743 +#: src/move.c:745 msgid " New Company " msgstr " New Company " -#: src/move.c:744 +#: src/move.c:746 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +589,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:803 +#: src/move.c:805 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +598,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:809 +#: src/move.c:811 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +609,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:829 +#: src/move.c:831 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:840 +#: src/move.c:842 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +626,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:854 +#: src/move.c:856 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +635,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:859 +#: src/move.c:861 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +644,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:866 +#: src/move.c:868 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +652,12 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:872 +#: src/move.c:874 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1019 +#: src/move.c:1021 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +668,7 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1041 +#: src/move.c:1043 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +687,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1069 +#: src/move.c:1071 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +696,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1077 +#: src/move.c:1079 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1170 src/exch.c:320 +#: src/move.c:1172 src/exch.c:320 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1172 +#: src/move.c:1174 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -1409,7 +1409,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:3024 +#: src/help.c:473 src/intf.c:3025 msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1442,16 +1442,16 @@ msgstr "terminal size is too small (%d x %d required)" msgid "Star Traders" msgstr "Star Traders" -#: src/intf.c:1264 +#: src/intf.c:1265 msgid "mkchstr_conv: NUL" msgstr "mkchstr_conv: NUL" -#: src/intf.c:1567 +#: src/intf.c:1568 #, c-format msgid "mkchstr: `%s'" msgstr "mkchstr: ‘%s’" -#: src/intf.c:2024 src/intf.c:2069 +#: src/intf.c:2025 src/intf.c:2070 #, c-format msgid "gettxline: illegal character in string: `%ls'" msgstr "gettxline: illegal character in string: ‘%ls’" @@ -1460,12 +1460,12 @@ msgstr "gettxline: illegal character in string: ‘%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:2941 +#: src/intf.c:2942 msgctxt "input|Yes" msgid "Yy" msgstr "Yy" -#: src/intf.c:2943 +#: src/intf.c:2944 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1473,12 +1473,12 @@ 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:2994 +#: src/intf.c:2995 msgctxt "answer" msgid "Yes" msgstr "Yes" -#: src/intf.c:2996 +#: src/intf.c:2997 msgctxt "answer" msgid "No" msgstr "No" diff --git a/po/en_GB.po b/po/en_GB.po index 083868b..41d0304 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.2\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-29 10:48+1000\n" +"POT-Creation-Date: 2011-08-29 14:13+1000\n" "PO-Revision-Date: 2011-08-28 17:03+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" @@ -302,7 +302,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: src/game.c:341 src/move.c:380 +#: src/game.c:341 src/move.c:382 msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:847 +#: src/game.c:606 src/move.c:849 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -536,51 +536,51 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. TRANSLATORS: "Move" refers to the choice of #. moves made by the current player (out of a #. selection of 20 moves). -#: src/move.c:277 +#: src/move.c:278 #, c-format msgid "Move ^{%lc^}" msgstr "Move ^{%lc^}" -#: src/move.c:297 +#: src/move.c:299 msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:306 +#: src/move.c:308 msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:327 +#: src/move.c:329 msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:342 +#: src/move.c:344 msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:359 src/move.c:437 +#: src/move.c:361 src/move.c:439 #, c-format msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:667 src/move.c:674 src/move.c:1018 src/move.c:1052 +#: src/move.c:669 src/move.c:676 src/move.c:1020 src/move.c:1054 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:668 +#: src/move.c:670 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:675 +#: src/move.c:677 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:743 +#: src/move.c:745 msgid " New Company " msgstr " New Company " -#: src/move.c:744 +#: src/move.c:746 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +589,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:803 +#: src/move.c:805 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +598,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:809 +#: src/move.c:811 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +609,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:829 +#: src/move.c:831 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:840 +#: src/move.c:842 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +626,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:854 +#: src/move.c:856 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +635,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:859 +#: src/move.c:861 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +644,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:866 +#: src/move.c:868 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +652,12 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:872 +#: src/move.c:874 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1019 +#: src/move.c:1021 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +668,7 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1041 +#: src/move.c:1043 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +687,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1069 +#: src/move.c:1071 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +696,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1077 +#: src/move.c:1079 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1170 src/exch.c:320 +#: src/move.c:1172 src/exch.c:320 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1172 +#: src/move.c:1174 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -1409,7 +1409,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:3024 +#: src/help.c:473 src/intf.c:3025 msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1442,16 +1442,16 @@ msgstr "terminal size is too small (%d x %d required)" msgid "Star Traders" msgstr "Star Traders" -#: src/intf.c:1264 +#: src/intf.c:1265 msgid "mkchstr_conv: NUL" msgstr "mkchstr_conv: NUL" -#: src/intf.c:1567 +#: src/intf.c:1568 #, c-format msgid "mkchstr: `%s'" msgstr "mkchstr: ‘%s’" -#: src/intf.c:2024 src/intf.c:2069 +#: src/intf.c:2025 src/intf.c:2070 #, c-format msgid "gettxline: illegal character in string: `%ls'" msgstr "gettxline: illegal character in string: ‘%ls’" @@ -1460,12 +1460,12 @@ msgstr "gettxline: illegal character in string: ‘%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:2941 +#: src/intf.c:2942 msgctxt "input|Yes" msgid "Yy" msgstr "Yy" -#: src/intf.c:2943 +#: src/intf.c:2944 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1473,12 +1473,12 @@ 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:2994 +#: src/intf.c:2995 msgctxt "answer" msgid "Yes" msgstr "Yes" -#: src/intf.c:2996 +#: src/intf.c:2997 msgctxt "answer" msgid "No" msgstr "No" diff --git a/po/en_US.po b/po/en_US.po index f9e65f1..2015c39 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.2\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-29 10:48+1000\n" +"POT-Creation-Date: 2011-08-29 14:13+1000\n" "PO-Revision-Date: 2011-08-28 16:50+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" @@ -302,7 +302,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: src/game.c:341 src/move.c:380 +#: src/game.c:341 src/move.c:382 msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:847 +#: src/game.c:606 src/move.c:849 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -536,51 +536,51 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. TRANSLATORS: "Move" refers to the choice of #. moves made by the current player (out of a #. selection of 20 moves). -#: src/move.c:277 +#: src/move.c:278 #, c-format msgid "Move ^{%lc^}" msgstr "Move ^{%lc^}" -#: src/move.c:297 +#: src/move.c:299 msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:306 +#: src/move.c:308 msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:327 +#: src/move.c:329 msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:342 +#: src/move.c:344 msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:359 src/move.c:437 +#: src/move.c:361 src/move.c:439 #, c-format msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:667 src/move.c:674 src/move.c:1018 src/move.c:1052 +#: src/move.c:669 src/move.c:676 src/move.c:1020 src/move.c:1054 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:668 +#: src/move.c:670 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:675 +#: src/move.c:677 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:743 +#: src/move.c:745 msgid " New Company " msgstr " New Company " -#: src/move.c:744 +#: src/move.c:746 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +589,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:803 +#: src/move.c:805 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +598,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:809 +#: src/move.c:811 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +609,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:829 +#: src/move.c:831 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:840 +#: src/move.c:842 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +626,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:854 +#: src/move.c:856 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +635,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:859 +#: src/move.c:861 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +644,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:866 +#: src/move.c:868 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +652,12 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:872 +#: src/move.c:874 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1019 +#: src/move.c:1021 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +668,7 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1041 +#: src/move.c:1043 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +687,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1069 +#: src/move.c:1071 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +696,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1077 +#: src/move.c:1079 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1170 src/exch.c:320 +#: src/move.c:1172 src/exch.c:320 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1172 +#: src/move.c:1174 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -1409,7 +1409,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:3024 +#: src/help.c:473 src/intf.c:3025 msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1442,16 +1442,16 @@ msgstr "terminal size is too small (%d x %d required)" msgid "Star Traders" msgstr "Star Traders" -#: src/intf.c:1264 +#: src/intf.c:1265 msgid "mkchstr_conv: NUL" msgstr "mkchstr_conv: NUL" -#: src/intf.c:1567 +#: src/intf.c:1568 #, c-format msgid "mkchstr: `%s'" msgstr "mkchstr: ‘%s’" -#: src/intf.c:2024 src/intf.c:2069 +#: src/intf.c:2025 src/intf.c:2070 #, c-format msgid "gettxline: illegal character in string: `%ls'" msgstr "gettxline: illegal character in string: ‘%ls’" @@ -1460,12 +1460,12 @@ msgstr "gettxline: illegal character in string: ‘%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:2941 +#: src/intf.c:2942 msgctxt "input|Yes" msgid "Yy" msgstr "Yy" -#: src/intf.c:2943 +#: src/intf.c:2944 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1473,12 +1473,12 @@ 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:2994 +#: src/intf.c:2995 msgctxt "answer" msgid "Yes" msgstr "Yes" -#: src/intf.c:2996 +#: src/intf.c:2997 msgctxt "answer" msgid "No" msgstr "No" From 917ed49975c0250d408d94e5653f18a2d154ec95 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 30 Aug 2011 08:13:28 +1000 Subject: [PATCH 03/16] Start preparing for version 7.3: bug fixes and a Russian translation --- INSTALL | 8 ++++---- NEWS | 6 ++++++ configure.ac | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 5308e8e..c48a8ff 100644 --- a/INSTALL +++ b/INSTALL @@ -102,12 +102,12 @@ You can also run configure in a separate build-only directory tree. This feature requires GNU Make and allows you to keep the source code tree from being modified by the compilation process. To use this option, create a separate build directory, then run configure. For example, if you placed -the Star Traders source code tree in $HOME/src/trader-7.2, you could run +the Star Traders source code tree in $HOME/src/trader-7.3, you could run something like: - mkdir $HOME/build/trader-build-7.2 - cd $HOME/build/trader-build-7.2 - $HOME/src/trader-7.2/configure + mkdir $HOME/build/trader-build-7.3 + cd $HOME/build/trader-build-7.3 + $HOME/src/trader-7.3/configure Once again, the Autoconf manual describes these options (and many others): diff --git a/NEWS b/NEWS index e5868ab..81b6552 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,12 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. +Version 7.3 (not yet released) +------------------------------ + +@@@ Minor bug fixes. Russian translation. + + Version 7.2 (29th August, 2011) ------------------------------- diff --git a/configure.ac b/configure.ac index c65dafc..68961b2 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see http://www.gnu.org/licenses/. -AC_INIT([Star Traders], [7.2], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) +AC_INIT([Star Traders], [7.3], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) AC_PREREQ([2.67]) From 7fba9f88447a4f5440acec99b2bc22f8eab1c9ab Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 30 Aug 2011 08:28:05 +1000 Subject: [PATCH 04/16] Update the version number in the PO files for Star Traders 7.3 --- po/en_AU.po | 4 ++-- po/en_CA.po | 4 ++-- po/en_GB.po | 4 ++-- po/en_US.po | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/en_AU.po b/po/en_AU.po index 38a05e6..e93fc24 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.2\n" +"Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2011-08-29 14:13+1000\n" -"PO-Revision-Date: 2011-08-28 17:03+1000\n" +"PO-Revision-Date: 2011-08-30 08:26+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index dd009cf..69c737f 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.2\n" +"Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2011-08-29 14:13+1000\n" -"PO-Revision-Date: 2011-08-28 17:01+1000\n" +"PO-Revision-Date: 2011-08-30 08:26+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index 41d0304..90a671b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.2\n" +"Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2011-08-29 14:13+1000\n" -"PO-Revision-Date: 2011-08-28 17:03+1000\n" +"PO-Revision-Date: 2011-08-30 08:26+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index 2015c39..d40ce75 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.2\n" +"Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2011-08-29 14:13+1000\n" -"PO-Revision-Date: 2011-08-28 16:50+1000\n" +"PO-Revision-Date: 2011-08-30 08:27+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" From 74aa3e84dfceb030221c66de9b6ecb572ba7cdd9 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 30 Aug 2011 09:15:15 +1000 Subject: [PATCH 05/16] Fix a couple of display bugs Firstly, Ncurses addchstr() and family do not work, it seems, with multibyte strings, so use addch() instead. Secondly, PRINTABLE_MAP_VAL returns a wchar_t wide character, not a byte-sized char. --- src/exch.c | 5 ++--- src/move.c | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/exch.c b/src/exch.c index 3d4d43b..da88c29 100644 --- a/src/exch.c +++ b/src/exch.c @@ -152,9 +152,8 @@ void exchange_stock (void) for (line = 6, i = 0; i < MAX_COMPANIES; i++) { if (company[i].on_map) { - mvwaddch(curwin, line, 2, PRINTABLE_MAP_VAL(COMPANY_TO_MAP(i)) - | attr_choice); - + left(curwin, line, 2, attr_choice, 0, 0, 1, "%lc", + (wint_t) PRINTABLE_MAP_VAL(COMPANY_TO_MAP(i))); left(curwin, line, 4, attr_normal, 0, 0, 1, "%ls", company[i].name); diff --git a/src/move.c b/src/move.c index 03c819e..40f4dd8 100644 --- a/src/move.c +++ b/src/move.c @@ -219,8 +219,12 @@ selection_t get_move (void) // Display current move choices on the galaxy map for (int i = 0; i < NUMBER_MOVES; i++) { - mvwaddchstr(curwin, game_move[i].y + 3, game_move[i].x * 2 + 2, - CHTYPE_GAME_MOVE(i)); + chtype *movestr = CHTYPE_GAME_MOVE(i); + + wmove(curwin, game_move[i].y + 3, game_move[i].x * 2 + 2); + while (*movestr != 0) { + waddch(curwin, *movestr++); + } } wrefresh(curwin); From 0a518102ec465032b9fb73d34308f07208e56b48 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 30 Aug 2011 09:16:45 +1000 Subject: [PATCH 06/16] Update corresponding source line numbers --- po/en_AU.po | 160 ++++++++++++++++++++++++++-------------------------- po/en_CA.po | 160 ++++++++++++++++++++++++++-------------------------- po/en_GB.po | 160 ++++++++++++++++++++++++++-------------------------- po/en_US.po | 160 ++++++++++++++++++++++++++-------------------------- 4 files changed, 320 insertions(+), 320 deletions(-) diff --git a/po/en_AU.po b/po/en_AU.po index e93fc24..379cffd 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-29 14:13+1000\n" +"POT-Creation-Date: 2011-08-30 09:08+1000\n" "PO-Revision-Date: 2011-08-30 08:26+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" @@ -302,7 +302,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: src/game.c:341 src/move.c:382 +#: src/game.c:341 src/move.c:386 msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:849 +#: src/game.c:606 src/move.c:853 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -497,38 +497,38 @@ msgctxt "label" msgid "Total value: " msgstr "Total value: " -#: src/game.c:800 src/exch.c:323 +#: src/game.c:800 src/exch.c:322 msgctxt "label" msgid "Current cash: " msgstr "Current cash: " -#: src/game.c:807 src/exch.c:331 +#: src/game.c:807 src/exch.c:330 msgctxt "label" msgid "Current debt: " msgstr "Current debt: " -#: src/game.c:813 src/exch.c:336 +#: src/game.c:813 src/exch.c:335 msgctxt "label" msgid "Interest rate: " msgstr "Interest rate: " -#: src/move.c:235 src/exch.c:183 +#: src/move.c:239 src/exch.c:182 msgid "^{<1>^} Display stock portfolio" msgstr "^{<1>^} Display stock portfolio" -#: src/move.c:237 +#: src/move.c:241 msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:239 +#: src/move.c:243 msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:241 +#: src/move.c:245 msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#: src/move.c:245 +#: src/move.c:249 #, c-format msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -536,51 +536,51 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. TRANSLATORS: "Move" refers to the choice of #. moves made by the current player (out of a #. selection of 20 moves). -#: src/move.c:278 +#: src/move.c:282 #, c-format msgid "Move ^{%lc^}" msgstr "Move ^{%lc^}" -#: src/move.c:299 +#: src/move.c:303 msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:308 +#: src/move.c:312 msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:329 +#: src/move.c:333 msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:344 +#: src/move.c:348 msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:361 src/move.c:439 +#: src/move.c:365 src/move.c:443 #, c-format msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:669 src/move.c:676 src/move.c:1020 src/move.c:1054 +#: src/move.c:673 src/move.c:680 src/move.c:1024 src/move.c:1058 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:670 +#: src/move.c:674 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:677 +#: src/move.c:681 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:745 +#: src/move.c:749 msgid " New Company " msgstr " New Company " -#: src/move.c:746 +#: src/move.c:750 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +589,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:805 +#: src/move.c:809 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +598,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:811 +#: src/move.c:815 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +609,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:831 +#: src/move.c:835 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:842 +#: src/move.c:846 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +626,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:856 +#: src/move.c:860 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +635,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:861 +#: src/move.c:865 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +644,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:868 +#: src/move.c:872 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +652,12 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:874 +#: src/move.c:878 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1021 +#: src/move.c:1025 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +668,7 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1043 +#: src/move.c:1047 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +687,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1071 +#: src/move.c:1075 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +696,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1079 +#: src/move.c:1083 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1172 src/exch.c:320 +#: src/move.c:1176 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1174 +#: src/move.c:1178 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -746,19 +746,19 @@ msgstr "" "Shares\n" "issued" -#: src/exch.c:185 +#: src/exch.c:184 msgid "^{<2>^} Display galaxy map" msgstr "^{<2>^} Display galaxy map" -#: src/exch.c:187 +#: src/exch.c:186 msgid "^{<3>^} Visit the Trading Bank" msgstr "^{<3>^} Visit the Trading Bank" -#: src/exch.c:189 +#: src/exch.c:188 msgid "^{<4>^} Exit the Stock Exchange" msgstr "^{<4>^} Exit the Stock Exchange" -#: src/exch.c:192 +#: src/exch.c:191 msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " @@ -771,7 +771,7 @@ msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " #. #. Note that some of these labels are used for both the Player #. Status window and the Trading Bank window. -#: src/exch.c:350 +#: src/exch.c:349 msgctxt "label" msgid "Credit limit: " msgstr "Credit limit: " @@ -780,56 +780,56 @@ msgstr "Credit limit: " #. from the Bank" menu options must all be the same length #. (ie, padded with trailing spaces as required). The maximum #. length is 72 characters. -#: src/exch.c:365 +#: src/exch.c:364 msgid "^{<1>^} Borrow money " msgstr "^{<1>^} Borrow money " -#: src/exch.c:367 +#: src/exch.c:366 msgid "^{<2>^} Repay debt " msgstr "^{<2>^} Repay debt " -#: src/exch.c:369 +#: src/exch.c:368 msgid "^{<3>^} Exit from the Bank" msgstr "^{<3>^} Exit from the Bank" -#: src/exch.c:372 +#: src/exch.c:371 msgid "Enter selection [^{1^}-^{3^}]: " msgstr "Enter selection [^{1^}-^{3^}]: " -#: src/exch.c:425 +#: src/exch.c:424 msgid " Insufficient Credit Limit " msgstr " Insufficient Credit Limit " -#: src/exch.c:426 +#: src/exch.c:425 msgid "The Bank will not lend you any more money." msgstr "The Bank will not lend you any more money." -#: src/exch.c:446 +#: src/exch.c:445 msgid "How much do you wish to borrow? " msgstr "How much do you wish to borrow? " -#: src/exch.c:478 +#: src/exch.c:477 msgid " No Debt " msgstr " No Debt " -#: src/exch.c:479 +#: src/exch.c:478 msgid "You have no debt to repay." msgstr "You have no debt to repay." -#: src/exch.c:483 +#: src/exch.c:482 msgid " No Cash " msgstr " No Cash " -#: src/exch.c:484 +#: src/exch.c:483 msgid "You have no cash with which to repay the debt!" msgstr "You have no cash with which to repay the debt!" -#: src/exch.c:504 +#: src/exch.c:503 msgid "How much do you wish to repay? " msgstr "How much do you wish to repay? " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:580 +#: src/exch.c:579 #, c-format msgid " Stock Transaction in %ls " msgstr " Stock Transaction in %ls " @@ -842,27 +842,27 @@ msgstr " Stock Transaction in %ls " #. and must have at least one trailing space for the output #. routines to work correctly. The maximum length of each #. label is 22 characters. -#: src/exch.c:591 +#: src/exch.c:590 msgctxt "label|Stock A" msgid "Shares issued: " msgstr "Shares issued: " #. TRANSLATORS: "Shares left" is the number of shares that are #. left to be purchased in the current company. -#: src/exch.c:599 +#: src/exch.c:598 msgctxt "label|Stock A" msgid "Shares left: " msgstr "Shares left: " #. TRANSLATORS: "Price per share" is the cost of each share in #. the current company. -#: src/exch.c:606 +#: src/exch.c:605 msgctxt "label|Stock A" msgid "Price per share: " msgstr "Price per share: " #. TRANSLATORS: "Return" is the share return as a percentage. -#: src/exch.c:612 +#: src/exch.c:611 msgctxt "label|Stock A" msgid "Return: " msgstr "Return: " @@ -875,56 +875,56 @@ msgstr "Return: " #. least one trailing space for the display routines to work #. correctly. The maximum length of each label is 18 #. characters. -#: src/exch.c:625 +#: src/exch.c:624 msgctxt "label|Stock B" msgid "Current holdings: " msgstr "Current holdings: " #. TRANSLATORS: "Percentage owned" is the current player's #. percentage ownership in this particular company. -#: src/exch.c:632 +#: src/exch.c:631 msgctxt "label|Stock B" msgid "Percentage owned: " msgstr "Percentage owned: " -#: src/exch.c:637 +#: src/exch.c:636 msgctxt "label|Stock B" msgid "Current cash: " msgstr "Current cash: " -#: src/exch.c:648 +#: src/exch.c:647 msgid "^{<1>^} Buy stock from company" msgstr "^{<1>^} Buy stock from company" -#: src/exch.c:650 +#: src/exch.c:649 msgid "^{<2>^} Sell stock back to company" msgstr "^{<2>^} Sell stock back to company" -#: src/exch.c:652 +#: src/exch.c:651 msgid "^{<3>^} Bid company to issue more shares" msgstr "^{<3>^} Bid company to issue more shares" -#: src/exch.c:654 +#: src/exch.c:653 msgid "^{<4>^} Exit to the Stock Exchange" msgstr "^{<4>^} Exit to the Stock Exchange" -#: src/exch.c:657 +#: src/exch.c:656 msgid "Enter selection [^{1^}-^{4^}]: " msgstr "Enter selection [^{1^}-^{4^}]: " -#: src/exch.c:713 +#: src/exch.c:712 msgid " No Shares Available " msgstr " No Shares Available " -#: src/exch.c:714 +#: src/exch.c:713 msgid "No more shares are available for purchase." msgstr "No more shares are available for purchase." -#: src/exch.c:718 +#: src/exch.c:717 msgid " Insufficient Cash " msgstr " Insufficient Cash " -#: src/exch.c:719 +#: src/exch.c:718 msgid "" "You do not have enough cash\n" "to purchase additional shares." @@ -932,42 +932,42 @@ msgstr "" "You do not have enough cash\n" "to purchase additional shares." -#: src/exch.c:730 +#: src/exch.c:729 #, c-format msgid "You can purchase ^{one^} share." msgid_plural "You can purchase up to ^{%'ld^} shares." msgstr[0] "You can purchase ^{one^} share." msgstr[1] "You can purchase up to ^{%'ld^} shares." -#: src/exch.c:736 +#: src/exch.c:735 msgid "How many shares do you wish to purchase? " msgstr "How many shares do you wish to purchase? " -#: src/exch.c:757 +#: src/exch.c:756 msgid " No Shares " msgstr " No Shares " -#: src/exch.c:758 +#: src/exch.c:757 msgid "You do not have any shares to sell." msgstr "You do not have any shares to sell." -#: src/exch.c:765 +#: src/exch.c:764 #, c-format msgid "You can sell ^{one^} share." msgid_plural "You can sell up to ^{%'ld^} shares." msgstr[0] "You can sell ^{one^} share." msgstr[1] "You can sell up to ^{%'ld^} shares." -#: src/exch.c:771 +#: src/exch.c:770 msgid "How many shares do you wish to sell? " msgstr "How many shares do you wish to sell? " -#: src/exch.c:799 +#: src/exch.c:798 msgid " No Shares Issued " msgstr " No Shares Issued " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:801 +#: src/exch.c:800 #, c-format msgid "" "%ls has refused\n" @@ -976,12 +976,12 @@ msgstr "" "%ls has refused\n" "to issue more shares." -#: src/exch.c:806 +#: src/exch.c:805 msgid " Shares Issued " msgstr " Shares Issued " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:808 +#: src/exch.c:807 #, c-format msgid "" "%ls has issued\n" diff --git a/po/en_CA.po b/po/en_CA.po index 69c737f..a14c344 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-29 14:13+1000\n" +"POT-Creation-Date: 2011-08-30 09:08+1000\n" "PO-Revision-Date: 2011-08-30 08:26+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" @@ -302,7 +302,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: src/game.c:341 src/move.c:382 +#: src/game.c:341 src/move.c:386 msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:849 +#: src/game.c:606 src/move.c:853 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -497,38 +497,38 @@ msgctxt "label" msgid "Total value: " msgstr "Total value: " -#: src/game.c:800 src/exch.c:323 +#: src/game.c:800 src/exch.c:322 msgctxt "label" msgid "Current cash: " msgstr "Current cash: " -#: src/game.c:807 src/exch.c:331 +#: src/game.c:807 src/exch.c:330 msgctxt "label" msgid "Current debt: " msgstr "Current debt: " -#: src/game.c:813 src/exch.c:336 +#: src/game.c:813 src/exch.c:335 msgctxt "label" msgid "Interest rate: " msgstr "Interest rate: " -#: src/move.c:235 src/exch.c:183 +#: src/move.c:239 src/exch.c:182 msgid "^{<1>^} Display stock portfolio" msgstr "^{<1>^} Display stock portfolio" -#: src/move.c:237 +#: src/move.c:241 msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:239 +#: src/move.c:243 msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:241 +#: src/move.c:245 msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#: src/move.c:245 +#: src/move.c:249 #, c-format msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -536,51 +536,51 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. TRANSLATORS: "Move" refers to the choice of #. moves made by the current player (out of a #. selection of 20 moves). -#: src/move.c:278 +#: src/move.c:282 #, c-format msgid "Move ^{%lc^}" msgstr "Move ^{%lc^}" -#: src/move.c:299 +#: src/move.c:303 msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:308 +#: src/move.c:312 msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:329 +#: src/move.c:333 msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:344 +#: src/move.c:348 msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:361 src/move.c:439 +#: src/move.c:365 src/move.c:443 #, c-format msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:669 src/move.c:676 src/move.c:1020 src/move.c:1054 +#: src/move.c:673 src/move.c:680 src/move.c:1024 src/move.c:1058 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:670 +#: src/move.c:674 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:677 +#: src/move.c:681 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:745 +#: src/move.c:749 msgid " New Company " msgstr " New Company " -#: src/move.c:746 +#: src/move.c:750 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +589,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:805 +#: src/move.c:809 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +598,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:811 +#: src/move.c:815 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +609,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:831 +#: src/move.c:835 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:842 +#: src/move.c:846 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +626,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:856 +#: src/move.c:860 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +635,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:861 +#: src/move.c:865 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +644,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:868 +#: src/move.c:872 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +652,12 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:874 +#: src/move.c:878 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1021 +#: src/move.c:1025 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +668,7 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1043 +#: src/move.c:1047 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +687,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1071 +#: src/move.c:1075 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +696,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1079 +#: src/move.c:1083 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1172 src/exch.c:320 +#: src/move.c:1176 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1174 +#: src/move.c:1178 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -746,19 +746,19 @@ msgstr "" "Shares\n" "issued" -#: src/exch.c:185 +#: src/exch.c:184 msgid "^{<2>^} Display galaxy map" msgstr "^{<2>^} Display galaxy map" -#: src/exch.c:187 +#: src/exch.c:186 msgid "^{<3>^} Visit the Trading Bank" msgstr "^{<3>^} Visit the Trading Bank" -#: src/exch.c:189 +#: src/exch.c:188 msgid "^{<4>^} Exit the Stock Exchange" msgstr "^{<4>^} Exit the Stock Exchange" -#: src/exch.c:192 +#: src/exch.c:191 msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " @@ -771,7 +771,7 @@ msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " #. #. Note that some of these labels are used for both the Player #. Status window and the Trading Bank window. -#: src/exch.c:350 +#: src/exch.c:349 msgctxt "label" msgid "Credit limit: " msgstr "Credit limit: " @@ -780,56 +780,56 @@ msgstr "Credit limit: " #. from the Bank" menu options must all be the same length #. (ie, padded with trailing spaces as required). The maximum #. length is 72 characters. -#: src/exch.c:365 +#: src/exch.c:364 msgid "^{<1>^} Borrow money " msgstr "^{<1>^} Borrow money " -#: src/exch.c:367 +#: src/exch.c:366 msgid "^{<2>^} Repay debt " msgstr "^{<2>^} Repay debt " -#: src/exch.c:369 +#: src/exch.c:368 msgid "^{<3>^} Exit from the Bank" msgstr "^{<3>^} Exit from the Bank" -#: src/exch.c:372 +#: src/exch.c:371 msgid "Enter selection [^{1^}-^{3^}]: " msgstr "Enter selection [^{1^}-^{3^}]: " -#: src/exch.c:425 +#: src/exch.c:424 msgid " Insufficient Credit Limit " msgstr " Insufficient Credit Limit " -#: src/exch.c:426 +#: src/exch.c:425 msgid "The Bank will not lend you any more money." msgstr "The Bank will not lend you any more money." -#: src/exch.c:446 +#: src/exch.c:445 msgid "How much do you wish to borrow? " msgstr "How much do you wish to borrow? " -#: src/exch.c:478 +#: src/exch.c:477 msgid " No Debt " msgstr " No Debt " -#: src/exch.c:479 +#: src/exch.c:478 msgid "You have no debt to repay." msgstr "You have no debt to repay." -#: src/exch.c:483 +#: src/exch.c:482 msgid " No Cash " msgstr " No Cash " -#: src/exch.c:484 +#: src/exch.c:483 msgid "You have no cash with which to repay the debt!" msgstr "You have no cash with which to repay the debt!" -#: src/exch.c:504 +#: src/exch.c:503 msgid "How much do you wish to repay? " msgstr "How much do you wish to repay? " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:580 +#: src/exch.c:579 #, c-format msgid " Stock Transaction in %ls " msgstr " Stock Transaction in %ls " @@ -842,27 +842,27 @@ msgstr " Stock Transaction in %ls " #. and must have at least one trailing space for the output #. routines to work correctly. The maximum length of each #. label is 22 characters. -#: src/exch.c:591 +#: src/exch.c:590 msgctxt "label|Stock A" msgid "Shares issued: " msgstr "Shares issued: " #. TRANSLATORS: "Shares left" is the number of shares that are #. left to be purchased in the current company. -#: src/exch.c:599 +#: src/exch.c:598 msgctxt "label|Stock A" msgid "Shares left: " msgstr "Shares left: " #. TRANSLATORS: "Price per share" is the cost of each share in #. the current company. -#: src/exch.c:606 +#: src/exch.c:605 msgctxt "label|Stock A" msgid "Price per share: " msgstr "Price per share: " #. TRANSLATORS: "Return" is the share return as a percentage. -#: src/exch.c:612 +#: src/exch.c:611 msgctxt "label|Stock A" msgid "Return: " msgstr "Return: " @@ -875,56 +875,56 @@ msgstr "Return: " #. least one trailing space for the display routines to work #. correctly. The maximum length of each label is 18 #. characters. -#: src/exch.c:625 +#: src/exch.c:624 msgctxt "label|Stock B" msgid "Current holdings: " msgstr "Current holdings: " #. TRANSLATORS: "Percentage owned" is the current player's #. percentage ownership in this particular company. -#: src/exch.c:632 +#: src/exch.c:631 msgctxt "label|Stock B" msgid "Percentage owned: " msgstr "Percentage owned: " -#: src/exch.c:637 +#: src/exch.c:636 msgctxt "label|Stock B" msgid "Current cash: " msgstr "Current cash: " -#: src/exch.c:648 +#: src/exch.c:647 msgid "^{<1>^} Buy stock from company" msgstr "^{<1>^} Buy stock from company" -#: src/exch.c:650 +#: src/exch.c:649 msgid "^{<2>^} Sell stock back to company" msgstr "^{<2>^} Sell stock back to company" -#: src/exch.c:652 +#: src/exch.c:651 msgid "^{<3>^} Bid company to issue more shares" msgstr "^{<3>^} Bid company to issue more shares" -#: src/exch.c:654 +#: src/exch.c:653 msgid "^{<4>^} Exit to the Stock Exchange" msgstr "^{<4>^} Exit to the Stock Exchange" -#: src/exch.c:657 +#: src/exch.c:656 msgid "Enter selection [^{1^}-^{4^}]: " msgstr "Enter selection [^{1^}-^{4^}]: " -#: src/exch.c:713 +#: src/exch.c:712 msgid " No Shares Available " msgstr " No Shares Available " -#: src/exch.c:714 +#: src/exch.c:713 msgid "No more shares are available for purchase." msgstr "No more shares are available for purchase." -#: src/exch.c:718 +#: src/exch.c:717 msgid " Insufficient Cash " msgstr " Insufficient Cash " -#: src/exch.c:719 +#: src/exch.c:718 msgid "" "You do not have enough cash\n" "to purchase additional shares." @@ -932,42 +932,42 @@ msgstr "" "You do not have enough cash\n" "to purchase additional shares." -#: src/exch.c:730 +#: src/exch.c:729 #, c-format msgid "You can purchase ^{one^} share." msgid_plural "You can purchase up to ^{%'ld^} shares." msgstr[0] "You can purchase ^{one^} share." msgstr[1] "You can purchase up to ^{%'ld^} shares." -#: src/exch.c:736 +#: src/exch.c:735 msgid "How many shares do you wish to purchase? " msgstr "How many shares do you wish to purchase? " -#: src/exch.c:757 +#: src/exch.c:756 msgid " No Shares " msgstr " No Shares " -#: src/exch.c:758 +#: src/exch.c:757 msgid "You do not have any shares to sell." msgstr "You do not have any shares to sell." -#: src/exch.c:765 +#: src/exch.c:764 #, c-format msgid "You can sell ^{one^} share." msgid_plural "You can sell up to ^{%'ld^} shares." msgstr[0] "You can sell ^{one^} share." msgstr[1] "You can sell up to ^{%'ld^} shares." -#: src/exch.c:771 +#: src/exch.c:770 msgid "How many shares do you wish to sell? " msgstr "How many shares do you wish to sell? " -#: src/exch.c:799 +#: src/exch.c:798 msgid " No Shares Issued " msgstr " No Shares Issued " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:801 +#: src/exch.c:800 #, c-format msgid "" "%ls has refused\n" @@ -976,12 +976,12 @@ msgstr "" "%ls has refused\n" "to issue more shares." -#: src/exch.c:806 +#: src/exch.c:805 msgid " Shares Issued " msgstr " Shares Issued " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:808 +#: src/exch.c:807 #, c-format msgid "" "%ls has issued\n" diff --git a/po/en_GB.po b/po/en_GB.po index 90a671b..4d2403e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-29 14:13+1000\n" +"POT-Creation-Date: 2011-08-30 09:08+1000\n" "PO-Revision-Date: 2011-08-30 08:26+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" @@ -302,7 +302,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: src/game.c:341 src/move.c:382 +#: src/game.c:341 src/move.c:386 msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:849 +#: src/game.c:606 src/move.c:853 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -497,38 +497,38 @@ msgctxt "label" msgid "Total value: " msgstr "Total value: " -#: src/game.c:800 src/exch.c:323 +#: src/game.c:800 src/exch.c:322 msgctxt "label" msgid "Current cash: " msgstr "Current cash: " -#: src/game.c:807 src/exch.c:331 +#: src/game.c:807 src/exch.c:330 msgctxt "label" msgid "Current debt: " msgstr "Current debt: " -#: src/game.c:813 src/exch.c:336 +#: src/game.c:813 src/exch.c:335 msgctxt "label" msgid "Interest rate: " msgstr "Interest rate: " -#: src/move.c:235 src/exch.c:183 +#: src/move.c:239 src/exch.c:182 msgid "^{<1>^} Display stock portfolio" msgstr "^{<1>^} Display stock portfolio" -#: src/move.c:237 +#: src/move.c:241 msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:239 +#: src/move.c:243 msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:241 +#: src/move.c:245 msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#: src/move.c:245 +#: src/move.c:249 #, c-format msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -536,51 +536,51 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. TRANSLATORS: "Move" refers to the choice of #. moves made by the current player (out of a #. selection of 20 moves). -#: src/move.c:278 +#: src/move.c:282 #, c-format msgid "Move ^{%lc^}" msgstr "Move ^{%lc^}" -#: src/move.c:299 +#: src/move.c:303 msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:308 +#: src/move.c:312 msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:329 +#: src/move.c:333 msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:344 +#: src/move.c:348 msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:361 src/move.c:439 +#: src/move.c:365 src/move.c:443 #, c-format msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:669 src/move.c:676 src/move.c:1020 src/move.c:1054 +#: src/move.c:673 src/move.c:680 src/move.c:1024 src/move.c:1058 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:670 +#: src/move.c:674 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:677 +#: src/move.c:681 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:745 +#: src/move.c:749 msgid " New Company " msgstr " New Company " -#: src/move.c:746 +#: src/move.c:750 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +589,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:805 +#: src/move.c:809 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +598,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:811 +#: src/move.c:815 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +609,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:831 +#: src/move.c:835 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:842 +#: src/move.c:846 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +626,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:856 +#: src/move.c:860 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +635,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:861 +#: src/move.c:865 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +644,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:868 +#: src/move.c:872 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +652,12 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:874 +#: src/move.c:878 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1021 +#: src/move.c:1025 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +668,7 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1043 +#: src/move.c:1047 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +687,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1071 +#: src/move.c:1075 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +696,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1079 +#: src/move.c:1083 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1172 src/exch.c:320 +#: src/move.c:1176 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1174 +#: src/move.c:1178 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -746,19 +746,19 @@ msgstr "" "Shares\n" "issued" -#: src/exch.c:185 +#: src/exch.c:184 msgid "^{<2>^} Display galaxy map" msgstr "^{<2>^} Display galaxy map" -#: src/exch.c:187 +#: src/exch.c:186 msgid "^{<3>^} Visit the Trading Bank" msgstr "^{<3>^} Visit the Trading Bank" -#: src/exch.c:189 +#: src/exch.c:188 msgid "^{<4>^} Exit the Stock Exchange" msgstr "^{<4>^} Exit the Stock Exchange" -#: src/exch.c:192 +#: src/exch.c:191 msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " @@ -771,7 +771,7 @@ msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " #. #. Note that some of these labels are used for both the Player #. Status window and the Trading Bank window. -#: src/exch.c:350 +#: src/exch.c:349 msgctxt "label" msgid "Credit limit: " msgstr "Credit limit: " @@ -780,56 +780,56 @@ msgstr "Credit limit: " #. from the Bank" menu options must all be the same length #. (ie, padded with trailing spaces as required). The maximum #. length is 72 characters. -#: src/exch.c:365 +#: src/exch.c:364 msgid "^{<1>^} Borrow money " msgstr "^{<1>^} Borrow money " -#: src/exch.c:367 +#: src/exch.c:366 msgid "^{<2>^} Repay debt " msgstr "^{<2>^} Repay debt " -#: src/exch.c:369 +#: src/exch.c:368 msgid "^{<3>^} Exit from the Bank" msgstr "^{<3>^} Exit from the Bank" -#: src/exch.c:372 +#: src/exch.c:371 msgid "Enter selection [^{1^}-^{3^}]: " msgstr "Enter selection [^{1^}-^{3^}]: " -#: src/exch.c:425 +#: src/exch.c:424 msgid " Insufficient Credit Limit " msgstr " Insufficient Credit Limit " -#: src/exch.c:426 +#: src/exch.c:425 msgid "The Bank will not lend you any more money." msgstr "The Bank will not lend you any more money." -#: src/exch.c:446 +#: src/exch.c:445 msgid "How much do you wish to borrow? " msgstr "How much do you wish to borrow? " -#: src/exch.c:478 +#: src/exch.c:477 msgid " No Debt " msgstr " No Debt " -#: src/exch.c:479 +#: src/exch.c:478 msgid "You have no debt to repay." msgstr "You have no debt to repay." -#: src/exch.c:483 +#: src/exch.c:482 msgid " No Cash " msgstr " No Cash " -#: src/exch.c:484 +#: src/exch.c:483 msgid "You have no cash with which to repay the debt!" msgstr "You have no cash with which to repay the debt!" -#: src/exch.c:504 +#: src/exch.c:503 msgid "How much do you wish to repay? " msgstr "How much do you wish to repay? " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:580 +#: src/exch.c:579 #, c-format msgid " Stock Transaction in %ls " msgstr " Stock Transaction in %ls " @@ -842,27 +842,27 @@ msgstr " Stock Transaction in %ls " #. and must have at least one trailing space for the output #. routines to work correctly. The maximum length of each #. label is 22 characters. -#: src/exch.c:591 +#: src/exch.c:590 msgctxt "label|Stock A" msgid "Shares issued: " msgstr "Shares issued: " #. TRANSLATORS: "Shares left" is the number of shares that are #. left to be purchased in the current company. -#: src/exch.c:599 +#: src/exch.c:598 msgctxt "label|Stock A" msgid "Shares left: " msgstr "Shares left: " #. TRANSLATORS: "Price per share" is the cost of each share in #. the current company. -#: src/exch.c:606 +#: src/exch.c:605 msgctxt "label|Stock A" msgid "Price per share: " msgstr "Price per share: " #. TRANSLATORS: "Return" is the share return as a percentage. -#: src/exch.c:612 +#: src/exch.c:611 msgctxt "label|Stock A" msgid "Return: " msgstr "Return: " @@ -875,56 +875,56 @@ msgstr "Return: " #. least one trailing space for the display routines to work #. correctly. The maximum length of each label is 18 #. characters. -#: src/exch.c:625 +#: src/exch.c:624 msgctxt "label|Stock B" msgid "Current holdings: " msgstr "Current holdings: " #. TRANSLATORS: "Percentage owned" is the current player's #. percentage ownership in this particular company. -#: src/exch.c:632 +#: src/exch.c:631 msgctxt "label|Stock B" msgid "Percentage owned: " msgstr "Percentage owned: " -#: src/exch.c:637 +#: src/exch.c:636 msgctxt "label|Stock B" msgid "Current cash: " msgstr "Current cash: " -#: src/exch.c:648 +#: src/exch.c:647 msgid "^{<1>^} Buy stock from company" msgstr "^{<1>^} Buy stock from company" -#: src/exch.c:650 +#: src/exch.c:649 msgid "^{<2>^} Sell stock back to company" msgstr "^{<2>^} Sell stock back to company" -#: src/exch.c:652 +#: src/exch.c:651 msgid "^{<3>^} Bid company to issue more shares" msgstr "^{<3>^} Bid company to issue more shares" -#: src/exch.c:654 +#: src/exch.c:653 msgid "^{<4>^} Exit to the Stock Exchange" msgstr "^{<4>^} Exit to the Stock Exchange" -#: src/exch.c:657 +#: src/exch.c:656 msgid "Enter selection [^{1^}-^{4^}]: " msgstr "Enter selection [^{1^}-^{4^}]: " -#: src/exch.c:713 +#: src/exch.c:712 msgid " No Shares Available " msgstr " No Shares Available " -#: src/exch.c:714 +#: src/exch.c:713 msgid "No more shares are available for purchase." msgstr "No more shares are available for purchase." -#: src/exch.c:718 +#: src/exch.c:717 msgid " Insufficient Cash " msgstr " Insufficient Cash " -#: src/exch.c:719 +#: src/exch.c:718 msgid "" "You do not have enough cash\n" "to purchase additional shares." @@ -932,42 +932,42 @@ msgstr "" "You do not have enough cash\n" "to purchase additional shares." -#: src/exch.c:730 +#: src/exch.c:729 #, c-format msgid "You can purchase ^{one^} share." msgid_plural "You can purchase up to ^{%'ld^} shares." msgstr[0] "You can purchase ^{one^} share." msgstr[1] "You can purchase up to ^{%'ld^} shares." -#: src/exch.c:736 +#: src/exch.c:735 msgid "How many shares do you wish to purchase? " msgstr "How many shares do you wish to purchase? " -#: src/exch.c:757 +#: src/exch.c:756 msgid " No Shares " msgstr " No Shares " -#: src/exch.c:758 +#: src/exch.c:757 msgid "You do not have any shares to sell." msgstr "You do not have any shares to sell." -#: src/exch.c:765 +#: src/exch.c:764 #, c-format msgid "You can sell ^{one^} share." msgid_plural "You can sell up to ^{%'ld^} shares." msgstr[0] "You can sell ^{one^} share." msgstr[1] "You can sell up to ^{%'ld^} shares." -#: src/exch.c:771 +#: src/exch.c:770 msgid "How many shares do you wish to sell? " msgstr "How many shares do you wish to sell? " -#: src/exch.c:799 +#: src/exch.c:798 msgid " No Shares Issued " msgstr " No Shares Issued " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:801 +#: src/exch.c:800 #, c-format msgid "" "%ls has refused\n" @@ -976,12 +976,12 @@ msgstr "" "%ls has refused\n" "to issue more shares." -#: src/exch.c:806 +#: src/exch.c:805 msgid " Shares Issued " msgstr " Shares Issued " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:808 +#: src/exch.c:807 #, c-format msgid "" "%ls has issued\n" diff --git a/po/en_US.po b/po/en_US.po index d40ce75..5ca50be 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-29 14:13+1000\n" +"POT-Creation-Date: 2011-08-30 09:08+1000\n" "PO-Revision-Date: 2011-08-30 08:27+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" @@ -302,7 +302,7 @@ msgctxt "input|ContinueGame" msgid "Cc" msgstr "Cc" -#: src/game.c:341 src/move.c:382 +#: src/game.c:341 src/move.c:386 msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:849 +#: src/game.c:606 src/move.c:853 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -497,38 +497,38 @@ msgctxt "label" msgid "Total value: " msgstr "Total value: " -#: src/game.c:800 src/exch.c:323 +#: src/game.c:800 src/exch.c:322 msgctxt "label" msgid "Current cash: " msgstr "Current cash: " -#: src/game.c:807 src/exch.c:331 +#: src/game.c:807 src/exch.c:330 msgctxt "label" msgid "Current debt: " msgstr "Current debt: " -#: src/game.c:813 src/exch.c:336 +#: src/game.c:813 src/exch.c:335 msgctxt "label" msgid "Interest rate: " msgstr "Interest rate: " -#: src/move.c:235 src/exch.c:183 +#: src/move.c:239 src/exch.c:182 msgid "^{<1>^} Display stock portfolio" msgstr "^{<1>^} Display stock portfolio" -#: src/move.c:237 +#: src/move.c:241 msgid "^{<2>^} Declare bankruptcy" msgstr "^{<2>^} Declare bankruptcy" -#: src/move.c:239 +#: src/move.c:243 msgid "^{<3>^} Save and end the game" msgstr "^{<3>^} Save and end the game" -#: src/move.c:241 +#: src/move.c:245 msgid "^{^} Quit the game" msgstr "^{^} Quit the game" -#: src/move.c:245 +#: src/move.c:249 #, c-format msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " @@ -536,51 +536,51 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " #. TRANSLATORS: "Move" refers to the choice of #. moves made by the current player (out of a #. selection of 20 moves). -#: src/move.c:278 +#: src/move.c:282 #, c-format msgid "Move ^{%lc^}" msgstr "Move ^{%lc^}" -#: src/move.c:299 +#: src/move.c:303 msgid "^{<2>^} (Declare bankruptcy)" msgstr "^{<2>^} (Declare bankruptcy)" -#: src/move.c:308 +#: src/move.c:312 msgid "^{<3>^} (Save and end the game)" msgstr "^{<3>^} (Save and end the game)" -#: src/move.c:329 +#: src/move.c:333 msgid "^{^} (Quit the game)" msgstr "^{^} (Quit the game)" -#: src/move.c:344 +#: src/move.c:348 msgid "Are you sure? [^{Y^}/^{N^}] " msgstr "Are you sure? [^{Y^}/^{N^}] " -#: src/move.c:361 src/move.c:439 +#: src/move.c:365 src/move.c:443 #, c-format msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:669 src/move.c:676 src/move.c:1020 src/move.c:1054 +#: src/move.c:673 src/move.c:680 src/move.c:1024 src/move.c:1058 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:670 +#: src/move.c:674 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:677 +#: src/move.c:681 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:745 +#: src/move.c:749 msgid " New Company " msgstr " New Company " -#: src/move.c:746 +#: src/move.c:750 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +589,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:805 +#: src/move.c:809 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +598,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:811 +#: src/move.c:815 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +609,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:831 +#: src/move.c:835 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:842 +#: src/move.c:846 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +626,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:856 +#: src/move.c:860 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +635,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:861 +#: src/move.c:865 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +644,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:868 +#: src/move.c:872 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +652,12 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:874 +#: src/move.c:878 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1021 +#: src/move.c:1025 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +668,7 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1043 +#: src/move.c:1047 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +687,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1071 +#: src/move.c:1075 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +696,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1079 +#: src/move.c:1083 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1172 src/exch.c:320 +#: src/move.c:1176 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1174 +#: src/move.c:1178 #, c-format msgid "" "Your debt has amounted to %N!\n" @@ -746,19 +746,19 @@ msgstr "" "Shares\n" "issued" -#: src/exch.c:185 +#: src/exch.c:184 msgid "^{<2>^} Display galaxy map" msgstr "^{<2>^} Display galaxy map" -#: src/exch.c:187 +#: src/exch.c:186 msgid "^{<3>^} Visit the Trading Bank" msgstr "^{<3>^} Visit the Trading Bank" -#: src/exch.c:189 +#: src/exch.c:188 msgid "^{<4>^} Exit the Stock Exchange" msgstr "^{<4>^} Exit the Stock Exchange" -#: src/exch.c:192 +#: src/exch.c:191 msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " @@ -771,7 +771,7 @@ msgstr "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " #. #. Note that some of these labels are used for both the Player #. Status window and the Trading Bank window. -#: src/exch.c:350 +#: src/exch.c:349 msgctxt "label" msgid "Credit limit: " msgstr "Credit limit: " @@ -780,56 +780,56 @@ msgstr "Credit limit: " #. from the Bank" menu options must all be the same length #. (ie, padded with trailing spaces as required). The maximum #. length is 72 characters. -#: src/exch.c:365 +#: src/exch.c:364 msgid "^{<1>^} Borrow money " msgstr "^{<1>^} Borrow money " -#: src/exch.c:367 +#: src/exch.c:366 msgid "^{<2>^} Repay debt " msgstr "^{<2>^} Repay debt " -#: src/exch.c:369 +#: src/exch.c:368 msgid "^{<3>^} Exit from the Bank" msgstr "^{<3>^} Exit from the Bank" -#: src/exch.c:372 +#: src/exch.c:371 msgid "Enter selection [^{1^}-^{3^}]: " msgstr "Enter selection [^{1^}-^{3^}]: " -#: src/exch.c:425 +#: src/exch.c:424 msgid " Insufficient Credit Limit " msgstr " Insufficient Credit Limit " -#: src/exch.c:426 +#: src/exch.c:425 msgid "The Bank will not lend you any more money." msgstr "The Bank will not lend you any more money." -#: src/exch.c:446 +#: src/exch.c:445 msgid "How much do you wish to borrow? " msgstr "How much do you wish to borrow? " -#: src/exch.c:478 +#: src/exch.c:477 msgid " No Debt " msgstr " No Debt " -#: src/exch.c:479 +#: src/exch.c:478 msgid "You have no debt to repay." msgstr "You have no debt to repay." -#: src/exch.c:483 +#: src/exch.c:482 msgid " No Cash " msgstr " No Cash " -#: src/exch.c:484 +#: src/exch.c:483 msgid "You have no cash with which to repay the debt!" msgstr "You have no cash with which to repay the debt!" -#: src/exch.c:504 +#: src/exch.c:503 msgid "How much do you wish to repay? " msgstr "How much do you wish to repay? " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:580 +#: src/exch.c:579 #, c-format msgid " Stock Transaction in %ls " msgstr " Stock Transaction in %ls " @@ -842,27 +842,27 @@ msgstr " Stock Transaction in %ls " #. and must have at least one trailing space for the output #. routines to work correctly. The maximum length of each #. label is 22 characters. -#: src/exch.c:591 +#: src/exch.c:590 msgctxt "label|Stock A" msgid "Shares issued: " msgstr "Shares issued: " #. TRANSLATORS: "Shares left" is the number of shares that are #. left to be purchased in the current company. -#: src/exch.c:599 +#: src/exch.c:598 msgctxt "label|Stock A" msgid "Shares left: " msgstr "Shares left: " #. TRANSLATORS: "Price per share" is the cost of each share in #. the current company. -#: src/exch.c:606 +#: src/exch.c:605 msgctxt "label|Stock A" msgid "Price per share: " msgstr "Price per share: " #. TRANSLATORS: "Return" is the share return as a percentage. -#: src/exch.c:612 +#: src/exch.c:611 msgctxt "label|Stock A" msgid "Return: " msgstr "Return: " @@ -875,56 +875,56 @@ msgstr "Return: " #. least one trailing space for the display routines to work #. correctly. The maximum length of each label is 18 #. characters. -#: src/exch.c:625 +#: src/exch.c:624 msgctxt "label|Stock B" msgid "Current holdings: " msgstr "Current holdings: " #. TRANSLATORS: "Percentage owned" is the current player's #. percentage ownership in this particular company. -#: src/exch.c:632 +#: src/exch.c:631 msgctxt "label|Stock B" msgid "Percentage owned: " msgstr "Percentage owned: " -#: src/exch.c:637 +#: src/exch.c:636 msgctxt "label|Stock B" msgid "Current cash: " msgstr "Current cash: " -#: src/exch.c:648 +#: src/exch.c:647 msgid "^{<1>^} Buy stock from company" msgstr "^{<1>^} Buy stock from company" -#: src/exch.c:650 +#: src/exch.c:649 msgid "^{<2>^} Sell stock back to company" msgstr "^{<2>^} Sell stock back to company" -#: src/exch.c:652 +#: src/exch.c:651 msgid "^{<3>^} Bid company to issue more shares" msgstr "^{<3>^} Bid company to issue more shares" -#: src/exch.c:654 +#: src/exch.c:653 msgid "^{<4>^} Exit to the Stock Exchange" msgstr "^{<4>^} Exit to the Stock Exchange" -#: src/exch.c:657 +#: src/exch.c:656 msgid "Enter selection [^{1^}-^{4^}]: " msgstr "Enter selection [^{1^}-^{4^}]: " -#: src/exch.c:713 +#: src/exch.c:712 msgid " No Shares Available " msgstr " No Shares Available " -#: src/exch.c:714 +#: src/exch.c:713 msgid "No more shares are available for purchase." msgstr "No more shares are available for purchase." -#: src/exch.c:718 +#: src/exch.c:717 msgid " Insufficient Cash " msgstr " Insufficient Cash " -#: src/exch.c:719 +#: src/exch.c:718 msgid "" "You do not have enough cash\n" "to purchase additional shares." @@ -932,42 +932,42 @@ msgstr "" "You do not have enough cash\n" "to purchase additional shares." -#: src/exch.c:730 +#: src/exch.c:729 #, c-format msgid "You can purchase ^{one^} share." msgid_plural "You can purchase up to ^{%'ld^} shares." msgstr[0] "You can purchase ^{one^} share." msgstr[1] "You can purchase up to ^{%'ld^} shares." -#: src/exch.c:736 +#: src/exch.c:735 msgid "How many shares do you wish to purchase? " msgstr "How many shares do you wish to purchase? " -#: src/exch.c:757 +#: src/exch.c:756 msgid " No Shares " msgstr " No Shares " -#: src/exch.c:758 +#: src/exch.c:757 msgid "You do not have any shares to sell." msgstr "You do not have any shares to sell." -#: src/exch.c:765 +#: src/exch.c:764 #, c-format msgid "You can sell ^{one^} share." msgid_plural "You can sell up to ^{%'ld^} shares." msgstr[0] "You can sell ^{one^} share." msgstr[1] "You can sell up to ^{%'ld^} shares." -#: src/exch.c:771 +#: src/exch.c:770 msgid "How many shares do you wish to sell? " msgstr "How many shares do you wish to sell? " -#: src/exch.c:799 +#: src/exch.c:798 msgid " No Shares Issued " msgstr " No Shares Issued " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:801 +#: src/exch.c:800 #, c-format msgid "" "%ls has refused\n" @@ -976,12 +976,12 @@ msgstr "" "%ls has refused\n" "to issue more shares." -#: src/exch.c:806 +#: src/exch.c:805 msgid " Shares Issued " msgstr " Shares Issued " #. TRANSLATORS: %ls represents the company name. -#: src/exch.c:808 +#: src/exch.c:807 #, c-format msgid "" "%ls has issued\n" From 8bbee054ad9c037c118fc64e84386ef2d5373a19 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Tue, 30 Aug 2011 12:45:45 +1000 Subject: [PATCH 07/16] Change the handling of default value keycodes to be configurable --- po/en_AU.po | 26 ++++++++++++++++++-------- po/en_CA.po | 26 ++++++++++++++++++-------- po/en_GB.po | 26 ++++++++++++++++++-------- po/en_US.po | 26 ++++++++++++++++++-------- src/intf.c | 14 ++++++++++++-- src/intf.h | 4 ---- 6 files changed, 84 insertions(+), 38 deletions(-) diff --git a/po/en_AU.po b/po/en_AU.po index 379cffd..af72255 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-30 09:08+1000\n" -"PO-Revision-Date: 2011-08-30 08:26+1000\n" +"POT-Creation-Date: 2011-08-30 12:38+1000\n" +"PO-Revision-Date: 2011-08-30 12:42+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" @@ -1409,7 +1409,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:3025 +#: src/help.c:473 src/intf.c:3035 msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1451,7 +1451,17 @@ msgstr "mkchstr_conv: NUL" msgid "mkchstr: `%s'" msgstr "mkchstr: ‘%s’" -#: src/intf.c:2025 src/intf.c:2070 +#. TRANSLATORS: This string specifies the keycodes used to insert the +#. default value into the input string, if entered as the very first +#. character. Ideally, it should contain an easily-accessible +#. keycode that would NOT be used in ordinary input. Digits, ".", +#. ",", "+" and "-" are definitely NOT acceptable. +#: src/intf.c:2020 +msgctxt "input|DefaultValue" +msgid "=;" +msgstr "=;" + +#: src/intf.c:2034 src/intf.c:2079 #, c-format msgid "gettxline: illegal character in string: `%ls'" msgstr "gettxline: illegal character in string: ‘%ls’" @@ -1460,12 +1470,12 @@ msgstr "gettxline: illegal character in string: ‘%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:2942 +#: src/intf.c:2952 msgctxt "input|Yes" msgid "Yy" msgstr "Yy" -#: src/intf.c:2944 +#: src/intf.c:2954 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1473,12 +1483,12 @@ 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:2995 +#: src/intf.c:3005 msgctxt "answer" msgid "Yes" msgstr "Yes" -#: src/intf.c:2997 +#: src/intf.c:3007 msgctxt "answer" msgid "No" msgstr "No" diff --git a/po/en_CA.po b/po/en_CA.po index a14c344..a70d8d8 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-30 09:08+1000\n" -"PO-Revision-Date: 2011-08-30 08:26+1000\n" +"POT-Creation-Date: 2011-08-30 12:38+1000\n" +"PO-Revision-Date: 2011-08-30 12:43+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" @@ -1409,7 +1409,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:3025 +#: src/help.c:473 src/intf.c:3035 msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1451,7 +1451,17 @@ msgstr "mkchstr_conv: NUL" msgid "mkchstr: `%s'" msgstr "mkchstr: ‘%s’" -#: src/intf.c:2025 src/intf.c:2070 +#. TRANSLATORS: This string specifies the keycodes used to insert the +#. default value into the input string, if entered as the very first +#. character. Ideally, it should contain an easily-accessible +#. keycode that would NOT be used in ordinary input. Digits, ".", +#. ",", "+" and "-" are definitely NOT acceptable. +#: src/intf.c:2020 +msgctxt "input|DefaultValue" +msgid "=;" +msgstr "=;" + +#: src/intf.c:2034 src/intf.c:2079 #, c-format msgid "gettxline: illegal character in string: `%ls'" msgstr "gettxline: illegal character in string: ‘%ls’" @@ -1460,12 +1470,12 @@ msgstr "gettxline: illegal character in string: ‘%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:2942 +#: src/intf.c:2952 msgctxt "input|Yes" msgid "Yy" msgstr "Yy" -#: src/intf.c:2944 +#: src/intf.c:2954 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1473,12 +1483,12 @@ 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:2995 +#: src/intf.c:3005 msgctxt "answer" msgid "Yes" msgstr "Yes" -#: src/intf.c:2997 +#: src/intf.c:3007 msgctxt "answer" msgid "No" msgstr "No" diff --git a/po/en_GB.po b/po/en_GB.po index 4d2403e..688b242 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-30 09:08+1000\n" -"PO-Revision-Date: 2011-08-30 08:26+1000\n" +"POT-Creation-Date: 2011-08-30 12:38+1000\n" +"PO-Revision-Date: 2011-08-30 12:43+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" @@ -1409,7 +1409,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:3025 +#: src/help.c:473 src/intf.c:3035 msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1451,7 +1451,17 @@ msgstr "mkchstr_conv: NUL" msgid "mkchstr: `%s'" msgstr "mkchstr: ‘%s’" -#: src/intf.c:2025 src/intf.c:2070 +#. TRANSLATORS: This string specifies the keycodes used to insert the +#. default value into the input string, if entered as the very first +#. character. Ideally, it should contain an easily-accessible +#. keycode that would NOT be used in ordinary input. Digits, ".", +#. ",", "+" and "-" are definitely NOT acceptable. +#: src/intf.c:2020 +msgctxt "input|DefaultValue" +msgid "=;" +msgstr "=;" + +#: src/intf.c:2034 src/intf.c:2079 #, c-format msgid "gettxline: illegal character in string: `%ls'" msgstr "gettxline: illegal character in string: ‘%ls’" @@ -1460,12 +1470,12 @@ msgstr "gettxline: illegal character in string: ‘%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:2942 +#: src/intf.c:2952 msgctxt "input|Yes" msgid "Yy" msgstr "Yy" -#: src/intf.c:2944 +#: src/intf.c:2954 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1473,12 +1483,12 @@ 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:2995 +#: src/intf.c:3005 msgctxt "answer" msgid "Yes" msgstr "Yes" -#: src/intf.c:2997 +#: src/intf.c:3007 msgctxt "answer" msgid "No" msgstr "No" diff --git a/po/en_US.po b/po/en_US.po index 5ca50be..f9bceb9 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-30 09:08+1000\n" -"PO-Revision-Date: 2011-08-30 08:27+1000\n" +"POT-Creation-Date: 2011-08-30 12:38+1000\n" +"PO-Revision-Date: 2011-08-30 12:43+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" @@ -1409,7 +1409,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:3025 +#: src/help.c:473 src/intf.c:3035 msgid "[ Press to continue ] " msgstr "[ Press to continue ] " @@ -1451,7 +1451,17 @@ msgstr "mkchstr_conv: NUL" msgid "mkchstr: `%s'" msgstr "mkchstr: ‘%s’" -#: src/intf.c:2025 src/intf.c:2070 +#. TRANSLATORS: This string specifies the keycodes used to insert the +#. default value into the input string, if entered as the very first +#. character. Ideally, it should contain an easily-accessible +#. keycode that would NOT be used in ordinary input. Digits, ".", +#. ",", "+" and "-" are definitely NOT acceptable. +#: src/intf.c:2020 +msgctxt "input|DefaultValue" +msgid "=;" +msgstr "=;" + +#: src/intf.c:2034 src/intf.c:2079 #, c-format msgid "gettxline: illegal character in string: `%ls'" msgstr "gettxline: illegal character in string: ‘%ls’" @@ -1460,12 +1470,12 @@ msgstr "gettxline: illegal character in string: ‘%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:2942 +#: src/intf.c:2952 msgctxt "input|Yes" msgid "Yy" msgstr "Yy" -#: src/intf.c:2944 +#: src/intf.c:2954 msgctxt "input|No" msgid "Nn" msgstr "Nn" @@ -1473,12 +1483,12 @@ 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:2995 +#: src/intf.c:3005 msgctxt "answer" msgid "Yes" msgstr "Yes" -#: src/intf.c:2997 +#: src/intf.c:3007 msgctxt "answer" msgid "No" msgstr "No" diff --git a/src/intf.c b/src/intf.c index e8eb0af..d1730ae 100644 --- a/src/intf.c +++ b/src/intf.c @@ -1993,6 +1993,7 @@ int gettxline (WINDOW *win, wchar_t *restrict buf, int bufsize, const wchar_t *allowed, bool stripspc, int y, int x, int width, chtype attr) { + wchar_t *keycode_defval; bool done, redraw, mod; int len, pos, st; int clen, cpos; @@ -2010,6 +2011,14 @@ int gettxline (WINDOW *win, wchar_t *restrict buf, int bufsize, chbuf = xmalloc(BUFSIZE * sizeof(chtype)); + keycode_defval = xmalloc(BUFSIZE * sizeof(wchar_t)); + /* TRANSLATORS: This string specifies the keycodes used to insert the + default value into the input string, if entered as the very first + character. Ideally, it should contain an easily-accessible + keycode that would NOT be used in ordinary input. Digits, ".", + ",", "+" and "-" are definitely NOT acceptable. */ + xmbstowcs(keycode_defval, pgettext("input|DefaultValue", "=;"), BUFSIZE); + keypad(win, true); meta(win, true); wtimeout(win, -1); @@ -2055,8 +2064,8 @@ int gettxline (WINDOW *win, wchar_t *restrict buf, int bufsize, if (rcode == OK) { // Ordinary wide character - if ((key == CHAR_DEFVAL1 || key == CHAR_DEFVAL2) - && defaultval != NULL && len == 0) { + if (defaultval != NULL && len == 0 + && wcschr(keycode_defval, key) != NULL) { // Initialise buffer with the default value wcsncpy(buf, defaultval, bufsize - 1); @@ -2705,6 +2714,7 @@ int gettxline (WINDOW *win, wchar_t *restrict buf, int bufsize, } free(chbuf); + free(keycode_defval); return ret; } diff --git a/src/intf.h b/src/intf.h index db73c8a..a7d5b01 100644 --- a/src/intf.h +++ b/src/intf.h @@ -101,10 +101,6 @@ typedef enum curs_type { #define KEY_CTRL(x) ((x) - 0100) // ASCII control character -// Keycodes for inserting the default value in input routines -#define CHAR_DEFVAL1 L'=' -#define CHAR_DEFVAL2 L';' - // Control-arrow key combinations, as returned by Ncurses #ifndef KEY_CDOWN # define KEY_CDOWN 01007 // CTRL + Down Arrow From 8c950278b893ed3f3245bd943e1d170ad48aa7e6 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 15 Mar 2012 02:13:30 +1100 Subject: [PATCH 08/16] Update to the latest upstream version of ax_with_curses.m4 --- m4/ax_with_curses.m4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/m4/ax_with_curses.m4 b/m4/ax_with_curses.m4 index 5399b85..33a37ac 100644 --- a/m4/ax_with_curses.m4 +++ b/m4/ax_with_curses.m4 @@ -127,15 +127,15 @@ # To use the HAVE_xxx_H preprocessor symbols, insert the following into # your system.h (or equivalent) header file: # -# #if defined(HAVE_NCURSESW_CURSES_H) +# #if defined HAVE_NCURSESW_CURSES_H # # include -# #elif defined(HAVE_NCURSESW_H) +# #elif defined HAVE_NCURSESW_H # # include -# #elif defined(HAVE_NCURSES_CURSES_H) +# #elif defined HAVE_NCURSES_CURSES_H # # include -# #elif defined(HAVE_NCURSES_H) +# #elif defined HAVE_NCURSES_H # # include -# #elif defined(HAVE_CURSES_H) +# #elif defined HAVE_CURSES_H # # include # #else # # error "SysV or X/Open-compatible Curses header file required" @@ -153,7 +153,7 @@ # # Copyright (c) 2009 Mark Pulford # Copyright (c) 2009 Damian Pietras -# Copyright (c) 2011 Reuben Thomas +# Copyright (c) 2012 Reuben Thomas # Copyright (c) 2011 John Zaitseff # # This program is free software: you can redistribute it and/or modify it @@ -182,7 +182,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 11 +#serial 13 AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES]) AC_DEFUN([AX_WITH_CURSES], [ @@ -394,7 +394,7 @@ AC_DEFUN([AX_WITH_CURSES], [ # Test for plain Curses (or if CURSES_LIB was set by user) AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [ - AS_IF([test "x$CURSES_LIB" = x], [ + AS_IF([test "x$CURSES_LIB" != x], [ LIBS="$ax_saved_LIBS $CURSES_LIB" ], [ LIBS="$ax_saved_LIBS -lcurses" From 4ddb8af23d766d90e5b196476c304b5b8dc263e6 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 15 Mar 2012 02:14:24 +1100 Subject: [PATCH 09/16] Update to the latest version of the GNU Portability Library --- m4/.gitignore | 2 ++ m4/gnulib-cache.m4 | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/m4/.gitignore b/m4/.gitignore index a26f228..233b231 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -52,6 +52,7 @@ po.m4 printf-posix.m4 progtest.m4 size_max.m4 +ssize_t.m4 stdbool.m4 stddef_h.m4 stdint.m4 @@ -60,6 +61,7 @@ stdio_h.m4 stdlib_h.m4 string_h.m4 strstr.m4 +sys_socket_h.m4 sys_stat_h.m4 sys_time_h.m4 threadlib.m4 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 00ce11e..958524c 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -1,9 +1,21 @@ -# Copyright (C) 2002-2011 Free Software Foundation, Inc. +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under +# 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . +# +# As a special exception to the GNU General Public License, +# this file may be distributed as part of a program that +# contains a configuration script generated by Autoconf, under # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. From bc3e1a06a1b145d211c768f0906a437f98501200 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 15 Mar 2012 02:36:23 +1100 Subject: [PATCH 10/16] Update the copyright year to 2012 --- COPYING | 2 +- INSTALL | 2 +- Makefile.am | 2 +- NEWS | 2 +- README | 4 ++-- build-aux/README | 2 +- configure.ac | 2 +- doc/Makefile.am | 2 +- doc/README | 2 +- doc/trader.6 | 6 +++--- lib/README | 2 +- m4/Makefile.am | 2 +- m4/README | 2 +- po/LINGUAS | 2 +- po/Makevars | 2 +- po/POTFILES.in | 2 +- po/README | 2 +- po/en_AU.po | 4 ++-- po/en_CA.po | 4 ++-- po/en_GB.po | 4 ++-- po/en_US.po | 4 ++-- src/Makefile.am | 2 +- src/README | 2 +- src/exch.c | 2 +- src/exch.h | 2 +- src/fileio.c | 2 +- src/fileio.h | 2 +- src/game.c | 2 +- src/game.h | 2 +- src/globals.c | 2 +- src/globals.h | 2 +- src/help.c | 2 +- src/help.h | 2 +- src/intf.c | 2 +- src/intf.h | 2 +- src/move.c | 2 +- src/move.h | 2 +- src/system.h | 2 +- src/trader.c | 4 ++-- src/trader.h | 2 +- src/utils.c | 2 +- src/utils.h | 2 +- 42 files changed, 50 insertions(+), 50 deletions(-) diff --git a/COPYING b/COPYING index 151a054..03b7501 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/INSTALL b/INSTALL index c48a8ff..de24e66 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/Makefile.am b/Makefile.am index 7413364..27e2f4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2011, John Zaitseff # +# Copyright (C) 1990-2012, John Zaitseff # # # ######################################################################### diff --git a/NEWS b/NEWS index 81b6552..97f477f 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/README b/README index af40616..b84079d 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** @@ -66,7 +66,7 @@ welcomed! Please send these to: Copyright ========= -Copyright (C) 1990-2011, John Zaitseff. +Copyright (C) 1990-2012, John Zaitseff. Star Traders is free software that is distributed under the terms of the GNU General Public License. You can redistribute it and/or modify it diff --git a/build-aux/README b/build-aux/README index 70cf99f..ee5b8ee 100644 --- a/build-aux/README +++ b/build-aux/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/configure.ac b/configure.ac index 68961b2..768bfea 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-2011, John Zaitseff * +dnl * Copyright (C) 1990-2012, John Zaitseff * dnl * * dnl ********************************************************************* dnl diff --git a/doc/Makefile.am b/doc/Makefile.am index 64e23e9..f55e60c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2011, John Zaitseff # +# Copyright (C) 1990-2012, John Zaitseff # # # ######################################################################### diff --git a/doc/README b/doc/README index b6ea180..7e6788b 100644 --- a/doc/README +++ b/doc/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/doc/trader.6 b/doc/trader.6 index 5a1a63c..bd2500c 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -1,7 +1,7 @@ .\" ********************************************************************* .\" * * .\" * Star Traders: A Game of Interstellar Trading * -.\" * Copyright (C) 1990-2011, John Zaitseff * +.\" * Copyright (C) 1990-2012, John Zaitseff * .\" * * .\" ********************************************************************* .\" @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "29th August, 2011" "Unix-like systems" +.TH TRADER 6 "15th March, 2012" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* @@ -200,7 +200,7 @@ Australia .PP .\" ********************************************************************* .SH COPYRIGHT -Copyright \(co 1990\-2011, John Zaitseff. +Copyright \(co 1990\-2012, John Zaitseff. .PP \fBStar Traders\fR is free software that is distributed under the terms of the GNU General Public License. You can redistribute it and/or modify diff --git a/lib/README b/lib/README index f158155..2126ec9 100644 --- a/lib/README +++ b/lib/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/m4/Makefile.am b/m4/Makefile.am index 82492df..4d6fd22 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2011, John Zaitseff # +# Copyright (C) 1990-2012, John Zaitseff # # # ######################################################################### diff --git a/m4/README b/m4/README index aedfad5..6be4a53 100644 --- a/m4/README +++ b/m4/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/po/LINGUAS b/po/LINGUAS index 6a642e9..ba1a332 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2011, John Zaitseff # +# Copyright (C) 1990-2012, John Zaitseff # # # ######################################################################### diff --git a/po/Makevars b/po/Makevars index 28f3b22..fa0c4cc 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2011, John Zaitseff # +# Copyright (C) 1990-2012, John Zaitseff # # # ######################################################################### diff --git a/po/POTFILES.in b/po/POTFILES.in index e227a2c..abaf6cc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2011, John Zaitseff # +# Copyright (C) 1990-2012, John Zaitseff # # # ######################################################################### diff --git a/po/README b/po/README index 7930c42..b0ea9dd 100644 --- a/po/README +++ b/po/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/po/en_AU.po b/po/en_AU.po index af72255..af3db7e 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -1,14 +1,14 @@ # ************************************************************************* # * * # * English (Australian) Translations for Star Traders * -# * Copyright (C) 1990-2011, John Zaitseff * +# * Copyright (C) 1990-2012, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011. +# John Zaitseff , 2011-12. # msgid "" msgstr "" diff --git a/po/en_CA.po b/po/en_CA.po index a70d8d8..511ef7e 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -1,14 +1,14 @@ # ************************************************************************* # * * # * English (Canadian) Translations for Star Traders * -# * Copyright (C) 1990-2011, John Zaitseff * +# * Copyright (C) 1990-2012, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011. +# John Zaitseff , 2011-12. # msgid "" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 688b242..35e0cc7 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,14 +1,14 @@ # ************************************************************************* # * * # * English (British) Translations for Star Traders * -# * Copyright (C) 1990-2011, John Zaitseff * +# * Copyright (C) 1990-2012, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011. +# John Zaitseff , 2011-12. # msgid "" msgstr "" diff --git a/po/en_US.po b/po/en_US.po index f9bceb9..ba0f791 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1,14 +1,14 @@ # ************************************************************************* # * * # * English (US) Translations for Star Traders * -# * Copyright (C) 1990-2011, John Zaitseff * +# * Copyright (C) 1990-2012, John Zaitseff * # * * # ************************************************************************* # # This file is distributed under the same licence as Star Traders. # # Contributors: -# John Zaitseff , 2011. +# John Zaitseff , 2011-12. # msgid "" msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index 57feebf..898b148 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ ######################################################################### # # # Star Traders: A Game of Interstellar Trading # -# Copyright (C) 1990-2011, John Zaitseff # +# Copyright (C) 1990-2012, John Zaitseff # # # ######################################################################### diff --git a/src/README b/src/README index a52e7cc..e0657d3 100644 --- a/src/README +++ b/src/README @@ -1,7 +1,7 @@ ************************************************************************** * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************** diff --git a/src/exch.c b/src/exch.c index da88c29..5e9a59b 100644 --- a/src/exch.c +++ b/src/exch.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/exch.h b/src/exch.h index 6dc75c9..e5fd09c 100644 --- a/src/exch.h +++ b/src/exch.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.c b/src/fileio.c index 9b75432..4d0d810 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/fileio.h b/src/fileio.h index 4afa483..5c503ab 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.c b/src/game.c index 1521fa1..79fa56a 100644 --- a/src/game.c +++ b/src/game.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/game.h b/src/game.h index 74aa84e..4cf7f45 100644 --- a/src/game.h +++ b/src/game.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.c b/src/globals.c index bc251a5..2cdc4db 100644 --- a/src/globals.c +++ b/src/globals.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/globals.h b/src/globals.h index 9d0c626..40decff 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.c b/src/help.c index e803441..0c258ec 100644 --- a/src/help.c +++ b/src/help.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/help.h b/src/help.h index ddb5998..0a54e40 100644 --- a/src/help.h +++ b/src/help.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.c b/src/intf.c index d1730ae..f482281 100644 --- a/src/intf.c +++ b/src/intf.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/intf.h b/src/intf.h index a7d5b01..2983b3a 100644 --- a/src/intf.h +++ b/src/intf.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.c b/src/move.c index 40f4dd8..85b159e 100644 --- a/src/move.c +++ b/src/move.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/move.h b/src/move.h index a94277f..7d23f23 100644 --- a/src/move.h +++ b/src/move.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/system.h b/src/system.h index e86c2f4..8b72b7b 100644 --- a/src/system.h +++ b/src/system.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/trader.c b/src/trader.c index 96b85a8..b9ab1be 100644 --- a/src/trader.c +++ b/src/trader.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, 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-2011"); +"), program_name, PACKAGE_VERSION, "1990-2012"); exit(EXIT_SUCCESS); } diff --git a/src/trader.h b/src/trader.h index 0ae2f4c..324dae2 100644 --- a/src/trader.h +++ b/src/trader.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.c b/src/utils.c index 0d6cc6f..3354ddd 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ diff --git a/src/utils.h b/src/utils.h index 1174edf..9c4aded 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,7 +1,7 @@ /************************************************************************ * * * Star Traders: A Game of Interstellar Trading * -* Copyright (C) 1990-2011, John Zaitseff * +* Copyright (C) 1990-2012, John Zaitseff * * * ************************************************************************/ From 2b7cff4e4df0bcf7faaa6690081ad30f34b59f61 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 15 Mar 2012 08:20:52 +1100 Subject: [PATCH 11/16] Update the date fields in the English PO files --- po/en_AU.po | 4 ++-- po/en_CA.po | 4 ++-- po/en_GB.po | 4 ++-- po/en_US.po | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/en_AU.po b/po/en_AU.po index af3db7e..f19dfa9 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-30 12:38+1000\n" -"PO-Revision-Date: 2011-08-30 12:42+1000\n" +"POT-Creation-Date: 2012-03-15 08:15+1100\n" +"PO-Revision-Date: 2012-03-15 08:18+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 511ef7e..f867456 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-30 12:38+1000\n" -"PO-Revision-Date: 2011-08-30 12:43+1000\n" +"POT-Creation-Date: 2012-03-15 08:15+1100\n" +"PO-Revision-Date: 2012-03-15 08:18+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index 35e0cc7..99cd06c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-30 12:38+1000\n" -"PO-Revision-Date: 2011-08-30 12:43+1000\n" +"POT-Creation-Date: 2012-03-15 08:15+1100\n" +"PO-Revision-Date: 2012-03-15 08:19+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index ba0f791..3789ab6 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2011-08-30 12:38+1000\n" -"PO-Revision-Date: 2011-08-30 12:43+1000\n" +"POT-Creation-Date: 2012-03-15 08:15+1100\n" +"PO-Revision-Date: 2012-03-15 08:19+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" From b44e032953c64ee021ef04324647e4a41dcbdc80 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 15 Mar 2012 09:09:12 +1100 Subject: [PATCH 12/16] Add translation comments explaining a number of strings In particular, bankruptcy affects both players and companies, and the strings may need to be translated differently. Also update PO files appropriately. --- po/en_AU.po | 56 ++++++++++++++++++++++++++++++++--------------------- po/en_CA.po | 56 ++++++++++++++++++++++++++++++++--------------------- po/en_GB.po | 56 ++++++++++++++++++++++++++++++++--------------------- po/en_US.po | 56 ++++++++++++++++++++++++++++++++--------------------- src/move.c | 12 ++++++++++++ 5 files changed, 148 insertions(+), 88 deletions(-) diff --git a/po/en_AU.po b/po/en_AU.po index f19dfa9..f06971d 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 08:15+1100\n" -"PO-Revision-Date: 2012-03-15 08:18+1100\n" +"POT-Creation-Date: 2012-03-15 09:02+1100\n" +"PO-Revision-Date: 2012-03-15 09:05+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:853 +#: src/game.c:606 src/move.c:857 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -562,25 +562,29 @@ msgstr "Are you sure? [^{Y^}/^{N^}] " msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:673 src/move.c:680 src/move.c:1024 src/move.c:1058 +#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:674 +#. TRANSLATORS: %ls is the name of the player being made +#. bankrupt. +#: src/move.c:676 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:681 +#. TRANSLATORS: %ls is the name of the player that has +#. declared themselves bankrupt. +#: src/move.c:685 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:749 +#: src/move.c:753 msgid " New Company " msgstr " New Company " -#: src/move.c:750 +#: src/move.c:754 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +593,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:809 +#: src/move.c:813 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +602,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:815 +#: src/move.c:819 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +613,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:835 +#: src/move.c:839 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:846 +#: src/move.c:850 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +630,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:860 +#: src/move.c:864 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +639,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:865 +#: src/move.c:869 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +648,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:872 +#: src/move.c:876 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +656,14 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:878 +#: src/move.c:882 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1025 +#. TRANSLATORS: %ls is the name of the company +#. that has been made bankrupt. +#: src/move.c:1031 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +674,13 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1047 +#. TRANSLATORS: %ls is the name of the +#. company that has been made +#. bankrupt. %.2f is a number between +#. 0.00 and 100.00 representing the +#. percentage of company value payed by +#. the bank to players. +#: src/move.c:1059 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +699,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1075 +#: src/move.c:1087 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +708,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1083 +#: src/move.c:1095 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1176 src/exch.c:319 +#: src/move.c:1188 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1178 +#: src/move.c:1190 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_CA.po b/po/en_CA.po index f867456..854c3f0 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 08:15+1100\n" -"PO-Revision-Date: 2012-03-15 08:18+1100\n" +"POT-Creation-Date: 2012-03-15 09:02+1100\n" +"PO-Revision-Date: 2012-03-15 09:06+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:853 +#: src/game.c:606 src/move.c:857 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -562,25 +562,29 @@ msgstr "Are you sure? [^{Y^}/^{N^}] " msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:673 src/move.c:680 src/move.c:1024 src/move.c:1058 +#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:674 +#. TRANSLATORS: %ls is the name of the player being made +#. bankrupt. +#: src/move.c:676 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:681 +#. TRANSLATORS: %ls is the name of the player that has +#. declared themselves bankrupt. +#: src/move.c:685 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:749 +#: src/move.c:753 msgid " New Company " msgstr " New Company " -#: src/move.c:750 +#: src/move.c:754 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +593,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:809 +#: src/move.c:813 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +602,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:815 +#: src/move.c:819 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +613,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:835 +#: src/move.c:839 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:846 +#: src/move.c:850 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +630,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:860 +#: src/move.c:864 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +639,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:865 +#: src/move.c:869 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +648,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:872 +#: src/move.c:876 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +656,14 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:878 +#: src/move.c:882 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1025 +#. TRANSLATORS: %ls is the name of the company +#. that has been made bankrupt. +#: src/move.c:1031 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +674,13 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1047 +#. TRANSLATORS: %ls is the name of the +#. company that has been made +#. bankrupt. %.2f is a number between +#. 0.00 and 100.00 representing the +#. percentage of company value payed by +#. the bank to players. +#: src/move.c:1059 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +699,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1075 +#: src/move.c:1087 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +708,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1083 +#: src/move.c:1095 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1176 src/exch.c:319 +#: src/move.c:1188 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1178 +#: src/move.c:1190 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_GB.po b/po/en_GB.po index 99cd06c..4bc73c7 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 08:15+1100\n" -"PO-Revision-Date: 2012-03-15 08:19+1100\n" +"POT-Creation-Date: 2012-03-15 09:02+1100\n" +"PO-Revision-Date: 2012-03-15 09:06+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:853 +#: src/game.c:606 src/move.c:857 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -562,25 +562,29 @@ msgstr "Are you sure? [^{Y^}/^{N^}] " msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:673 src/move.c:680 src/move.c:1024 src/move.c:1058 +#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:674 +#. TRANSLATORS: %ls is the name of the player being made +#. bankrupt. +#: src/move.c:676 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:681 +#. TRANSLATORS: %ls is the name of the player that has +#. declared themselves bankrupt. +#: src/move.c:685 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:749 +#: src/move.c:753 msgid " New Company " msgstr " New Company " -#: src/move.c:750 +#: src/move.c:754 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +593,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:809 +#: src/move.c:813 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +602,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:815 +#: src/move.c:819 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +613,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:835 +#: src/move.c:839 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:846 +#: src/move.c:850 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +630,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:860 +#: src/move.c:864 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +639,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:865 +#: src/move.c:869 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +648,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:872 +#: src/move.c:876 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +656,14 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:878 +#: src/move.c:882 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1025 +#. TRANSLATORS: %ls is the name of the company +#. that has been made bankrupt. +#: src/move.c:1031 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +674,13 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1047 +#. TRANSLATORS: %ls is the name of the +#. company that has been made +#. bankrupt. %.2f is a number between +#. 0.00 and 100.00 representing the +#. percentage of company value payed by +#. the bank to players. +#: src/move.c:1059 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +699,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1075 +#: src/move.c:1087 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +708,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1083 +#: src/move.c:1095 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1176 src/exch.c:319 +#: src/move.c:1188 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1178 +#: src/move.c:1190 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_US.po b/po/en_US.po index 3789ab6..9eece72 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 08:15+1100\n" -"PO-Revision-Date: 2012-03-15 08:19+1100\n" +"POT-Creation-Date: 2012-03-15 09:02+1100\n" +"PO-Revision-Date: 2012-03-15 09:06+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" @@ -371,7 +371,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:853 +#: src/game.c:606 src/move.c:857 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -562,25 +562,29 @@ msgstr "Are you sure? [^{Y^}/^{N^}] " msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:673 src/move.c:680 src/move.c:1024 src/move.c:1058 +#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#: src/move.c:674 +#. TRANSLATORS: %ls is the name of the player being made +#. bankrupt. +#: src/move.c:676 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#: src/move.c:681 +#. TRANSLATORS: %ls is the name of the player that has +#. declared themselves bankrupt. +#: src/move.c:685 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:749 +#: src/move.c:753 msgid " New Company " msgstr " New Company " -#: src/move.c:750 +#: src/move.c:754 #, c-format msgid "" "A new company has been formed!\n" @@ -589,7 +593,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:809 +#: src/move.c:813 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -598,7 +602,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:815 +#: src/move.c:819 msgid " Company Merger " msgstr " Company Merger " @@ -609,14 +613,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:835 +#: src/move.c:839 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has #. absorbed another due to a merger. -#: src/move.c:846 +#: src/move.c:850 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -626,7 +630,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:860 +#: src/move.c:864 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -635,7 +639,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:865 +#: src/move.c:869 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -644,7 +648,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:872 +#: src/move.c:876 msgctxt "subtitle" msgid "New" msgstr "New" @@ -652,12 +656,14 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:878 +#: src/move.c:882 msgctxt "subtitle" msgid "Old" msgstr "Old" -#: src/move.c:1025 +#. TRANSLATORS: %ls is the name of the company +#. that has been made bankrupt. +#: src/move.c:1031 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -668,7 +674,13 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#: src/move.c:1047 +#. TRANSLATORS: %ls is the name of the +#. company that has been made +#. bankrupt. %.2f is a number between +#. 0.00 and 100.00 representing the +#. percentage of company value payed by +#. the bank to players. +#: src/move.c:1059 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -687,7 +699,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1075 +#: src/move.c:1087 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -696,16 +708,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1083 +#: src/move.c:1095 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1176 src/exch.c:319 +#: src/move.c:1188 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1178 +#: src/move.c:1190 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/src/move.c b/src/move.c index 85b159e..8e98d16 100644 --- a/src/move.c +++ b/src/move.c @@ -671,6 +671,8 @@ void bankrupt_player (bool forced) txdlgbox(MAX_DLG_LINES, 50, 7, WCENTER, attr_error_window, attr_error_title, attr_error_highlight, 0, 0, attr_error_waitforkey, _(" Bankruptcy Court "), + /* TRANSLATORS: %ls is the name of the player being made + bankrupt. */ _("%ls has been declared bankrupt " "by the Interstellar Trading Bank."), player[current_player].name); @@ -678,6 +680,8 @@ void bankrupt_player (bool forced) txdlgbox(MAX_DLG_LINES, 50, 7, WCENTER, attr_error_window, attr_error_title, attr_error_highlight, 0, 0, attr_error_waitforkey, _(" Bankruptcy Court "), + /* TRANSLATORS: %ls is the name of the player that has + declared themselves bankrupt. */ _("%ls has declared bankruptcy."), player[current_player].name); } @@ -1022,6 +1026,8 @@ void adjust_values (void) attr_error_title, attr_error_highlight, attr_error_normal, 0, attr_error_waitforkey, _(" Bankruptcy Court "), + /* TRANSLATORS: %ls is the name of the company + that has been made bankrupt. */ _("%ls has been declared bankrupt " "by the Interstellar Trading Bank.\n\n" "^{All assets have been taken " @@ -1044,6 +1050,12 @@ void adjust_values (void) lines = mkchstr(chbuf, BUFSIZE, attr_error_highlight, attr_error_normal, 0, 6, 60 - 4, widthbuf, 6, + /* TRANSLATORS: %ls is the name of the + company that has been made + bankrupt. %.2f is a number between + 0.00 and 100.00 representing the + percentage of company value payed by + the bank to players. */ _("%ls has been declared bankrupt by the " "Interstellar Trading Bank.\n\n" "^{The Bank has agreed to pay stock holders ^}" From 58c8f4fbf054c70ad673b216271a8ca4169dc2ed Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 15 Mar 2012 14:39:01 +1100 Subject: [PATCH 13/16] Add a preliminary translation into Russian --- po/LINGUAS | 1 + po/ru.po | 1505 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1506 insertions(+) create mode 100644 po/ru.po diff --git a/po/LINGUAS b/po/LINGUAS index ba1a332..e8eac51 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -31,3 +31,4 @@ en_AU en_CA en_GB en_US +ru diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 0000000..342dd19 --- /dev/null +++ b/po/ru.po @@ -0,0 +1,1505 @@ +# ************************************************************************* +# * * +# * Russian Translations for Star Traders * +# * Русский перевод для игры «Звёздные торговцы» * +# * Copyright (C) 1990-2012, John Zaitseff * +# * * +# ************************************************************************* +# +# This file is distributed under the same licence as Star Traders. +# +# Contributors: +# John Zaitseff , 2011-12. +# +msgid "" +msgstr "" +"Project-Id-Version: trader 7.3\n" +"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" +"POT-Creation-Date: 2012-03-15 09:02+1100\n" +"PO-Revision-Date: 2012-03-15 14:13+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" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: src/trader.c:235 +#, c-format +msgid "%s: invalid value for --max-turn: `%s'\n" +msgstr "%s: неверное значение аргумента для --maxturn: «%s»\n" + +#: src/trader.c:251 +#, c-format +msgid "%s: invalid operand `%s'\n" +msgstr "%s: неверный аргумент «%s»\n" + +#: src/trader.c:260 +#, c-format +msgid "%s: invalid game number `%s'\n" +msgstr "%s: неверный номер игры «%s»\n" + +#: src/trader.c:269 +#, c-format +msgid "%s: extra operand `%s'\n" +msgstr "%s: лишний аргумент «%s»\n" + +#. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper +#. name of the author. The IPA pronunciation in this comment is in +#. UTF-8 encoding. +#: src/trader.c:284 +#, c-format +msgid "" +"Star Traders (%s) %s\n" +"Copyright (C) %s, John Zaitseff.\n" +"\n" +"Star Traders is a simple game of interstellar trading, where the object\n" +"of the game is to create companies, buy and sell shares, borrow and repay\n" +"money, in order to become the wealthiest player (the winner).\n" +"\n" +"This program is free software that is distributed under the terms of the\n" +"GNU General Public License, version 3 or later. You are welcome to\n" +"modify and/or distribute it under certain conditions. This program has\n" +"NO WARRANTY, to the extent permitted by law; see the License for details.\n" +msgstr "" +"Звёздные торговцы / Star Traders (%s) %s\n" +"Copyright (C) %s, John Zaitseff.\n" +"\n" +"«Звёздные торговцы» — это простая игра межзвёздной торговли, где целю игры\n" +"является создание компаний, покупка и продажа акций, заимствования денег и\n" +"погашение кредита, чтобы стать самым богатым игроком-победителем.\n" +"\n" +"Это свободное программное обеспечение. Вы можете продавать и распространять\n" +"его в пределах лицензии GNU General Public License версии 3 или новее. Нет\n" +"НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом. Для более подробной\n" +"информации, обратитесь к веб-странице .\n" + +#: src/trader.c:308 +#, c-format +msgid "%s: Try `%s --help' for more information.\n" +msgstr "%s: Попробуйте «%s --help» для получения более подробного описания.\n" + +#: src/trader.c:311 +#, c-format +msgid "Usage: %s [OPTION ...] [GAME]\n" +msgstr "Использование: %s [КЛЮЧ ...] [ИГРА]\n" + +#: src/trader.c:312 +#, c-format +msgid "" +"Play Star Traders, a simple game of interstellar trading.\n" +"\n" +msgstr "" +"Играть в «Звёздные торговцы», простая игра межзвёздной торговли.\n" +"\n" + +#: src/trader.c:315 +#, c-format +msgid "" +"Options:\n" +" -V, --version output version information and exit\n" +" -h, --help display this help and exit\n" +" --no-color don't use color for displaying text\n" +" --max-turn=NUM set the number of turns to NUM\n" +"\n" +msgstr "" +"Ключи:\n" +" -V, --version показать информацию о версии и выйти\n" +" -h, --help показать эту справку и выйти\n" +" --no-color не пользоваться цветами во время игры\n" +" --max-turn=НОМЕР установить НОМЕР как максимальный ход игры\n" +"\n" + +#: src/trader.c:322 +#, c-format +msgid "" +"If GAME is specified as a number between 1 and 9, load and continue\n" +"playing that game. If GAME is not specified, start a new game.\n" +"\n" +msgstr "" +"Если аргумент ИГРА указано как число от 1 до 9, загрузить и продолжать\n" +"соответствующую сохранённую игру. По умолчанию, начать новую игру.\n" +"\n" + +#. TRANSLATORS: The first %s is the proper name of the package +#. author, John Zaitseff [IPA d͡ʒɒn ˈzaɪ̯t͡səf]; the second %s is +#. the e-mail address for reporting bugs. Please add ANOTHER +#. line with the (translated) text "Report translation bugs to +#.
\n", with ADDRESS replaced with either an e-mail +#. address or web URL for reporting bugs in your translation. +#: src/trader.c:334 +#, c-format +msgid "Report bugs to %s <%s>.\n" +msgstr "" +"Об ошибках сообщайте по адресу %s <%s>.\n" +"Об ошибках в русском переводе сообщайте по тому же адресу.\n" + +#. TRANSLATORS: %s is the e-mail address for reporting bugs. As +#. with the previous string, please add ANOTHER line with the +#. (translated) text "Report translation bugs to
\n", +#. with ADDRESS replaced with either an e-mail address or web URL +#. for reporting bugs in your translation. +#: src/trader.c:341 +#, c-format +msgid "Report bugs to <%s>.\n" +msgstr "" +"Об ошибках сообщайте по адресу <%s>.\n" +"Об ошибках в русском переводе сообщайте по тому же адресу.\n" + +#. TRANSLATORS: The first %s is for packagers and may be +#. something like "Debian". +#: src/trader.c:346 +#, c-format +msgid "Report %s bugs to <%s>.\n" +msgstr "Об ошибках в %s сообщайте по адресу <%s>.\n" + +#: src/trader.c:349 +#, c-format +msgid "Star Traders home page: <%s>.\n" +msgstr "Домашняя страница «Звёздные торговцы»: <%s>.\n" + +#. TRANSLATORS: The eight company names do NOT have to be literal +#. translations of the English names. In fact, if possible, the +#. names should start with successive letters of your alphabet (in +#. English, for example, "A" to "H"). No company name should be more +#. than 24 characters (column positions, to be precise) long. +#: src/globals.c:46 +msgid "Altair Starways" +msgstr "Альтаирские торговцы" + +#: src/globals.c:47 +msgid "Betelgeuse, Ltd" +msgstr "ОАО «Бетельгейзе»" + +#: src/globals.c:48 +msgid "Capella Freight Co" +msgstr "Возчики вегавские" + +#: src/globals.c:49 +msgid "Denebola Shippers" +msgstr "Грузоотправители Гидры" + +#: src/globals.c:50 +msgid "Eridani Expediters" +msgstr "Диспетчеры Денеболы" + +#: src/globals.c:51 +msgid "Fornax Express" +msgstr "Единодушные трейдеры" + +#: src/globals.c:52 +msgid "Gemeni Inc" +msgstr "Живой брокер Капеллы" + +#: src/globals.c:53 +msgid "Hercules and Co" +msgstr "Звёздные линии Земли" + +#. TRANSLATORS: This string specifies the keycodes (keyboard input +#. codes) used to enter the Stock Transaction window for each +#. company. There must be exactly eight characters, one for each +#. company in order, before the ASCII vertical line "|"; these must +#. be EITHER all in upper-case or all in lower-case. If at all +#. possible, these should be successive letters in your alphabet (in +#. English, "A" to "H"). Do NOT use digits or control characters. +#. Do not change or translate anything after the vertical line. +#: src/globals.c:67 +msgid "ABCDEFGH|input|Companies" +msgstr "АБВГДЕЖЗ|input|Companies" + +#. TRANSLATORS: This string specifies the keycodes used to select a +#. game move. There must be exactly 20 characters, one for each +#. move, before the ASCII vertical line "|"; these must be EITHER all +#. in upper-case or all in lower-case. If at all possible, these +#. should be successive letters in your alphabet. Do NOT use digits +#. or control characters. Do not change or translate anything after +#. the vertical line. +#: src/globals.c:79 +msgid "ABCDEFGHIJKLMNOPQRST|input|GameMoves" +msgstr "АБВГДЕЖЗИЙКЛМНОПРСТУ|input|GameMoves" + +#. TRANSLATORS: This string is used to display the galaxy map to +#. screen. There must be exactly 11 characters before the ASCII +#. vertical line. The first ("." in English) is used for empty +#. space, the second ("+") for outposts, the third ("*") for stars, +#. the remaining for the eight companies. Do not change or translate +#. anything after the vertical line. +#: src/globals.c:90 +msgid ".+*ABCDEFGH|output|MapVals" +msgstr ".+*АБВГДЕЖЗ|output|MapVals" + +#. TRANSLATORS: This string is used to display the game moves +#. (choices). There must be exactly 20 characters (NUMBER_MOVES) +#. before the ASCII vertical line. The first character corresponds +#. to the first character in the "input|GameMoves" string, and so on. +#. Do not change or translate anything after the vertical line. +#: src/globals.c:100 +msgid "abcdefghijklmnopqrst|output|GameMoves" +msgstr "абвгдежзийклмнопрсту|output|GameMoves" + +#. TRANSLATORS: The ordinal strings "1st" to "8th" are used in the +#. Game Winner dialog box at the end of the game. If ordinals depend +#. on the gender of the player, it may be simpler to list cardinal +#. numbers instead (eg, "No. 1"). Up to five characters are allowed +#. (see ORDINAL_COLS in src/intf.h). +#: src/globals.c:111 +msgid "1st" +msgstr "1ый" + +#: src/globals.c:112 +msgid "2nd" +msgstr "2ой" + +#: src/globals.c:113 +msgid "3rd" +msgstr "3ий" + +#: src/globals.c:114 +msgid "4th" +msgstr "4ый" + +#: src/globals.c:115 +msgid "5th" +msgstr "5ый" + +#: src/globals.c:116 +msgid "6th" +msgstr "6ой" + +#: src/globals.c:117 +msgid "7th" +msgstr "7ой" + +#: src/globals.c:118 +msgid "8th" +msgstr "8ой" + +#: src/game.c:117 src/game.c:152 +#, c-format +msgid "Loading game %d... " +msgstr "Загружается игра №%d... " + +#: src/game.c:226 +msgid " First Player " +msgstr " Первый игрок " + +#: src/game.c:227 +#, c-format +msgid "The first player to go is ^{%ls^}." +msgstr "Первый игрок избран: ^{%ls^}." + +#. TRANSLATORS: The keycode should be modified to +#. match that (or those) specified with msgctxt +#. "input|ContinueGame". +#: src/game.c:259 +#, c-format +msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " +msgstr "Введите число игроков [^{1^}-^{%d^}], или ^{<П>^} для продолжения старой игры: " + +#. TRANSLATORS: This string specifies the keycodes used to continue a +#. game; these must NOT contain any numeric digit from 1 to 9. The +#. first character (keyboard input code) is used to print the user's +#. response if one of those keys is pressed. Both upper and +#. lower-case versions should be present. +#: src/game.c:276 +msgctxt "input|ContinueGame" +msgid "Cc" +msgstr "Пп" + +#: src/game.c:341 src/move.c:386 +msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " +msgstr "Введите номер игры [^{1^}-^{9^}], или ^{^}, чтобы отменить: " + +#: src/game.c:406 +msgid "Please enter your name: " +msgstr "Ваше имя: " + +#: src/game.c:425 +msgid "Do you need any instructions? [^{Y^}/^{N^}] " +msgstr "Показать ли Вам справку о том, как играть? [^{Д^}/^{Н^}] " + +#: src/game.c:443 +msgid " Enter Player Names " +msgstr " Имена игроков " + +#: src/game.c:451 +#, c-format, range: 1..8 +msgid "Player %d: " +msgstr "Игрок №%d: " + +#: src/game.c:529 +msgid "Does any player need instructions? [^{Y^}/^{N^}] " +msgstr "Показать ли справку о том, как играть? [^{Д^}/^{Н^}] " + +#: src/game.c:563 +msgid " Game Over " +msgstr " Конец игры " + +#: src/game.c:564 +#, c-format +msgid "The game is over after one turn." +msgid_plural "The game is over after %d turns." +msgstr[0] "Игра закончена после %d-го хода." +msgstr[1] "Игра закончена после %d-го хода." +msgstr[2] "Игра закончена после %d-го хода." + +#: src/game.c:575 +msgid " Total Value " +msgstr " Общая стоимость " + +#: src/game.c:577 +#, c-format +msgid "Your total value was ^{%N^}." +msgstr "Ваша общая стоимость выразилась в сумме ^{%N^}." + +#: src/game.c:588 +#, c-format +msgid "" +"The winner is ^{%ls^}\n" +"who is ^[*** BANKRUPT ***^]" +msgstr "" +"Победитель игры — ^{%ls^},\n" +"который является ^[*** БАНКРОТОМ ***^]" + +#: src/game.c:591 +#, c-format +msgid "" +"The winner is ^{%ls^}\n" +"with a value of ^{%N^}." +msgstr "" +"Победитель игры — ^{%ls^}!\n" +"Общая стоимость этого игрока выразилась в сумме ^{%N^}." + +#: src/game.c:597 +msgid " Game Winner " +msgstr " Победитель игры " + +#. TRANSLATORS: "Player" is used as a column title in a +#. table containing all player names. +#: src/game.c:606 src/move.c:857 +msgctxt "subtitle" +msgid "Player" +msgstr "Игрок" + +#. TRANSLATORS: "Total Value" refers to the total worth +#. (shares, cash and debt) of any given player. %ls is the +#. currency symbol of the current locale. +#: src/game.c:611 +#, c-format +msgctxt "subtitle" +msgid "Total Value (%ls)" +msgstr "Общая стоимость (%ls)" + +#: src/game.c:645 src/game.c:695 src/exch.c:100 +#, c-format +msgid "Player: ^{%ls^}" +msgstr "Игрок: ^{%ls^}" + +#: src/game.c:648 +#, c-format +msgid " Turn: ^{%d^} " +msgstr " Ход: ^{%d^}-й " + +#: src/game.c:649 +msgid " ^[*** Last Turn ***^] " +msgstr " ^[*** Последний ход ***^] " + +#: src/game.c:693 +msgid " Stock Portfolio " +msgstr " Портфель акций " + +#. TRANSLATORS: The current player is bankrupt (has no +#. shares or cash, ie, whose total value is zero) +#: src/game.c:702 +msgid "^[* * * B A N K R U P T * * *^]" +msgstr "^[* * * О Б А Н К Р О Т И В Ш И Й С Я * * *^]" + +#: src/game.c:717 src/exch.c:112 +msgid "No companies on the map" +msgstr "Нет акционерных обществ на карте" + +#. TRANSLATORS: "Company" is a two-line column label in +#. a table containing a list of companies. +#: src/game.c:725 src/exch.c:120 +msgctxt "subtitle" +msgid "" +"\n" +"Company" +msgstr "" +"\n" +"Фирма" + +#. TRANSLATORS: "Ownership" is a two-line column label +#. in a table containing the current player's +#. percentage ownership in any given company. The +#. maximum column width is 10 characters (see +#. OWNERSHIP_COLS in src/intf.h). +#: src/game.c:732 +#, c-format +msgctxt "subtitle" +msgid "" +"Ownership\n" +"(%%)" +msgstr "" +"Владение\n" +"(%%)" + +#. TRANSLATORS: "Holdings" is a two-line column label +#. in a table containing the number of shares the +#. current player owns in any given company. The +#. maximum column width is 10 characters (see +#. STOCK_OWNED_COLS in src/intf.h). +#: src/game.c:739 +msgctxt "subtitle" +msgid "" +"Holdings\n" +"(shares)" +msgstr "" +"Владение\n" +"(акции)" + +#. TRANSLATORS: "Return" is a two-line column label in +#. a table containing the share return as a percentage +#. in any given company. The maximum column width is +#. 10 characters (see SHARE_RETURN_COLS in src/intf.h). +#: src/game.c:746 src/exch.c:141 +#, c-format +msgctxt "subtitle" +msgid "" +"Return\n" +"(%%)" +msgstr "" +"Возврат\n" +"(%%)" + +#. TRANSLATORS: "Price per share" is a two-line column +#. label in a table containing the price per share in +#. any given company. %ls is the currency symbol in +#. the current locale. The maximum column width is 12 +#. characters INCLUDING the currency symbol (see +#. SHARE_PRICE_COLS in src/intf.h). +#: src/game.c:755 src/exch.c:150 +#, c-format +msgctxt "subtitle" +msgid "" +"Price per\n" +"share (%ls)" +msgstr "" +"Цена\n" +"акции (%ls)" + +#. TRANSLATORS: The "Total value", "Current cash", +#. "Current debt" and "Interest rate" labels MUST all be +#. the same length (ie, right-padded with spaces as +#. needed) and must have at least one trailing space so +#. that the display routines work correctly. The maximum +#. length of each label is 36 characters. +#. +#. Note that some of these labels are used for both the +#. Player Status window and the Trading Bank window. +#: src/game.c:796 +msgctxt "label" +msgid "Total value: " +msgstr "Общая стоимость: " + +#: src/game.c:800 src/exch.c:322 +msgctxt "label" +msgid "Current cash: " +msgstr "Текущие наличные: " + +#: src/game.c:807 src/exch.c:330 +msgctxt "label" +msgid "Current debt: " +msgstr "Текущая задолженность: " + +#: src/game.c:813 src/exch.c:335 +msgctxt "label" +msgid "Interest rate: " +msgstr "Процентная ставка: " + +#: src/move.c:239 src/exch.c:182 +msgid "^{<1>^} Display stock portfolio" +msgstr "^{<1>^} Показать портфель акций" + +#: src/move.c:241 +msgid "^{<2>^} Declare bankruptcy" +msgstr "^{<2>^} Объявить банкротство" + +#: src/move.c:243 +msgid "^{<3>^} Save and end the game" +msgstr "^{<3>^} Сохранить и закончить игру" + +#: src/move.c:245 +msgid "^{^} Quit the game" +msgstr "^{^} Выйти из игры" + +#: src/move.c:249 +#, c-format +msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " +msgstr "Введите выбор [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{^}]: " + +#. TRANSLATORS: "Move" refers to the choice of +#. moves made by the current player (out of a +#. selection of 20 moves). +#: src/move.c:282 +#, c-format +msgid "Move ^{%lc^}" +msgstr "Заход ^{%lc^}" + +#: src/move.c:303 +msgid "^{<2>^} (Declare bankruptcy)" +msgstr "^{<2>^} (Объявить банкротство)" + +#: src/move.c:312 +msgid "^{<3>^} (Save and end the game)" +msgstr "^{<3>^} (Сохранить и закончить игру)" + +#: src/move.c:333 +msgid "^{^} (Quit the game)" +msgstr "^{^} (Выйти из игры)" + +#: src/move.c:348 +msgid "Are you sure? [^{Y^}/^{N^}] " +msgstr "Вы уверены? [^{Д^}/^{Н^}] " + +#: src/move.c:365 src/move.c:443 +#, c-format +msgid "Saving game %d... " +msgstr "Сохраняется игра №%d... " + +#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 +msgid " Bankruptcy Court " +msgstr " Арбитражный суд " + +#. TRANSLATORS: %ls is the name of the player being made +#. bankrupt. +#: src/move.c:676 +#, c-format +msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." +msgstr "Межзвёздный торговой банк объявляет, что игрок %ls обанкротился." + +#. TRANSLATORS: %ls is the name of the player that has +#. declared themselves bankrupt. +#: src/move.c:685 +#, c-format +msgid "%ls has declared bankruptcy." +msgstr "%ls объявляет своё банкротство." + +#: src/move.c:753 +msgid " New Company " +msgstr " Новая фирма " + +#: src/move.c:754 +#, c-format +msgid "" +"A new company has been formed!\n" +"Its name is ^{%ls^}." +msgstr "" +"Сформировано новое торговое предприятие!\n" +"Оно называется ^{%ls^}." + +#: src/move.c:813 +#, c-format +msgid "" +"^{%ls^} has just merged into ^{%ls^}.\n" +"Please note the following transactions:\n" +msgstr "Фирма ^{%ls^} только-что была поглощена фирмой ^{%ls^}. Обратите внимание на следующие транзакции:\n" + +#: src/move.c:819 +msgid " Company Merger " +msgstr " Слияние компаний " + +#. TRANSLATORS: "Old stock" refers to the company that has +#. just ceased existence due to a merger. +#. +#. Note that the "Old stock" and "New stock" labels MUST be +#. the same length and must contain a trailing space for the +#. display routines to work correctly. The maximum length of +#. each label is 36 characters. +#: src/move.c:839 +msgctxt "label" +msgid "Old stock: " +msgstr "Старые акции: " + +#. TRANSLATORS: "New stock" refers to the company that has +#. absorbed another due to a merger. +#: src/move.c:850 +msgctxt "label" +msgid "New Stock: " +msgstr "Новые акции: " + +#. TRANSLATORS: "Bonus" refers to the bonus cash amount paid to +#. each player after two companies merge. %ls is the currency +#. symbol in the current locale. The maximum column width is +#. 12 characters INCLUDING the currency symbol (see +#. MERGE_BONUS_COLS in src/intf.h). +#: src/move.c:864 +#, c-format +msgctxt "subtitle" +msgid "Bonus (%ls)" +msgstr "Бонус (%ls)" + +#. TRANSLATORS: "Total" refers to the total number of shares in +#. the new company after a merger. The maximum column width is +#. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). +#: src/move.c:869 +msgctxt "subtitle" +msgid "Total" +msgstr "Итог" + +#. TRANSLATORS: "New" refers to how many (new) shares each +#. player receives in the surviving company after a merger. +#. The maximum column width is 8 characters (see +#. MERGE_NEW_STOCK_COLS in src/intf.h). +#: src/move.c:876 +msgctxt "subtitle" +msgid "New" +msgstr "Новые" + +#. TRANSLATORS: "Old" refers to how many shares each player had +#. in the company ceasing existence. The maximum column width +#. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). +#: src/move.c:882 +msgctxt "subtitle" +msgid "Old" +msgstr "Старые" + +#. TRANSLATORS: %ls is the name of the company +#. that has been made bankrupt. +#: src/move.c:1031 +#, c-format +msgid "" +"%ls has been declared bankrupt by the Interstellar Trading Bank.\n" +"\n" +"^{All assets have been taken to repay outstanding loans.^}" +msgstr "" +"Межзвёздный торговый банк объявляет, что фирма %ls обанкротилась.\n" +"\n" +"^{Все активы схвачены банком, чтобы погасить долги фирма.^}" + +#. TRANSLATORS: %ls is the name of the +#. company that has been made +#. bankrupt. %.2f is a number between +#. 0.00 and 100.00 representing the +#. percentage of company value payed by +#. the bank to players. +#: src/move.c:1059 +#, c-format +msgid "" +"%ls has been declared bankrupt by the Interstellar Trading Bank.\n" +"\n" +"^{The Bank has agreed to pay stock holders ^}%.2f%%^{ of the share value on each share owned.^}" +msgstr "" +"Межзвёздный торговый банк объявляет, что фирма %ls обанкротилась.\n" +"\n" +"^{Банк согласился выплатить акционерам^}\n" +"%.2f%%^{ от стоимости акций.^}" + +#. TRANSLATORS: The label "Amount paid per share" +#. refers to payment made by the Interstellar +#. Trading Bank to each player upon company +#. bankruptcy. This label MUST be the same +#. length as "Old share value" and MUST have at +#. least one trailing space for the display +#. routines to work correctly. The maximum +#. length is 28 characters. +#: src/move.c:1087 +msgctxt "label" +msgid "Amount paid per share: " +msgstr "Выплаченная сумма за акцию: " + +#. TRANSLATORS: "Old share value" refers to the +#. share price of a company before it was forced +#. into bankruptcy by the Bank. This label must be +#. the same width as "Amount paid per share". +#: src/move.c:1095 +msgctxt "label" +msgid "Old share value: " +msgstr "Старая цена акции: " + +#: src/move.c:1188 src/exch.c:319 +msgid " Interstellar Trading Bank " +msgstr " Межзвёздный торговый банк " + +#: src/move.c:1190 +#, c-format +msgid "" +"Your debt has amounted to %N!\n" +"^{The Bank has impounded ^}%N^{ from your cash.^}" +msgstr "" +"Ваш долг выражается в сумме %N!\n" +"\n" +"^{Межзвёздный торговый банк конфисковал^}\n" +"%N^{ с Ваших наличных.^}" + +#: src/exch.c:98 +msgid " Interstellar Stock Exchange " +msgstr " Межзвёздная фондовая биржа " + +#. TRANSLATORS: "Shares left" is a two-line column +#. label in a table containing the number of shares +#. left to be purchased in any given company. The +#. maximum column width is 10 characters (see +#. STOCK_LEFT_COLS in src/intf.h). +#: src/exch.c:127 +msgctxt "subtitle" +msgid "" +"Shares\n" +"left" +msgstr "" +"Оставшиеся\n" +"акции" + +#. TRANSLATORS: "Shares issued" is a two-line column +#. label in a table containing the number of shares +#. already sold (ie, bought by all players) in any +#. given company. The maximum column width is 10 +#. characters (see STOCK_ISSUED_COLS in src/intf.h). +#: src/exch.c:134 +msgctxt "subtitle" +msgid "" +"Shares\n" +"issued" +msgstr "" +"Выпущенные\n" +"акции" + +#: src/exch.c:184 +msgid "^{<2>^} Display galaxy map" +msgstr "^{<2>^} Показать карту галактики" + +#: src/exch.c:186 +msgid "^{<3>^} Visit the Trading Bank" +msgstr "^{<3>^} Посетить торговый банк" + +#: src/exch.c:188 +msgid "^{<4>^} Exit the Stock Exchange" +msgstr "^{<4>^} Выйти из фондовой биржи" + +#: src/exch.c:191 +msgid "Enter selection [^[Company letter^]/^{1^}-^{4^}]: " +msgstr "Введите выбор [^[Код фирмы^]/^{1^}-^{4^}]: " + +#. TRANSLATORS: The "Total value", "Current cash", "Current +#. debt", "Interest rate" and "Credit limit" labels MUST all be +#. the same length (ie, right-padded with spaces as needed) and +#. must have at least one trailing space so that the display +#. routines work correctly. The maximum length of each label +#. is 36 characters. +#. +#. Note that some of these labels are used for both the Player +#. Status window and the Trading Bank window. +#: src/exch.c:349 +msgctxt "label" +msgid "Credit limit: " +msgstr "Предел кредита: " + +#. TRANSLATORS: The "Borrow money", "Repay debt" and "Exit +#. from the Bank" menu options must all be the same length +#. (ie, padded with trailing spaces as required). The maximum +#. length is 72 characters. +#: src/exch.c:364 +msgid "^{<1>^} Borrow money " +msgstr "^{<1>^} Занимать деньги" + +#: src/exch.c:366 +msgid "^{<2>^} Repay debt " +msgstr "^{<2>^} Погашать долг " + +#: src/exch.c:368 +msgid "^{<3>^} Exit from the Bank" +msgstr "^{<3>^} Выйти из банка " + +#: src/exch.c:371 +msgid "Enter selection [^{1^}-^{3^}]: " +msgstr "Введите выбор [^{1^}-^{3^}]: " + +#: src/exch.c:424 +msgid " Insufficient Credit Limit " +msgstr " Недостаточный предел кредита " + +#: src/exch.c:425 +msgid "The Bank will not lend you any more money." +msgstr "Банк не готов предоставлять Вам больше денег." + +#: src/exch.c:445 +msgid "How much do you wish to borrow? " +msgstr "Сколько Вы хотите взять в кредит? " + +#: src/exch.c:477 +msgid " No Debt " +msgstr " Нет долга " + +#: src/exch.c:478 +msgid "You have no debt to repay." +msgstr "У Вас нет долга погасить." + +#: src/exch.c:482 +msgid " No Cash " +msgstr " Нет наличных " + +#: src/exch.c:483 +msgid "You have no cash with which to repay the debt!" +msgstr "У Вас нет наличных, чем бы погашать долг!" + +#: src/exch.c:503 +msgid "How much do you wish to repay? " +msgstr "Сколько Вы хотите вернуть? " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:579 +#, c-format +msgid " Stock Transaction in %ls " +msgstr " Биржевая операция в фирме %ls " + +#. TRANSLATORS: "Shares issued" represents the number of +#. shares already sold by the company to all players. +#. +#. Note that the labels "Shares issued", "Shares left", +#. "Price per share" and "Return" must all be the same length +#. and must have at least one trailing space for the output +#. routines to work correctly. The maximum length of each +#. label is 22 characters. +#: src/exch.c:590 +msgctxt "label|Stock A" +msgid "Shares issued: " +msgstr "Выпущенные акции: " + +#. TRANSLATORS: "Shares left" is the number of shares that are +#. left to be purchased in the current company. +#: src/exch.c:598 +msgctxt "label|Stock A" +msgid "Shares left: " +msgstr "Оставшиеся акции: " + +#. TRANSLATORS: "Price per share" is the cost of each share in +#. the current company. +#: src/exch.c:605 +msgctxt "label|Stock A" +msgid "Price per share: " +msgstr "Цена акции: " + +#. TRANSLATORS: "Return" is the share return as a percentage. +#: src/exch.c:611 +msgctxt "label|Stock A" +msgid "Return: " +msgstr "Возврат: " + +#. TRANSLATORS: "Current holdings" is the number of shares the +#. current player owns in this particular company. +#. +#. Note that the labels "Current holdings", "Percentage owned" +#. and "Current cash" MUST all be the same length and contain at +#. least one trailing space for the display routines to work +#. correctly. The maximum length of each label is 18 +#. characters. +#: src/exch.c:624 +msgctxt "label|Stock B" +msgid "Current holdings: " +msgstr "Владение (акции): " + +#. TRANSLATORS: "Percentage owned" is the current player's +#. percentage ownership in this particular company. +#: src/exch.c:631 +msgctxt "label|Stock B" +msgid "Percentage owned: " +msgstr "Владение: " + +#: src/exch.c:636 +msgctxt "label|Stock B" +msgid "Current cash: " +msgstr "Текущие наличные: " + +#: src/exch.c:647 +msgid "^{<1>^} Buy stock from company" +msgstr "^{<1>^} Покупать акции от фирмы" + +#: src/exch.c:649 +msgid "^{<2>^} Sell stock back to company" +msgstr "^{<2>^} Продавать акции обратно фирме" + +#: src/exch.c:651 +msgid "^{<3>^} Bid company to issue more shares" +msgstr "^{<3>^} Предлагать фирме выпустить акции" + +#: src/exch.c:653 +msgid "^{<4>^} Exit to the Stock Exchange" +msgstr "^{<4>^} Выйти на фондовую биржу" + +#: src/exch.c:656 +msgid "Enter selection [^{1^}-^{4^}]: " +msgstr "Введите выбор [^{1^}-^{4^}]: " + +#: src/exch.c:712 +msgid " No Shares Available " +msgstr " Акции не доступны " + +#: src/exch.c:713 +msgid "No more shares are available for purchase." +msgstr "Нет осталось больше акций для покупки." + +#: src/exch.c:717 +msgid " Insufficient Cash " +msgstr " Недостаточно наличных " + +#: src/exch.c:718 +msgid "" +"You do not have enough cash\n" +"to purchase additional shares." +msgstr "" +"У Вас нет достаточно денег, чтобы\n" +"приобрести дополнительные акции." + +#: src/exch.c:729 +#, c-format +msgid "You can purchase ^{one^} share." +msgid_plural "You can purchase up to ^{%'ld^} shares." +msgstr[0] "Вы можете приобрести до ^{%'ld-ой^} акции." +msgstr[1] "Вы можете приобрести до ^{%'ld-х^} акций." +msgstr[2] "Вы можете приобрести до ^{%'ld^} акций." + +#: src/exch.c:735 +msgid "How many shares do you wish to purchase? " +msgstr "Сколько акций Вы хотите приобрести? " + +#: src/exch.c:756 +msgid " No Shares " +msgstr " Нет акций " + +#: src/exch.c:757 +msgid "You do not have any shares to sell." +msgstr "У Вас нет ни одной акции для продажи." + +#: src/exch.c:764 +#, c-format +msgid "You can sell ^{one^} share." +msgid_plural "You can sell up to ^{%'ld^} shares." +msgstr[0] "Вы можете продать до ^{%'ld-ой^} акции." +msgstr[1] "Вы можете продать до ^{%'ld-х^} акций." +msgstr[2] "Вы можете продать до ^{%'ld^} акций." + +#: src/exch.c:770 +msgid "How many shares do you wish to sell? " +msgstr "Сколько акций Вы хотите продать? " + +#: src/exch.c:798 +msgid " No Shares Issued " +msgstr " Акции не выпущенны " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:800 +#, c-format +msgid "" +"%ls has refused\n" +"to issue more shares." +msgstr "Фирма %ls отказалась выпустить больше акций." + +#: src/exch.c:805 +msgid " Shares Issued " +msgstr " Акции выпущенны " + +#. TRANSLATORS: %ls represents the company name. +#: src/exch.c:807 +#, c-format +msgid "" +"%ls has issued\n" +"^{one^} more share." +msgid_plural "" +"%ls has issued\n" +"^{%'ld^} more shares." +msgstr[0] "" +"Фирма %ls выпустила\n" +"ещё ^{%'ld-у^} акцию." +msgstr[1] "" +"Фирма %ls выпустила\n" +"ещё ^{%'ld^} акции." +msgstr[2] "" +"Фирма %ls выпустила\n" +"ещё ^{%'ld^} акций." + +#: src/fileio.c:55 src/fileio.c:92 src/fileio.c:131 src/fileio.c:381 +#, c-format +msgid "%s: missing field on line %d" +msgstr "%s: отсутствующее поле в строке %d" + +#: src/fileio.c:60 +#, c-format +msgid "%s: illegal field on line %d: `%s'" +msgstr "%s: неверное поле в строке %d: «%s»" + +#: src/fileio.c:64 +#, c-format +msgid "%s: illegal value on line %d: `%s'" +msgstr "%s: неверное значение в строке %d: «%s»" + +#: src/fileio.c:96 src/fileio.c:135 src/fileio.c:393 +#, c-format +msgid "%s: illegal value on line %d" +msgstr "%s: неверное значение в строке %d" + +#: src/fileio.c:103 +#, c-format +msgid "%s: illegal characters on line %d" +msgstr "%s: неверные символы в строке %d" + +#: src/fileio.c:184 +#, c-format +msgid "%s: could not convert string" +msgstr "%s: не возможно преобразовать строку" + +#: src/fileio.c:255 +msgid " Game Not Found " +msgstr " Игра не найдена " + +#: src/fileio.c:256 +#, c-format +msgid "Game %d has not been saved to disk." +msgstr "Игра №%d не была сохранена." + +#: src/fileio.c:263 +msgid " Game Not Loaded " +msgstr " Игра не загружена " + +#: src/fileio.c:264 +#, c-format +msgid "" +"Game %d could not be loaded from disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Не удалось загрузить сохранённую игру №%d.\n" +"\n" +"^{Файл %s: %s^}" + +#: src/fileio.c:316 +#, c-format +msgid "%s: missing header in game file" +msgstr "%s: отсутствует заголовок в игровом файле" + +#: src/fileio.c:319 +#, c-format +msgid "%s: not a valid game file" +msgstr "%s: неверный формат игрового файла" + +#: src/fileio.c:322 src/fileio.c:329 +#, c-format +msgid "%s: missing subheader in game file" +msgstr "%s: отсутствует подзаголовок в игровом файле" + +#: src/fileio.c:325 +#, c-format +msgid "%s: saved under a different version of Star Traders" +msgstr "%s: файл сохранён в другой версии игры «Звёздные торговцы»" + +#: src/fileio.c:332 +#, c-format +msgid "%s: saved under an incompatible character encoding" +msgstr "%s: файл использовает несовместимую кодировку" + +#: src/fileio.c:340 +#, c-format +msgid "%s: illegal or missing field on line %d" +msgstr "%s: либо неверное поле, либо отсутствующее поле, в строке %d" + +#: src/fileio.c:384 +#, c-format +msgid "%s: illegal field on line %d" +msgstr "%s: неверное поле в строке %d" + +#: src/fileio.c:466 src/fileio.c:487 +msgid " Game Not Saved " +msgstr " Игра не сохранена " + +#: src/fileio.c:467 +#, c-format +msgid "" +"Game %d could not be saved to disk.\n" +"\n" +"^{Directory %s: %s^}" +msgstr "" +"Не возможно сохранить игру №%d.\n" +"\n" +"^{Папка %s: %s^}" + +#: src/fileio.c:488 +#, c-format +msgid "" +"Game %d could not be saved to disk.\n" +"\n" +"^{File %s: %s^}" +msgstr "" +"Не возможно сохранить игру №%d.\n" +"\n" +"^{Файл %s: %s^}" + +#. TRANSLATORS: The help text for Star Traders is marked up using a +#. custom mark-up format NOT used anywhere else in the source code. +#. +#. Each string is a single page of text that is displayed in an area 76 +#. columns wide by 16 lines high. Each line is delimited by "\n". NO +#. word-wrapping is performed: you must place the "\n" characters in the +#. appropriate place. Ideally, each line within the string should be +#. also (manually) space-justified or centred. TAB characters and other +#. control codes must NOT be used. If a string starts with "@" as the +#. very first character, that string is ignored (as are all strings +#. following): this allows a variable number of help text pages (from +#. one to ten). Multibyte strings are handled correctly (even those +#. requiring shift sequences!). +#. +#. The ASCII circumflex accent character "^" switches to a different +#. character rendition (also called attributes), depending on the +#. character following the "^": +#. +#. ^^ - Print the circumflex accent (ASCII code U+005E) +#. ^N - Switch to using the normal character rendition +#. ^B - Switch to using the bold character rendition +#. ^H - Switch to using the highlight character rendition +#. ^K - Switch to using the keycode character rendition (such as used for "") +#. ^e - Switch to using the character rendition used for empty space +#. ^o - Switch to using the character rendition used for outposts +#. ^s - Switch to using the character rendition used for stars +#. ^c - Switch to using the character rendition used for companies +#. ^k - Switch to using the character rendition used for keyboard choices on the galaxy map +#. +#. The help text parsing routines also understand the following "value +#. escapes" introduced by the ASCII tilde character "~"; these act like +#. "%" conversion specifiers in printf(): +#. +#. ~~ - Print the tilde character (ASCII code U+007E) [*] +#. ~x - Print the width of the galaxy map (MAX_X) [**] +#. ~y - Print the height of the galaxy map (MAX_Y) [**] +#. ~m - Print the number of moves available (NUMBER_MOVES) [**] +#. ~c - Print the maximum number of companies that can be formed (MAX_COMPANIES) [*] +#. ~t - Prints the default number of turns in the game (DEFAULT_MAX_TURN) [**] +#. ~1 to ~9 - Print the keycode for the N-th choice of move [***] +#. ~M - Print the keycode for the last choice of move [***] +#. ~A to ~H - Print the character used to represent the company on the galaxy map [***] +#. ~. - Print the character used to represent empty space on the map [***] +#. ~+ - Print the character used to represent outposts on the map [***] +#. ~* - Print the character used to represent stars on the map [***] +#. +#. [*] Takes one character space (column space) in the output +#. [**] Takes two column spaces in the output +#. [***] Takes one or two column spaces in the output, depending on the +#. appropriate strings in the current PO file. +#. +#. Note that all keycodes and map representation characters use locale- +#. specific characters; double-width characters ARE supported. Note +#. also that the tilde value escapes do NOT change the current character +#. rendition: a circumflex accent escape is needed for that. For +#. example, to display the first choice of move as it would be shown on +#. the galaxy map, use something like "^k~1^N" (a six-character sequence +#. that would translate to just one character (or maybe two) in the +#. output text). +#. +#: src/help.c:103 +msgid "" +"^BStar Traders^N is a simple game of interstellar trading. The object of the\n" +"game is to amass the greatest amount of wealth possible. This is done by\n" +"creating interstellar shipping lanes, expanding them and buying shares in\n" +"the companies controlling them. Shares appreciate in value as company\n" +"operations expand. In addition, the return on each share (as a percentage)\n" +"also changes. Players may also borrow from the Interstellar Trading Bank to\n" +"finance additional purchases on the Stock Exchange.\n" +"\n" +"The map of the galaxy is represented by a ^B~x^N x ^B~y^N grid. A typical section\n" +"of it may be:\n" +"\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N represents ^Bempty space^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N represents a ^Bstar^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +msgstr "" + +#: src/help.c:122 +msgid "" +"The computer selects ^B~m^N moves (labeled ^k~1^N to ^k~M^N) at random, and places these\n" +"on the map. To select any of the highlighted positions, press that letter.\n" +"For example, some of the moves on the map may be:\n" +"\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N Moves ^k~1^N to ^k~5^N shown.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +"\n" +"\n" +"Selecting a position that is ^Bnot^N next to a star (such as moves ^k~1^N, ^k~3^N or ^k~5^N)\n" +"will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" +"selected on the above map, a ^o ~+ ^N would be placed at that position.\n" +msgstr "" + +#: src/help.c:140 +msgid "" +"If, on the other hand, a position next to a star (or another outpost) is\n" +"selected, a ^Bcompany^N would be formed and its letter would appear on the map.\n" +"As a reward for creating the company, you are granted the first five shares.\n" +"Up to ^B~c^N companies can be created in this way.\n" +"\n" +"If a position next to an existing company is selected, the company would\n" +"expand its operations by one square. This increases the cost of its shares\n" +"and hence your return. Thus, if the map was as shown below, selecting ^k~6^N\n" +"or ^k~8^N increases Company ^B~B^N's shipping lane:\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~6^N or ^k~8^N increases Company ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +msgstr "" + +#: src/help.c:158 +msgid "" +"Selecting positions next to stars increases the value of your stock by about\n" +"five times as much as an extension not next to a star. Thus move ^k~6^N should\n" +"be preferred to move ^k~8^N.\n" +"\n" +" ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~6^N is preferred to ^k~8^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +"\n" +"You may also expand any company by selecting positions next to outposts.\n" +"Such outposts will be swallowed up by that company. Thus, move ^k~1^N will\n" +"extend Company ^B~C^N by ^Btwo^N squares. As a bonus, outposts next to stars are\n" +"more valuable: the company's share price will increase by a greater amount\n" +"than it would for outposts not next to stars.\n" +msgstr "" + +#: src/help.c:176 +msgid "" +"If two companies are separated on the map by only one square, then they can\n" +"be ^Bmerged^N into one company by selecting that position (if available). For\n" +"example, on the map below, companies ^B~A^N and ^B~B^N can be merged by selecting ^k~5^N.\n" +"When this occurs, the company with the greater assets value takes over the\n" +"other one. Here, Company ^B~B^N might take over Company ^B~A^N. Company ^B~A^N ceases to\n" +"exist, although it may reappear as an entirely new company at a later stage.\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N Move ^k~5^N merges companies ^B~A^N and ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ^o~+^e ~. ~. ^N\n" +"\n" +"When companies merge, players are granted shares in the dominant company\n" +"proportional to the amount owned in the old company. As well, a cash bonus\n" +"is also paid, proportional to the percentage of the old company owned.\n" +msgstr "" + +#: src/help.c:195 +msgid "" +"Once you select your move, you enter the ^BInterstellar Stock Exchange^N. Here\n" +"you may purchase shares, sell them, borrow from the Trading Bank or repay\n" +"some of your debt (if applicable). Note that each company issues a limited\n" +"number of shares -- you cannot go on buying for ever! You may, however, bid\n" +"for more shares to be issued. You have a better chance of succeeding if you\n" +"own a larger proportion of the company.\n" +"\n" +"The game usually ends after ^B~t^N turns. However, you may end the game sooner\n" +"by pressing ^K^N when asked to select a move. As well, individual\n" +"players can declare themselves bankrupt at any time. If your debt is large\n" +"enough, the Bank may do this for you! If you do not complete your game in\n" +"the time you have available, you may save the game and continue it later.\n" +"\n" +"\n" +"The ^Bwinner of the game^N is the person with the greatest net worth (total\n" +"value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" +msgstr "" + +#: src/help.c:215 +msgid "@ Help text, page 7" +msgstr "" + +#: src/help.c:216 +msgid "@ Help text, page 8" +msgstr "" + +#: src/help.c:217 +msgid "@ Help text, page 9" +msgstr "" + +#: src/help.c:218 +msgid "@ Help text, page 10" +msgstr "" + +#: src/help.c:270 +msgid " How to Play " +msgstr " Как играть в «Звёздные торговцы» " + +#: src/help.c:272 +#, c-format +msgid "Page %d of %d" +msgstr "Страница №%d из %d-и" + +#. TRANSLATORS: The reason the user is not asked "Press any +#. key to continue" is historical: many, many people used to +#. ask "where is the key?" :-) +#: src/help.c:473 src/intf.c:3035 +msgid "[ Press to continue ] " +msgstr "[ Нажмите <ПРОБЕЛ> для продолжения ] " + +#. TRANSLATORS: The specific use of and +#. is not essential: you can use , +#. , , or instead of +#. , and almost any other key instead of +#. (other than , , , , +#. or <\>). +#: src/help.c:480 +msgid "[ Press to continue or for the previous page ] " +msgstr "[ Нажмите <ПРОБЕЛ> для продолжения; <←> — вернуться на пред. страницу ] " + +#: src/intf.c:110 +#, c-format +msgid "%s: string has incorrect format: `%s'" +msgstr "%s: строка имеет неверный формат: «%s»" + +#: src/intf.c:126 +#, c-format +msgid "%s: character has illegal width: `%lc'" +msgstr "%s: символ имеет неверную ширину: «%lc»" + +#: src/intf.c:434 +#, c-format +msgid "terminal size is too small (%d x %d required)" +msgstr "размеры терминала слишком малы (нужны %d x %d)" + +#: src/intf.c:610 +msgid "Star Traders" +msgstr "Звёздные торговцы" + +#: src/intf.c:1265 +msgid "mkchstr_conv: NUL" +msgstr "mkchstr_conv: NUL" + +#: src/intf.c:1568 +#, c-format +msgid "mkchstr: `%s'" +msgstr "mkchstr: «%s»" + +#. TRANSLATORS: This string specifies the keycodes used to insert the +#. default value into the input string, if entered as the very first +#. character. Ideally, it should contain an easily-accessible +#. keycode that would NOT be used in ordinary input. Digits, ".", +#. ",", "+" and "-" are definitely NOT acceptable. +#: src/intf.c:2020 +msgctxt "input|DefaultValue" +msgid "=;" +msgstr "=?*\\/" + +#: src/intf.c:2034 src/intf.c:2079 +#, c-format +msgid "gettxline: illegal character in string: `%ls'" +msgstr "gettxline: неверный символ в строке: «%ls»" + +#. TRANSLATORS: The strings with msgctxt "input|Yes" and +#. "input|No" contain the keycodes used to determine whether a +#. user is answering "Yes" or "No" in response to some question. +#. Both upper and lower-case versions should be present. +#: src/intf.c:2952 +msgctxt "input|Yes" +msgid "Yy" +msgstr "Дд1+" + +#: src/intf.c:2954 +msgctxt "input|No" +msgid "Nn" +msgstr "Нн0-" + +#. TRANSLATORS: The strings "Yes" and "No" are printed as a +#. response to user input in answer to questions like "Are you +#. sure? [Y/N] " +#: src/intf.c:3005 +msgctxt "answer" +msgid "Yes" +msgstr "Да" + +#: src/intf.c:3007 +msgctxt "answer" +msgid "No" +msgstr "Нет" + +#: src/utils.c:199 src/utils.c:220 +#, c-format +msgid "%s: " +msgstr "%s: " + +#: src/utils.c:225 +msgid ": " +msgstr ": " + +#: src/utils.c:238 +msgid "out of memory" +msgstr "недостаточно памяти" + +#: src/utils.c:571 +#, c-format +msgid "xmbstowcs: `%s'" +msgstr "xmbstowcs: «%s»" + +#: src/utils.c:611 +msgid "xwcrtomb: NUL" +msgstr "xwcrtomb: NUL" + +#: src/utils.c:616 +#, c-format +msgid "xwcrtomb: `%lc'" +msgstr "xwcrtomb: «%lc»" + +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: неоднозначный ключ «--%s»; возможности:" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: ключ «--%s» должен использоваться без аргумента\n" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: ключ «%c%s» должен использоваться без аргумента\n" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: ключ «--%s» должен использоваться с аргументом\n" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: неизвестный ключ «--%s»\n" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: неизвестный ключ «%c%s»\n" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: неверный ключ «%c»\n" + +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: ключ «%c» должен использоваться с аргументом\n" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: неоднозначный ключ «-W %s»\n" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: ключ «-W %s» должен использоваться без аргумента\n" + +#: lib/getopt.c:1013 lib/getopt.c:1031 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "%s: ключ «-W %s» должен использоваться с аргументом\n" From 6f45f213245e6043c1e97663ce4ffda39b0766ed Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 16 Mar 2012 10:05:00 +1100 Subject: [PATCH 14/16] Translate the help text into Russian, as well as make some corrections --- po/ru.po | 117 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 106 insertions(+), 11 deletions(-) diff --git a/po/ru.po b/po/ru.po index 342dd19..666a5ab 100644 --- a/po/ru.po +++ b/po/ru.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "POT-Creation-Date: 2012-03-15 09:02+1100\n" -"PO-Revision-Date: 2012-03-15 14:13+1100\n" +"PO-Revision-Date: 2012-03-16 10:01+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: Russian\n" "Language: ru\n" @@ -399,7 +399,7 @@ msgstr "Игрок: ^{%ls^}" #: src/game.c:648 #, c-format msgid " Turn: ^{%d^} " -msgstr " Ход: ^{%d^}-й " +msgstr " Ход: ^{%d-й^} " #: src/game.c:649 msgid " ^[*** Last Turn ***^] " @@ -577,7 +577,7 @@ msgstr " Арбитражный суд " #: src/move.c:676 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." -msgstr "Межзвёздный торговой банк объявляет, что игрок %ls обанкротился." +msgstr "Межзвёздный торговый банк объявляет, что игрок %ls обанкротился." #. TRANSLATORS: %ls is the name of the player that has #. declared themselves bankrupt. @@ -851,7 +851,7 @@ msgstr "Сколько Вы хотите вернуть? " #: src/exch.c:579 #, c-format msgid " Stock Transaction in %ls " -msgstr " Биржевая операция в фирме %ls " +msgstr " Биржевые операции в фирме %ls " #. TRANSLATORS: "Shares issued" represents the number of #. shares already sold by the company to all players. @@ -937,7 +937,7 @@ msgstr " Акции не доступны " #: src/exch.c:713 msgid "No more shares are available for purchase." -msgstr "Нет осталось больше акций для покупки." +msgstr "Не осталось больше акций для покупки." #: src/exch.c:717 msgid " Insufficient Cash " @@ -948,7 +948,7 @@ msgid "" "You do not have enough cash\n" "to purchase additional shares." msgstr "" -"У Вас нет достаточно денег, чтобы\n" +"У Вас недостаточно наличных денег, чтобы\n" "приобрести дополнительные акции." #: src/exch.c:729 @@ -1212,6 +1212,22 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" +"^B«Звёздные торговцы»^N ― это простая игра межзвёздной торговли. Цель игры\n" +"состоится в том, чтобы стать самым богатым игроком - победителем. Это\n" +"делается путём создания межзвёздных судоходных маршрутов, расширения этих\n" +"маршрутов, и покупки и продажи акций соответствующих акционерных обществ.\n" +"Кроме того, возврат на каждую акцию (в процентах) изменяется. Игроки также\n" +"могут занять денги у Межзвёздного торгового банка, чтобы финансировать\n" +"дополнительные покупки на фондовой бирже.\n" +"\n" +"Карта галактики представлена сеткой размером ^B~x^N на ^B~y^N. Типичная часть карты\n" +"может быть:\n" +"\n" +" ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ~. ~. ^N ^e ~. ^N обозначает ^Bпустое пространство^N,\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ~. ~. ~. ^N ^s ~* ^N обозначает ^Bзвезду^N.\n" +" ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" #: src/help.c:122 msgid "" @@ -1231,6 +1247,22 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" +"Компьютер выбирает ^B~m^N заходов наугад (обозначенные от ^k~1^N до ^k~M^N) и помещает их\n" +"на карте. Для выбора любого из выделенных позиций, нажмите на соответствую-\n" +"щую букву. Например, некоторые из заходов на карте могут быть:\n" +"\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^k~5^e ~. ~. ^N Показаны заходы от ^k~1^N до ^k~5^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" +"\n" +"\n" +"Избрание позиции, что ^Bне рядом^N со звездой (как, например, заходы ^k~1^N, ^k~3^N или ^k~5^N)\n" +"создаст ^Bфорпост^N не принадлежащий к какой-либо компании. Таким образом,\n" +"избрание захода ^k~3^N на выше-указанной карте создаст форпост, обозначено симво-\n" +"лом ^o ~+ ^N.\n" #: src/help.c:140 msgid "" @@ -1250,6 +1282,22 @@ msgid "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" msgstr "" +"Если избрать позицию рядом со звездой (или рядом с форпостом), будет сформи-\n" +"ровано новое торговое предприятие, и код этой новой фирмы явится на карте\n" +"галактики. В качестве награды за создание компании, Вы получите первые пять\n" +"акций. До ^B~c-и^N компаний могут быть созданы таким образом.\n" +"\n" +"Если, наоборот, избрать позицию рядом с уже-существующей компанией, эта же\n" +"фирма расширит свою деятельность на одну клетку. Это увеличивает стоимость\n" +"её акций и, следовательно, Вашего возвращения. Таким образом, избрание\n" +"захода ^k~6^N или ^k~8^N на ниже-указанной карте расширяет судоходные маршруты компа-\n" +"нии ^B~B^N:\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Заход ^k~6^N или ^k~8^N расширяет фирму ^B~B^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" #: src/help.c:158 msgid "" @@ -1269,6 +1317,21 @@ 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" +"образом, заходу ^k~6^N следует отдать предпочтение, чем заходу ^k~8^N.\n" +"\n" +" ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ^k~1^e ^o~+^e ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Заход ^k~6^N предпочтительней захода ^k~8^N.\n" +" ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" +" ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" +"\n" +"Вы также можете расширить любую компанию, избрав позицию рядом с форпостом.\n" +"Такие форпосты будут поглощены этой фирмой. Таким образом, заход ^k~1^N расширит\n" +"судоходные маршруты компании ^B~C^N на ^Bдве^N клетки. Притом, поглощение форпостов\n" +"около звёзд имеет большую ценность: цена акций фирмы поднимется гораздо\n" +"больше, чем поглощение форпостов не рядом звёзд.\n" #: src/help.c:176 msgid "" @@ -1289,6 +1352,22 @@ msgid "" "proportional to the amount owned in the old company. As well, a cash bonus\n" "is also paid, proportional to the percentage of the old company owned.\n" msgstr "" +"Если две фирмы разделяются на карте только одной клеткой, то избрания этой\n" +"клетки (если есть такая возможность) ^Bобъединяет^N эти фирмы в одну компанию.\n" +"Например, избрание захода ^k~5^N на ниже-указанной карте объединит компании ^B~A^N и\n" +"^B~B^N. В таком случае, фирма с большей общей стоимостью поглощает вторую.\n" +"Здесь, например, компания ^B~B^N может быть поглотит компанию ^B~A^N. Фирма ^B~A^N прекра-\n" +"щает своё существование, хотя она может появиться позднее как совершенно\n" +"новое акционерное общество в будущей части игры.\n" +"\n" +" ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" +" ^e ~. ~. ~. ^c~A^e ^c~A^e ^k~5^e ^c~B^e ~. ~. ^N Заход ^k~5^N сливает компании ^B~A^N и ^B~B^N.\n" +" ^e ~. ^s~*^e ~. ~. ^c~A^e ~. ^c~B^e ^c~B^e ^c~B^e ^N\n" +" ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" +"\n" +"При слиянии компаний, игрокам выдаются акции в доминирующей фирме пропорцио-\n" +"нально владением акций в поглощённом предприятии. Кроме того, выплачивается\n" +"бонус, пропорционально владению старой компании.\n" #: src/help.c:195 msgid "" @@ -1309,22 +1388,38 @@ msgid "" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" "value of cash, stock and debt). ^HGood luck^N and may the best person win!\n" msgstr "" +"После выбора захода, Вы входите в ^BМежзвёздную фондовую биржу^N. Здесь можете\n" +"приобретать акции, продавать их, занимать деньги у торгового банка или пога-\n" +"шать часть своего долга (если применимо). Обратите внимание, что каждая\n" +"компания выпускает ограниченное количество акций ― нельзя просто бесконечно\n" +"покупать! Однако же, можно предлагать фирме выпустить новых акций. Чем\n" +"больше Ваше владение в компании, тем больше шансов успеха на выдачу акций.\n" +"\n" +"Игра обычно заканчивается после ^B~t^N ходов. Однако, можно закончить игру\n" +"раньше, нажав ^K^N вместо избрание захода. Кроме того, отдельные игро-\n" +"ки могут объявить себя банкротом в любой момент. Если Ваш долг достаточно\n" +"велик, банк может сделать это за Вас! Если не хватает времени закончить\n" +"игру, можете сохранить её и продолжить позже.\n" +"\n" +"^BПобедителем игры^N является игрок с самой большой общей стоимостью, то есть,\n" +"общая сумма наличных денег, акций и долга. ^HУдачи Вам^N ― да победит лучший\n" +"игрок!\n" #: src/help.c:215 msgid "@ Help text, page 7" -msgstr "" +msgstr "@" #: src/help.c:216 msgid "@ Help text, page 8" -msgstr "" +msgstr "@" #: src/help.c:217 msgid "@ Help text, page 9" -msgstr "" +msgstr "@" #: src/help.c:218 msgid "@ Help text, page 10" -msgstr "" +msgstr "@" #: src/help.c:270 msgid " How to Play " @@ -1365,7 +1460,7 @@ msgstr "%s: символ имеет неверную ширину: «%lc»" #: src/intf.c:434 #, c-format msgid "terminal size is too small (%d x %d required)" -msgstr "размеры терминала слишком малы (нужны %d x %d)" +msgstr "размеры терминала слишком малы (нужны %d на %d)" #: src/intf.c:610 msgid "Star Traders" From adde1ed5d1aac6b309791e39b9871d3f4b551e38 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 16 Mar 2012 10:13:53 +1100 Subject: [PATCH 15/16] Simplify a number of translator's comments --- po/en_AU.po | 86 ++++++++++++++++++++++++--------------------------- po/en_CA.po | 86 ++++++++++++++++++++++++--------------------------- po/en_GB.po | 86 ++++++++++++++++++++++++--------------------------- po/en_US.po | 86 ++++++++++++++++++++++++--------------------------- po/ru.po | 86 ++++++++++++++++++++++++--------------------------- src/globals.c | 6 ++-- src/move.c | 18 +++-------- 7 files changed, 209 insertions(+), 245 deletions(-) diff --git a/po/en_AU.po b/po/en_AU.po index f06971d..e82aa8d 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 09:02+1100\n" -"PO-Revision-Date: 2012-03-15 09:05+1100\n" +"POT-Creation-Date: 2012-03-16 10:10+1100\n" +"PO-Revision-Date: 2012-03-16 10:11+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian)\n" "Language: en_AU\n" @@ -219,8 +219,9 @@ msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves" #. vertical line. The first ("." in English) is used for empty #. space, the second ("+") for outposts, the third ("*") for stars, #. the remaining for the eight companies. Do not change or translate -#. anything after the vertical line. -#: src/globals.c:90 +#. anything after the vertical line. Double-width characters ARE +#. handled correctly. +#: src/globals.c:91 msgid ".+*ABCDEFGH|output|MapVals" msgstr ".+*ABCDEFGH|output|MapVals" @@ -229,7 +230,8 @@ msgstr ".+*ABCDEFGH|output|MapVals" #. before the ASCII vertical line. The first character corresponds #. to the first character in the "input|GameMoves" string, and so on. #. Do not change or translate anything after the vertical line. -#: src/globals.c:100 +#. Double-width characters ARE handled correctly. +#: src/globals.c:102 msgid "abcdefghijklmnopqrst|output|GameMoves" msgstr "abcdefghijklmnopqrst|output|GameMoves" @@ -238,35 +240,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:111 +#: src/globals.c:113 msgid "1st" msgstr "1st" -#: src/globals.c:112 +#: src/globals.c:114 msgid "2nd" msgstr "2nd" -#: src/globals.c:113 +#: src/globals.c:115 msgid "3rd" msgstr "3rd" -#: src/globals.c:114 +#: src/globals.c:116 msgid "4th" msgstr "4th" -#: src/globals.c:115 +#: src/globals.c:117 msgid "5th" msgstr "5th" -#: src/globals.c:116 +#: src/globals.c:118 msgid "6th" msgstr "6th" -#: src/globals.c:117 +#: src/globals.c:119 msgid "7th" msgstr "7th" -#: src/globals.c:118 +#: src/globals.c:120 msgid "8th" msgstr "8th" @@ -371,7 +373,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:857 +#: src/game.c:606 src/move.c:855 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -562,29 +564,27 @@ msgstr "Are you sure? [^{Y^}/^{N^}] " msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 +#: src/move.c:673 src/move.c:681 src/move.c:1026 src/move.c:1062 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#. TRANSLATORS: %ls is the name of the player being made -#. bankrupt. -#: src/move.c:676 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:675 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#. TRANSLATORS: %ls is the name of the player that has -#. declared themselves bankrupt. -#: src/move.c:685 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:683 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:753 +#: src/move.c:751 msgid " New Company " msgstr " New Company " -#: src/move.c:754 +#: src/move.c:752 #, c-format msgid "" "A new company has been formed!\n" @@ -593,7 +593,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:813 +#: src/move.c:811 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -602,7 +602,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:819 +#: src/move.c:817 msgid " Company Merger " msgstr " Company Merger " @@ -613,14 +613,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:839 +#: src/move.c:837 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has -#. absorbed another due to a merger. -#: src/move.c:850 +#. absorbed the other due to a merger. +#: src/move.c:848 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -630,7 +630,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:864 +#: src/move.c:862 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -639,7 +639,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:869 +#: src/move.c:867 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -648,7 +648,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:876 +#: src/move.c:874 msgctxt "subtitle" msgid "New" msgstr "New" @@ -656,14 +656,13 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:882 +#: src/move.c:880 msgctxt "subtitle" msgid "Old" msgstr "Old" -#. TRANSLATORS: %ls is the name of the company -#. that has been made bankrupt. -#: src/move.c:1031 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1028 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -674,13 +673,8 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#. TRANSLATORS: %ls is the name of the -#. company that has been made -#. bankrupt. %.2f is a number between -#. 0.00 and 100.00 representing the -#. percentage of company value payed by -#. the bank to players. -#: src/move.c:1059 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1051 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -699,7 +693,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1087 +#: src/move.c:1079 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -708,16 +702,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1095 +#: src/move.c:1087 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1188 src/exch.c:319 +#: src/move.c:1180 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1190 +#: src/move.c:1182 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_CA.po b/po/en_CA.po index 854c3f0..496778f 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 09:02+1100\n" -"PO-Revision-Date: 2012-03-15 09:06+1100\n" +"POT-Creation-Date: 2012-03-16 10:10+1100\n" +"PO-Revision-Date: 2012-03-16 10:12+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian)\n" "Language: en_CA\n" @@ -219,8 +219,9 @@ msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves" #. vertical line. The first ("." in English) is used for empty #. space, the second ("+") for outposts, the third ("*") for stars, #. the remaining for the eight companies. Do not change or translate -#. anything after the vertical line. -#: src/globals.c:90 +#. anything after the vertical line. Double-width characters ARE +#. handled correctly. +#: src/globals.c:91 msgid ".+*ABCDEFGH|output|MapVals" msgstr ".+*ABCDEFGH|output|MapVals" @@ -229,7 +230,8 @@ msgstr ".+*ABCDEFGH|output|MapVals" #. before the ASCII vertical line. The first character corresponds #. to the first character in the "input|GameMoves" string, and so on. #. Do not change or translate anything after the vertical line. -#: src/globals.c:100 +#. Double-width characters ARE handled correctly. +#: src/globals.c:102 msgid "abcdefghijklmnopqrst|output|GameMoves" msgstr "abcdefghijklmnopqrst|output|GameMoves" @@ -238,35 +240,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:111 +#: src/globals.c:113 msgid "1st" msgstr "1st" -#: src/globals.c:112 +#: src/globals.c:114 msgid "2nd" msgstr "2nd" -#: src/globals.c:113 +#: src/globals.c:115 msgid "3rd" msgstr "3rd" -#: src/globals.c:114 +#: src/globals.c:116 msgid "4th" msgstr "4th" -#: src/globals.c:115 +#: src/globals.c:117 msgid "5th" msgstr "5th" -#: src/globals.c:116 +#: src/globals.c:118 msgid "6th" msgstr "6th" -#: src/globals.c:117 +#: src/globals.c:119 msgid "7th" msgstr "7th" -#: src/globals.c:118 +#: src/globals.c:120 msgid "8th" msgstr "8th" @@ -371,7 +373,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:857 +#: src/game.c:606 src/move.c:855 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -562,29 +564,27 @@ msgstr "Are you sure? [^{Y^}/^{N^}] " msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 +#: src/move.c:673 src/move.c:681 src/move.c:1026 src/move.c:1062 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#. TRANSLATORS: %ls is the name of the player being made -#. bankrupt. -#: src/move.c:676 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:675 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#. TRANSLATORS: %ls is the name of the player that has -#. declared themselves bankrupt. -#: src/move.c:685 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:683 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:753 +#: src/move.c:751 msgid " New Company " msgstr " New Company " -#: src/move.c:754 +#: src/move.c:752 #, c-format msgid "" "A new company has been formed!\n" @@ -593,7 +593,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:813 +#: src/move.c:811 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -602,7 +602,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:819 +#: src/move.c:817 msgid " Company Merger " msgstr " Company Merger " @@ -613,14 +613,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:839 +#: src/move.c:837 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has -#. absorbed another due to a merger. -#: src/move.c:850 +#. absorbed the other due to a merger. +#: src/move.c:848 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -630,7 +630,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:864 +#: src/move.c:862 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -639,7 +639,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:869 +#: src/move.c:867 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -648,7 +648,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:876 +#: src/move.c:874 msgctxt "subtitle" msgid "New" msgstr "New" @@ -656,14 +656,13 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:882 +#: src/move.c:880 msgctxt "subtitle" msgid "Old" msgstr "Old" -#. TRANSLATORS: %ls is the name of the company -#. that has been made bankrupt. -#: src/move.c:1031 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1028 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -674,13 +673,8 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#. TRANSLATORS: %ls is the name of the -#. company that has been made -#. bankrupt. %.2f is a number between -#. 0.00 and 100.00 representing the -#. percentage of company value payed by -#. the bank to players. -#: src/move.c:1059 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1051 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -699,7 +693,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1087 +#: src/move.c:1079 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -708,16 +702,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1095 +#: src/move.c:1087 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1188 src/exch.c:319 +#: src/move.c:1180 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1190 +#: src/move.c:1182 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_GB.po b/po/en_GB.po index 4bc73c7..73cbf89 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 09:02+1100\n" -"PO-Revision-Date: 2012-03-15 09:06+1100\n" +"POT-Creation-Date: 2012-03-16 10:10+1100\n" +"PO-Revision-Date: 2012-03-16 10:12+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British)\n" "Language: en_GB\n" @@ -219,8 +219,9 @@ msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves" #. vertical line. The first ("." in English) is used for empty #. space, the second ("+") for outposts, the third ("*") for stars, #. the remaining for the eight companies. Do not change or translate -#. anything after the vertical line. -#: src/globals.c:90 +#. anything after the vertical line. Double-width characters ARE +#. handled correctly. +#: src/globals.c:91 msgid ".+*ABCDEFGH|output|MapVals" msgstr ".+*ABCDEFGH|output|MapVals" @@ -229,7 +230,8 @@ msgstr ".+*ABCDEFGH|output|MapVals" #. before the ASCII vertical line. The first character corresponds #. to the first character in the "input|GameMoves" string, and so on. #. Do not change or translate anything after the vertical line. -#: src/globals.c:100 +#. Double-width characters ARE handled correctly. +#: src/globals.c:102 msgid "abcdefghijklmnopqrst|output|GameMoves" msgstr "abcdefghijklmnopqrst|output|GameMoves" @@ -238,35 +240,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:111 +#: src/globals.c:113 msgid "1st" msgstr "1st" -#: src/globals.c:112 +#: src/globals.c:114 msgid "2nd" msgstr "2nd" -#: src/globals.c:113 +#: src/globals.c:115 msgid "3rd" msgstr "3rd" -#: src/globals.c:114 +#: src/globals.c:116 msgid "4th" msgstr "4th" -#: src/globals.c:115 +#: src/globals.c:117 msgid "5th" msgstr "5th" -#: src/globals.c:116 +#: src/globals.c:118 msgid "6th" msgstr "6th" -#: src/globals.c:117 +#: src/globals.c:119 msgid "7th" msgstr "7th" -#: src/globals.c:118 +#: src/globals.c:120 msgid "8th" msgstr "8th" @@ -371,7 +373,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:857 +#: src/game.c:606 src/move.c:855 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -562,29 +564,27 @@ msgstr "Are you sure? [^{Y^}/^{N^}] " msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 +#: src/move.c:673 src/move.c:681 src/move.c:1026 src/move.c:1062 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#. TRANSLATORS: %ls is the name of the player being made -#. bankrupt. -#: src/move.c:676 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:675 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#. TRANSLATORS: %ls is the name of the player that has -#. declared themselves bankrupt. -#: src/move.c:685 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:683 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:753 +#: src/move.c:751 msgid " New Company " msgstr " New Company " -#: src/move.c:754 +#: src/move.c:752 #, c-format msgid "" "A new company has been formed!\n" @@ -593,7 +593,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:813 +#: src/move.c:811 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -602,7 +602,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:819 +#: src/move.c:817 msgid " Company Merger " msgstr " Company Merger " @@ -613,14 +613,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:839 +#: src/move.c:837 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has -#. absorbed another due to a merger. -#: src/move.c:850 +#. absorbed the other due to a merger. +#: src/move.c:848 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -630,7 +630,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:864 +#: src/move.c:862 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -639,7 +639,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:869 +#: src/move.c:867 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -648,7 +648,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:876 +#: src/move.c:874 msgctxt "subtitle" msgid "New" msgstr "New" @@ -656,14 +656,13 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:882 +#: src/move.c:880 msgctxt "subtitle" msgid "Old" msgstr "Old" -#. TRANSLATORS: %ls is the name of the company -#. that has been made bankrupt. -#: src/move.c:1031 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1028 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -674,13 +673,8 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#. TRANSLATORS: %ls is the name of the -#. company that has been made -#. bankrupt. %.2f is a number between -#. 0.00 and 100.00 representing the -#. percentage of company value payed by -#. the bank to players. -#: src/move.c:1059 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1051 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -699,7 +693,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1087 +#: src/move.c:1079 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -708,16 +702,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1095 +#: src/move.c:1087 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1188 src/exch.c:319 +#: src/move.c:1180 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1190 +#: src/move.c:1182 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/en_US.po b/po/en_US.po index 9eece72..638b7a5 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 09:02+1100\n" -"PO-Revision-Date: 2012-03-15 09:06+1100\n" +"POT-Creation-Date: 2012-03-16 10:10+1100\n" +"PO-Revision-Date: 2012-03-16 10:12+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English\n" "Language: en_US\n" @@ -219,8 +219,9 @@ msgstr "ABCDEFGHIJKLMNOPQRST|input|GameMoves" #. vertical line. The first ("." in English) is used for empty #. space, the second ("+") for outposts, the third ("*") for stars, #. the remaining for the eight companies. Do not change or translate -#. anything after the vertical line. -#: src/globals.c:90 +#. anything after the vertical line. Double-width characters ARE +#. handled correctly. +#: src/globals.c:91 msgid ".+*ABCDEFGH|output|MapVals" msgstr ".+*ABCDEFGH|output|MapVals" @@ -229,7 +230,8 @@ msgstr ".+*ABCDEFGH|output|MapVals" #. before the ASCII vertical line. The first character corresponds #. to the first character in the "input|GameMoves" string, and so on. #. Do not change or translate anything after the vertical line. -#: src/globals.c:100 +#. Double-width characters ARE handled correctly. +#: src/globals.c:102 msgid "abcdefghijklmnopqrst|output|GameMoves" msgstr "abcdefghijklmnopqrst|output|GameMoves" @@ -238,35 +240,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:111 +#: src/globals.c:113 msgid "1st" msgstr "1st" -#: src/globals.c:112 +#: src/globals.c:114 msgid "2nd" msgstr "2nd" -#: src/globals.c:113 +#: src/globals.c:115 msgid "3rd" msgstr "3rd" -#: src/globals.c:114 +#: src/globals.c:116 msgid "4th" msgstr "4th" -#: src/globals.c:115 +#: src/globals.c:117 msgid "5th" msgstr "5th" -#: src/globals.c:116 +#: src/globals.c:118 msgid "6th" msgstr "6th" -#: src/globals.c:117 +#: src/globals.c:119 msgid "7th" msgstr "7th" -#: src/globals.c:118 +#: src/globals.c:120 msgid "8th" msgstr "8th" @@ -371,7 +373,7 @@ msgstr " Game Winner " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:857 +#: src/game.c:606 src/move.c:855 msgctxt "subtitle" msgid "Player" msgstr "Player" @@ -562,29 +564,27 @@ msgstr "Are you sure? [^{Y^}/^{N^}] " msgid "Saving game %d... " msgstr "Saving game %d... " -#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 +#: src/move.c:673 src/move.c:681 src/move.c:1026 src/move.c:1062 msgid " Bankruptcy Court " msgstr " Bankruptcy Court " -#. TRANSLATORS: %ls is the name of the player being made -#. bankrupt. -#: src/move.c:676 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:675 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "%ls has been declared bankrupt by the Interstellar Trading Bank." -#. TRANSLATORS: %ls is the name of the player that has -#. declared themselves bankrupt. -#: src/move.c:685 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:683 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls has declared bankruptcy." -#: src/move.c:753 +#: src/move.c:751 msgid " New Company " msgstr " New Company " -#: src/move.c:754 +#: src/move.c:752 #, c-format msgid "" "A new company has been formed!\n" @@ -593,7 +593,7 @@ msgstr "" "A new company has been formed!\n" "Its name is ^{%ls^}." -#: src/move.c:813 +#: src/move.c:811 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" @@ -602,7 +602,7 @@ msgstr "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" -#: src/move.c:819 +#: src/move.c:817 msgid " Company Merger " msgstr " Company Merger " @@ -613,14 +613,14 @@ msgstr " Company Merger " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:839 +#: src/move.c:837 msgctxt "label" msgid "Old stock: " msgstr "Old stock: " #. TRANSLATORS: "New stock" refers to the company that has -#. absorbed another due to a merger. -#: src/move.c:850 +#. absorbed the other due to a merger. +#: src/move.c:848 msgctxt "label" msgid "New Stock: " msgstr "New Stock: " @@ -630,7 +630,7 @@ msgstr "New Stock: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:864 +#: src/move.c:862 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -639,7 +639,7 @@ msgstr "Bonus (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:869 +#: src/move.c:867 msgctxt "subtitle" msgid "Total" msgstr "Total" @@ -648,7 +648,7 @@ msgstr "Total" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:876 +#: src/move.c:874 msgctxt "subtitle" msgid "New" msgstr "New" @@ -656,14 +656,13 @@ msgstr "New" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:882 +#: src/move.c:880 msgctxt "subtitle" msgid "Old" msgstr "Old" -#. TRANSLATORS: %ls is the name of the company -#. that has been made bankrupt. -#: src/move.c:1031 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1028 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -674,13 +673,8 @@ msgstr "" "\n" "^{All assets have been taken to repay outstanding loans.^}" -#. TRANSLATORS: %ls is the name of the -#. company that has been made -#. bankrupt. %.2f is a number between -#. 0.00 and 100.00 representing the -#. percentage of company value payed by -#. the bank to players. -#: src/move.c:1059 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1051 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -699,7 +693,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1087 +#: src/move.c:1079 msgctxt "label" msgid "Amount paid per share: " msgstr "Amount paid per share: " @@ -708,16 +702,16 @@ msgstr "Amount paid per share: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1095 +#: src/move.c:1087 msgctxt "label" msgid "Old share value: " msgstr "Old share value: " -#: src/move.c:1188 src/exch.c:319 +#: src/move.c:1180 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Interstellar Trading Bank " -#: src/move.c:1190 +#: src/move.c:1182 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/po/ru.po b/po/ru.po index 666a5ab..0b688d5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: trader 7.3\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2012-03-15 09:02+1100\n" -"PO-Revision-Date: 2012-03-16 10:01+1100\n" +"POT-Creation-Date: 2012-03-16 10:10+1100\n" +"PO-Revision-Date: 2012-03-16 10:12+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: Russian\n" "Language: ru\n" @@ -224,8 +224,9 @@ msgstr "АБВГДЕЖЗИЙКЛМНОПРСТУ|input|GameMoves" #. vertical line. The first ("." in English) is used for empty #. space, the second ("+") for outposts, the third ("*") for stars, #. the remaining for the eight companies. Do not change or translate -#. anything after the vertical line. -#: src/globals.c:90 +#. anything after the vertical line. Double-width characters ARE +#. handled correctly. +#: src/globals.c:91 msgid ".+*ABCDEFGH|output|MapVals" msgstr ".+*АБВГДЕЖЗ|output|MapVals" @@ -234,7 +235,8 @@ msgstr ".+*АБВГДЕЖЗ|output|MapVals" #. before the ASCII vertical line. The first character corresponds #. to the first character in the "input|GameMoves" string, and so on. #. Do not change or translate anything after the vertical line. -#: src/globals.c:100 +#. Double-width characters ARE handled correctly. +#: src/globals.c:102 msgid "abcdefghijklmnopqrst|output|GameMoves" msgstr "абвгдежзийклмнопрсту|output|GameMoves" @@ -243,35 +245,35 @@ msgstr "абвгдежзийклмнопрсту|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:111 +#: src/globals.c:113 msgid "1st" msgstr "1ый" -#: src/globals.c:112 +#: src/globals.c:114 msgid "2nd" msgstr "2ой" -#: src/globals.c:113 +#: src/globals.c:115 msgid "3rd" msgstr "3ий" -#: src/globals.c:114 +#: src/globals.c:116 msgid "4th" msgstr "4ый" -#: src/globals.c:115 +#: src/globals.c:117 msgid "5th" msgstr "5ый" -#: src/globals.c:116 +#: src/globals.c:118 msgid "6th" msgstr "6ой" -#: src/globals.c:117 +#: src/globals.c:119 msgid "7th" msgstr "7ой" -#: src/globals.c:118 +#: src/globals.c:120 msgid "8th" msgstr "8ой" @@ -377,7 +379,7 @@ msgstr " Победитель игры " #. TRANSLATORS: "Player" is used as a column title in a #. table containing all player names. -#: src/game.c:606 src/move.c:857 +#: src/game.c:606 src/move.c:855 msgctxt "subtitle" msgid "Player" msgstr "Игрок" @@ -568,29 +570,27 @@ msgstr "Вы уверены? [^{Д^}/^{Н^}] " msgid "Saving game %d... " msgstr "Сохраняется игра №%d... " -#: src/move.c:673 src/move.c:682 src/move.c:1028 src/move.c:1070 +#: src/move.c:673 src/move.c:681 src/move.c:1026 src/move.c:1062 msgid " Bankruptcy Court " msgstr " Арбитражный суд " -#. TRANSLATORS: %ls is the name of the player being made -#. bankrupt. -#: src/move.c:676 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:675 #, c-format msgid "%ls has been declared bankrupt by the Interstellar Trading Bank." msgstr "Межзвёздный торговый банк объявляет, что игрок %ls обанкротился." -#. TRANSLATORS: %ls is the name of the player that has -#. declared themselves bankrupt. -#: src/move.c:685 +#. TRANSLATORS: %ls is the player's name. +#: src/move.c:683 #, c-format msgid "%ls has declared bankruptcy." msgstr "%ls объявляет своё банкротство." -#: src/move.c:753 +#: src/move.c:751 msgid " New Company " msgstr " Новая фирма " -#: src/move.c:754 +#: src/move.c:752 #, c-format msgid "" "A new company has been formed!\n" @@ -599,14 +599,14 @@ msgstr "" "Сформировано новое торговое предприятие!\n" "Оно называется ^{%ls^}." -#: src/move.c:813 +#: src/move.c:811 #, c-format msgid "" "^{%ls^} has just merged into ^{%ls^}.\n" "Please note the following transactions:\n" msgstr "Фирма ^{%ls^} только-что была поглощена фирмой ^{%ls^}. Обратите внимание на следующие транзакции:\n" -#: src/move.c:819 +#: src/move.c:817 msgid " Company Merger " msgstr " Слияние компаний " @@ -617,14 +617,14 @@ msgstr " Слияние компаний " #. the same length and must contain a trailing space for the #. display routines to work correctly. The maximum length of #. each label is 36 characters. -#: src/move.c:839 +#: src/move.c:837 msgctxt "label" msgid "Old stock: " msgstr "Старые акции: " #. TRANSLATORS: "New stock" refers to the company that has -#. absorbed another due to a merger. -#: src/move.c:850 +#. absorbed the other due to a merger. +#: src/move.c:848 msgctxt "label" msgid "New Stock: " msgstr "Новые акции: " @@ -634,7 +634,7 @@ msgstr "Новые акции: " #. symbol in the current locale. The maximum column width is #. 12 characters INCLUDING the currency symbol (see #. MERGE_BONUS_COLS in src/intf.h). -#: src/move.c:864 +#: src/move.c:862 #, c-format msgctxt "subtitle" msgid "Bonus (%ls)" @@ -643,7 +643,7 @@ msgstr "Бонус (%ls)" #. TRANSLATORS: "Total" refers to the total number of shares in #. the new company after a merger. The maximum column width is #. 8 characters (see MERGE_TOTAL_STOCK_COLS in src/intf.h). -#: src/move.c:869 +#: src/move.c:867 msgctxt "subtitle" msgid "Total" msgstr "Итог" @@ -652,7 +652,7 @@ msgstr "Итог" #. player receives in the surviving company after a merger. #. The maximum column width is 8 characters (see #. MERGE_NEW_STOCK_COLS in src/intf.h). -#: src/move.c:876 +#: src/move.c:874 msgctxt "subtitle" msgid "New" msgstr "Новые" @@ -660,14 +660,13 @@ msgstr "Новые" #. TRANSLATORS: "Old" refers to how many shares each player had #. in the company ceasing existence. The maximum column width #. is 8 characters (see MERGE_OLD_STOCK_COLS in src/intf.h). -#: src/move.c:882 +#: src/move.c:880 msgctxt "subtitle" msgid "Old" msgstr "Старые" -#. TRANSLATORS: %ls is the name of the company -#. that has been made bankrupt. -#: src/move.c:1031 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1028 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -678,13 +677,8 @@ msgstr "" "\n" "^{Все активы схвачены банком, чтобы погасить долги фирма.^}" -#. TRANSLATORS: %ls is the name of the -#. company that has been made -#. bankrupt. %.2f is a number between -#. 0.00 and 100.00 representing the -#. percentage of company value payed by -#. the bank to players. -#: src/move.c:1059 +#. TRANSLATORS: %ls represents the company name. +#: src/move.c:1051 #, c-format msgid "" "%ls has been declared bankrupt by the Interstellar Trading Bank.\n" @@ -704,7 +698,7 @@ msgstr "" #. least one trailing space for the display #. routines to work correctly. The maximum #. length is 28 characters. -#: src/move.c:1087 +#: src/move.c:1079 msgctxt "label" msgid "Amount paid per share: " msgstr "Выплаченная сумма за акцию: " @@ -713,16 +707,16 @@ msgstr "Выплаченная сумма за акцию: " #. share price of a company before it was forced #. into bankruptcy by the Bank. This label must be #. the same width as "Amount paid per share". -#: src/move.c:1095 +#: src/move.c:1087 msgctxt "label" msgid "Old share value: " msgstr "Старая цена акции: " -#: src/move.c:1188 src/exch.c:319 +#: src/move.c:1180 src/exch.c:319 msgid " Interstellar Trading Bank " msgstr " Межзвёздный торговый банк " -#: src/move.c:1190 +#: src/move.c:1182 #, c-format msgid "" "Your debt has amounted to %N!\n" diff --git a/src/globals.c b/src/globals.c index 2cdc4db..be8db46 100644 --- a/src/globals.c +++ b/src/globals.c @@ -86,7 +86,8 @@ const char *default_printable_map_val = vertical line. The first ("." in English) is used for empty space, the second ("+") for outposts, the third ("*") for stars, the remaining for the eight companies. Do not change or translate - anything after the vertical line. */ + anything after the vertical line. Double-width characters ARE + handled correctly. */ N_(".+*ABCDEFGH|output|MapVals"); @@ -96,7 +97,8 @@ const char *default_printable_game_move = (choices). There must be exactly 20 characters (NUMBER_MOVES) before the ASCII vertical line. The first character corresponds to the first character in the "input|GameMoves" string, and so on. - Do not change or translate anything after the vertical line. */ + Do not change or translate anything after the vertical line. + Double-width characters ARE handled correctly. */ N_("abcdefghijklmnopqrst|output|GameMoves"); diff --git a/src/move.c b/src/move.c index 8e98d16..aec3410 100644 --- a/src/move.c +++ b/src/move.c @@ -671,8 +671,7 @@ void bankrupt_player (bool forced) txdlgbox(MAX_DLG_LINES, 50, 7, WCENTER, attr_error_window, attr_error_title, attr_error_highlight, 0, 0, attr_error_waitforkey, _(" Bankruptcy Court "), - /* TRANSLATORS: %ls is the name of the player being made - bankrupt. */ + /* TRANSLATORS: %ls is the player's name. */ _("%ls has been declared bankrupt " "by the Interstellar Trading Bank."), player[current_player].name); @@ -680,8 +679,7 @@ void bankrupt_player (bool forced) txdlgbox(MAX_DLG_LINES, 50, 7, WCENTER, attr_error_window, attr_error_title, attr_error_highlight, 0, 0, attr_error_waitforkey, _(" Bankruptcy Court "), - /* TRANSLATORS: %ls is the name of the player that has - declared themselves bankrupt. */ + /* TRANSLATORS: %ls is the player's name. */ _("%ls has declared bankruptcy."), player[current_player].name); } @@ -846,7 +844,7 @@ void merge_companies (map_val_t a, map_val_t b) right(curwin, lines + 4, x, attr_normal, 0, 0, 1, /* TRANSLATORS: "New stock" refers to the company that has - absorbed another due to a merger. */ + absorbed the other due to a merger. */ pgettext("label", "New Stock: ")); leftch(curwin, lines + 4, x, chbuf_aa, 1, &width_aa); @@ -1026,8 +1024,7 @@ void adjust_values (void) attr_error_title, attr_error_highlight, attr_error_normal, 0, attr_error_waitforkey, _(" Bankruptcy Court "), - /* TRANSLATORS: %ls is the name of the company - that has been made bankrupt. */ + /* TRANSLATORS: %ls represents the company name. */ _("%ls has been declared bankrupt " "by the Interstellar Trading Bank.\n\n" "^{All assets have been taken " @@ -1050,12 +1047,7 @@ void adjust_values (void) lines = mkchstr(chbuf, BUFSIZE, attr_error_highlight, attr_error_normal, 0, 6, 60 - 4, widthbuf, 6, - /* TRANSLATORS: %ls is the name of the - company that has been made - bankrupt. %.2f is a number between - 0.00 and 100.00 representing the - percentage of company value payed by - the bank to players. */ + /* TRANSLATORS: %ls represents the company name. */ _("%ls has been declared bankrupt by the " "Interstellar Trading Bank.\n\n" "^{The Bank has agreed to pay stock holders ^}" From 32864b0bdffbc2a8149adea9a297fed8dd2ef970 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 16 Mar 2012 10:49:25 +1100 Subject: [PATCH 16/16] Add information about version 7.3 of Star Traders; update all dates --- NEWS | 7 +++++-- doc/trader.6 | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 97f477f..2b78854 100644 --- a/NEWS +++ b/NEWS @@ -15,10 +15,13 @@ consult the Subversion repository for "trader" on The ZAP Group web server at http://www.zap.org.au/services/svn/. -Version 7.3 (not yet released) +Version 7.3 (16th March, 2012) ------------------------------ -@@@ Minor bug fixes. Russian translation. +Star Traders has been translated into Russian. In addition, a number of +bugs with internationalisation have been fixed. The "default value" key +(originally "=" or ";" as the first key-press in any input field) has been +incorporated into the language translation files. Version 7.2 (29th August, 2011) diff --git a/doc/trader.6 b/doc/trader.6 index bd2500c..43926ee 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "15th March, 2012" "Unix-like systems" +.TH TRADER 6 "16th March, 2012" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" *********************************************************************