1
0
mirror of https://git.zap.org.au/git/trader.git synced 2024-09-01 17:14:15 -04:00

Merge branch master into with-autogenerated

This commit is contained in:
John Zaitseff 2012-03-16 11:01:48 +11:00
commit 3ad010c4f4
45 changed files with 2198 additions and 500 deletions

View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************

10
INSTALL
View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************
@ -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):

View File

@ -1,7 +1,7 @@
#########################################################################
# #
# Star Traders: A Game of Interstellar Trading #
# Copyright (C) 1990-2011, John Zaitseff #
# Copyright (C) 1990-2012, John Zaitseff #
# #
#########################################################################

11
NEWS
View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************
@ -15,6 +15,15 @@ consult the Subversion repository for "trader" on The ZAP Group web server
at http://www.zap.org.au/services/svn/.
Version 7.3 (16th March, 2012)
------------------------------
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)
-------------------------------

4
README
View File

@ -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

View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************

View File

@ -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
@ -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])

View File

@ -1,7 +1,7 @@
#########################################################################
# #
# Star Traders: A Game of Interstellar Trading #
# Copyright (C) 1990-2011, John Zaitseff #
# Copyright (C) 1990-2012, John Zaitseff #
# #
#########################################################################

View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************

View File

@ -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 "16th 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

View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************

View File

@ -1,7 +1,7 @@
#########################################################################
# #
# Star Traders: A Game of Interstellar Trading #
# Copyright (C) 1990-2011, John Zaitseff #
# Copyright (C) 1990-2012, John Zaitseff #
# #
#########################################################################

View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************

View File

@ -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 <ncursesw/curses.h>
# #elif defined(HAVE_NCURSESW_H)
# #elif defined HAVE_NCURSESW_H
# # include <ncursesw.h>
# #elif defined(HAVE_NCURSES_CURSES_H)
# #elif defined HAVE_NCURSES_CURSES_H
# # include <ncurses/curses.h>
# #elif defined(HAVE_NCURSES_H)
# #elif defined HAVE_NCURSES_H
# # include <ncurses.h>
# #elif defined(HAVE_CURSES_H)
# #elif defined HAVE_CURSES_H
# # include <curses.h>
# #else
# # error "SysV or X/Open-compatible Curses header file required"
@ -153,7 +153,7 @@
#
# Copyright (c) 2009 Mark Pulford <mark@kyne.com.au>
# Copyright (c) 2009 Damian Pietras <daper@daper.net>
# Copyright (c) 2011 Reuben Thomas <rrt@sc3d.org>
# Copyright (c) 2012 Reuben Thomas <rrt@sc3d.org>
# Copyright (c) 2011 John Zaitseff <J.Zaitseff@zap.org.au>
#
# 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"

View File

@ -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 <http://www.gnu.org/licenses/>.
#
# 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.

View File

@ -1,7 +1,7 @@
#########################################################################
# #
# Star Traders: A Game of Interstellar Trading #
# Copyright (C) 1990-2011, John Zaitseff #
# Copyright (C) 1990-2012, John Zaitseff #
# #
#########################################################################
@ -31,3 +31,4 @@ en_AU
en_CA
en_GB
en_US
ru

View File

@ -1,7 +1,7 @@
#########################################################################
# #
# Star Traders: A Game of Interstellar Trading #
# Copyright (C) 1990-2011, John Zaitseff #
# Copyright (C) 1990-2012, John Zaitseff #
# #
#########################################################################

View File

@ -1,7 +1,7 @@
#########################################################################
# #
# Star Traders: A Game of Interstellar Trading #
# Copyright (C) 1990-2011, John Zaitseff #
# Copyright (C) 1990-2012, John Zaitseff #
# #
#########################################################################

View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************

View File

@ -1,21 +1,21 @@
# *************************************************************************
# * *
# * 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 <J.Zaitseff@zap.org.au>, 2011.
# John Zaitseff <J.Zaitseff@zap.org.au>, 2011-12.
#
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 10:48+1000\n"
"PO-Revision-Date: 2011-08-28 17:03+1000\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 <J.Zaitseff@zap.org.au>\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"
@ -302,7 +304,7 @@ msgctxt "input|ContinueGame"
msgid "Cc"
msgstr "Cc"
#: src/game.c:341 src/move.c:380
#: src/game.c:341 src/move.c:386
msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
msgstr "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
@ -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:847
#: src/game.c:606 src/move.c:855
msgctxt "subtitle"
msgid "Player"
msgstr "Player"
@ -497,38 +499,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 "^{<CTRL><C>^} Quit the game"
msgstr "^{<CTRL><C>^} Quit the game"
#: src/move.c:245
#: src/move.c:249
#, c-format
msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
@ -536,51 +538,53 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
#. 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:282
#, c-format
msgid "Move ^{%lc^}"
msgstr "Move ^{%lc^}"
#: src/move.c:297
#: src/move.c:303
msgid "^{<2>^} (Declare bankruptcy)"
msgstr "^{<2>^} (Declare bankruptcy)"
#: src/move.c:306
#: src/move.c:312
msgid "^{<3>^} (Save and end the game)"
msgstr "^{<3>^} (Save and end the game)"
#: src/move.c:327
#: src/move.c:333
msgid "^{<CTRL><C>^} (Quit the game)"
msgstr "^{<CTRL><C>^} (Quit the game)"
#: src/move.c:342
#: src/move.c:348
msgid "Are you sure? [^{Y^}/^{N^}] "
msgstr "Are you sure? [^{Y^}/^{N^}] "
#: src/move.c:359 src/move.c:437
#: src/move.c:365 src/move.c:443
#, 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:673 src/move.c:681 src/move.c:1026 src/move.c:1062
msgid " Bankruptcy Court "
msgstr " Bankruptcy Court "
#: src/move.c:668
#. 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."
#: src/move.c:675
#. 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:743
#: src/move.c:751
msgid " New Company "
msgstr " New Company "
#: src/move.c:744
#: src/move.c:752
#, 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:803
#: src/move.c:811
#, 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:809
#: src/move.c:817
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:829
#: 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:840
#. absorbed the other due to a merger.
#: src/move.c:848
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:854
#: src/move.c:862
#, 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:859
#: src/move.c:867
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:866
#: src/move.c:874
msgctxt "subtitle"
msgid "New"
msgstr "New"
@ -652,12 +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:872
#: src/move.c:880
msgctxt "subtitle"
msgid "Old"
msgstr "Old"
#: src/move.c:1019
#. TRANSLATORS: %ls represents the company name.
#: src/move.c:1028
#, c-format
msgid ""
"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@ -668,7 +673,8 @@ msgstr ""
"\n"
"^{All assets have been taken to repay outstanding loans.^}"
#: src/move.c:1041
#. TRANSLATORS: %ls represents the company name.
#: src/move.c:1051
#, c-format
msgid ""
"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@ -687,7 +693,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:1079
msgctxt "label"
msgid "Amount paid per share: "
msgstr "Amount paid per share: "
@ -696,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:1077
#: src/move.c:1087
msgctxt "label"
msgid "Old share value: "
msgstr "Old share value: "
#: src/move.c:1170 src/exch.c:320
#: src/move.c:1180 src/exch.c:319
msgid " Interstellar Trading Bank "
msgstr " Interstellar Trading Bank "
#: src/move.c:1172
#: src/move.c:1182
#, c-format
msgid ""
"Your debt has amounted to %N!\n"
@ -746,19 +752,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 +777,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 +786,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 +848,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 +881,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 +938,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 +982,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"
@ -1409,7 +1415,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 <ANY> key?" :-)
#: src/help.c:473 src/intf.c:3024
#: src/help.c:473 src/intf.c:3035
msgid "[ Press <SPACE> to continue ] "
msgstr "[ Press <SPACE> to continue ] "
@ -1442,16 +1448,26 @@ 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
#. 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 +1476,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:2952
msgctxt "input|Yes"
msgid "Yy"
msgstr "Yy"
#: src/intf.c:2943
#: src/intf.c:2954
msgctxt "input|No"
msgid "Nn"
msgstr "Nn"
@ -1473,12 +1489,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:3005
msgctxt "answer"
msgid "Yes"
msgstr "Yes"
#: src/intf.c:2996
#: src/intf.c:3007
msgctxt "answer"
msgid "No"
msgstr "No"

View File

@ -1,21 +1,21 @@
# *************************************************************************
# * *
# * 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 <J.Zaitseff@zap.org.au>, 2011.
# John Zaitseff <J.Zaitseff@zap.org.au>, 2011-12.
#
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 10:48+1000\n"
"PO-Revision-Date: 2011-08-28 17:01+1000\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 <J.Zaitseff@zap.org.au>\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"
@ -302,7 +304,7 @@ msgctxt "input|ContinueGame"
msgid "Cc"
msgstr "Cc"
#: src/game.c:341 src/move.c:380
#: src/game.c:341 src/move.c:386
msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
msgstr "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
@ -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:847
#: src/game.c:606 src/move.c:855
msgctxt "subtitle"
msgid "Player"
msgstr "Player"
@ -497,38 +499,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 "^{<CTRL><C>^} Quit the game"
msgstr "^{<CTRL><C>^} Quit the game"
#: src/move.c:245
#: src/move.c:249
#, c-format
msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
@ -536,51 +538,53 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
#. 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:282
#, c-format
msgid "Move ^{%lc^}"
msgstr "Move ^{%lc^}"
#: src/move.c:297
#: src/move.c:303
msgid "^{<2>^} (Declare bankruptcy)"
msgstr "^{<2>^} (Declare bankruptcy)"
#: src/move.c:306
#: src/move.c:312
msgid "^{<3>^} (Save and end the game)"
msgstr "^{<3>^} (Save and end the game)"
#: src/move.c:327
#: src/move.c:333
msgid "^{<CTRL><C>^} (Quit the game)"
msgstr "^{<CTRL><C>^} (Quit the game)"
#: src/move.c:342
#: src/move.c:348
msgid "Are you sure? [^{Y^}/^{N^}] "
msgstr "Are you sure? [^{Y^}/^{N^}] "
#: src/move.c:359 src/move.c:437
#: src/move.c:365 src/move.c:443
#, 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:673 src/move.c:681 src/move.c:1026 src/move.c:1062
msgid " Bankruptcy Court "
msgstr " Bankruptcy Court "
#: src/move.c:668
#. 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."
#: src/move.c:675
#. 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:743
#: src/move.c:751
msgid " New Company "
msgstr " New Company "
#: src/move.c:744
#: src/move.c:752
#, 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:803
#: src/move.c:811
#, 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:809
#: src/move.c:817
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:829
#: 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:840
#. absorbed the other due to a merger.
#: src/move.c:848
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:854
#: src/move.c:862
#, 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:859
#: src/move.c:867
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:866
#: src/move.c:874
msgctxt "subtitle"
msgid "New"
msgstr "New"
@ -652,12 +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:872
#: src/move.c:880
msgctxt "subtitle"
msgid "Old"
msgstr "Old"
#: src/move.c:1019
#. TRANSLATORS: %ls represents the company name.
#: src/move.c:1028
#, c-format
msgid ""
"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@ -668,7 +673,8 @@ msgstr ""
"\n"
"^{All assets have been taken to repay outstanding loans.^}"
#: src/move.c:1041
#. TRANSLATORS: %ls represents the company name.
#: src/move.c:1051
#, c-format
msgid ""
"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@ -687,7 +693,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:1079
msgctxt "label"
msgid "Amount paid per share: "
msgstr "Amount paid per share: "
@ -696,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:1077
#: src/move.c:1087
msgctxt "label"
msgid "Old share value: "
msgstr "Old share value: "
#: src/move.c:1170 src/exch.c:320
#: src/move.c:1180 src/exch.c:319
msgid " Interstellar Trading Bank "
msgstr " Interstellar Trading Bank "
#: src/move.c:1172
#: src/move.c:1182
#, c-format
msgid ""
"Your debt has amounted to %N!\n"
@ -746,19 +752,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 +777,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 +786,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 +848,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 +881,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 +938,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 +982,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"
@ -1409,7 +1415,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 <ANY> key?" :-)
#: src/help.c:473 src/intf.c:3024
#: src/help.c:473 src/intf.c:3035
msgid "[ Press <SPACE> to continue ] "
msgstr "[ Press <SPACE> to continue ] "
@ -1442,16 +1448,26 @@ 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
#. 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 +1476,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:2952
msgctxt "input|Yes"
msgid "Yy"
msgstr "Yy"
#: src/intf.c:2943
#: src/intf.c:2954
msgctxt "input|No"
msgid "Nn"
msgstr "Nn"
@ -1473,12 +1489,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:3005
msgctxt "answer"
msgid "Yes"
msgstr "Yes"
#: src/intf.c:2996
#: src/intf.c:3007
msgctxt "answer"
msgid "No"
msgstr "No"

View File

@ -1,21 +1,21 @@
# *************************************************************************
# * *
# * 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 <J.Zaitseff@zap.org.au>, 2011.
# John Zaitseff <J.Zaitseff@zap.org.au>, 2011-12.
#
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 10:48+1000\n"
"PO-Revision-Date: 2011-08-28 17:03+1000\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 <J.Zaitseff@zap.org.au>\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"
@ -302,7 +304,7 @@ msgctxt "input|ContinueGame"
msgid "Cc"
msgstr "Cc"
#: src/game.c:341 src/move.c:380
#: src/game.c:341 src/move.c:386
msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
msgstr "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
@ -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:847
#: src/game.c:606 src/move.c:855
msgctxt "subtitle"
msgid "Player"
msgstr "Player"
@ -497,38 +499,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 "^{<CTRL><C>^} Quit the game"
msgstr "^{<CTRL><C>^} Quit the game"
#: src/move.c:245
#: src/move.c:249
#, c-format
msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
@ -536,51 +538,53 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
#. 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:282
#, c-format
msgid "Move ^{%lc^}"
msgstr "Move ^{%lc^}"
#: src/move.c:297
#: src/move.c:303
msgid "^{<2>^} (Declare bankruptcy)"
msgstr "^{<2>^} (Declare bankruptcy)"
#: src/move.c:306
#: src/move.c:312
msgid "^{<3>^} (Save and end the game)"
msgstr "^{<3>^} (Save and end the game)"
#: src/move.c:327
#: src/move.c:333
msgid "^{<CTRL><C>^} (Quit the game)"
msgstr "^{<CTRL><C>^} (Quit the game)"
#: src/move.c:342
#: src/move.c:348
msgid "Are you sure? [^{Y^}/^{N^}] "
msgstr "Are you sure? [^{Y^}/^{N^}] "
#: src/move.c:359 src/move.c:437
#: src/move.c:365 src/move.c:443
#, 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:673 src/move.c:681 src/move.c:1026 src/move.c:1062
msgid " Bankruptcy Court "
msgstr " Bankruptcy Court "
#: src/move.c:668
#. 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."
#: src/move.c:675
#. 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:743
#: src/move.c:751
msgid " New Company "
msgstr " New Company "
#: src/move.c:744
#: src/move.c:752
#, 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:803
#: src/move.c:811
#, 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:809
#: src/move.c:817
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:829
#: 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:840
#. absorbed the other due to a merger.
#: src/move.c:848
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:854
#: src/move.c:862
#, 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:859
#: src/move.c:867
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:866
#: src/move.c:874
msgctxt "subtitle"
msgid "New"
msgstr "New"
@ -652,12 +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:872
#: src/move.c:880
msgctxt "subtitle"
msgid "Old"
msgstr "Old"
#: src/move.c:1019
#. TRANSLATORS: %ls represents the company name.
#: src/move.c:1028
#, c-format
msgid ""
"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@ -668,7 +673,8 @@ msgstr ""
"\n"
"^{All assets have been taken to repay outstanding loans.^}"
#: src/move.c:1041
#. TRANSLATORS: %ls represents the company name.
#: src/move.c:1051
#, c-format
msgid ""
"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@ -687,7 +693,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:1079
msgctxt "label"
msgid "Amount paid per share: "
msgstr "Amount paid per share: "
@ -696,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:1077
#: src/move.c:1087
msgctxt "label"
msgid "Old share value: "
msgstr "Old share value: "
#: src/move.c:1170 src/exch.c:320
#: src/move.c:1180 src/exch.c:319
msgid " Interstellar Trading Bank "
msgstr " Interstellar Trading Bank "
#: src/move.c:1172
#: src/move.c:1182
#, c-format
msgid ""
"Your debt has amounted to %N!\n"
@ -746,19 +752,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 +777,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 +786,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 +848,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 +881,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 +938,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 +982,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"
@ -1409,7 +1415,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 <ANY> key?" :-)
#: src/help.c:473 src/intf.c:3024
#: src/help.c:473 src/intf.c:3035
msgid "[ Press <SPACE> to continue ] "
msgstr "[ Press <SPACE> to continue ] "
@ -1442,16 +1448,26 @@ 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
#. 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 +1476,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:2952
msgctxt "input|Yes"
msgid "Yy"
msgstr "Yy"
#: src/intf.c:2943
#: src/intf.c:2954
msgctxt "input|No"
msgid "Nn"
msgstr "Nn"
@ -1473,12 +1489,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:3005
msgctxt "answer"
msgid "Yes"
msgstr "Yes"
#: src/intf.c:2996
#: src/intf.c:3007
msgctxt "answer"
msgid "No"
msgstr "No"

View File

@ -1,21 +1,21 @@
# *************************************************************************
# * *
# * 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 <J.Zaitseff@zap.org.au>, 2011.
# John Zaitseff <J.Zaitseff@zap.org.au>, 2011-12.
#
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 10:48+1000\n"
"PO-Revision-Date: 2011-08-28 16:50+1000\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 <J.Zaitseff@zap.org.au>\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"
@ -302,7 +304,7 @@ msgctxt "input|ContinueGame"
msgid "Cc"
msgstr "Cc"
#: src/game.c:341 src/move.c:380
#: src/game.c:341 src/move.c:386
msgid "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
msgstr "Enter game number [^{1^}-^{9^}] or ^{<CTRL><C>^} to cancel: "
@ -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:847
#: src/game.c:606 src/move.c:855
msgctxt "subtitle"
msgid "Player"
msgstr "Player"
@ -497,38 +499,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 "^{<CTRL><C>^} Quit the game"
msgstr "^{<CTRL><C>^} Quit the game"
#: src/move.c:245
#: src/move.c:249
#, c-format
msgid "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
@ -536,51 +538,53 @@ msgstr "Select move [^[%lc^]-^[%lc^]/^{1^}-^{3^}/^{<CTRL><C>^}]: "
#. 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:282
#, c-format
msgid "Move ^{%lc^}"
msgstr "Move ^{%lc^}"
#: src/move.c:297
#: src/move.c:303
msgid "^{<2>^} (Declare bankruptcy)"
msgstr "^{<2>^} (Declare bankruptcy)"
#: src/move.c:306
#: src/move.c:312
msgid "^{<3>^} (Save and end the game)"
msgstr "^{<3>^} (Save and end the game)"
#: src/move.c:327
#: src/move.c:333
msgid "^{<CTRL><C>^} (Quit the game)"
msgstr "^{<CTRL><C>^} (Quit the game)"
#: src/move.c:342
#: src/move.c:348
msgid "Are you sure? [^{Y^}/^{N^}] "
msgstr "Are you sure? [^{Y^}/^{N^}] "
#: src/move.c:359 src/move.c:437
#: src/move.c:365 src/move.c:443
#, 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:673 src/move.c:681 src/move.c:1026 src/move.c:1062
msgid " Bankruptcy Court "
msgstr " Bankruptcy Court "
#: src/move.c:668
#. 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."
#: src/move.c:675
#. 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:743
#: src/move.c:751
msgid " New Company "
msgstr " New Company "
#: src/move.c:744
#: src/move.c:752
#, 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:803
#: src/move.c:811
#, 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:809
#: src/move.c:817
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:829
#: 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:840
#. absorbed the other due to a merger.
#: src/move.c:848
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:854
#: src/move.c:862
#, 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:859
#: src/move.c:867
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:866
#: src/move.c:874
msgctxt "subtitle"
msgid "New"
msgstr "New"
@ -652,12 +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:872
#: src/move.c:880
msgctxt "subtitle"
msgid "Old"
msgstr "Old"
#: src/move.c:1019
#. TRANSLATORS: %ls represents the company name.
#: src/move.c:1028
#, c-format
msgid ""
"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@ -668,7 +673,8 @@ msgstr ""
"\n"
"^{All assets have been taken to repay outstanding loans.^}"
#: src/move.c:1041
#. TRANSLATORS: %ls represents the company name.
#: src/move.c:1051
#, c-format
msgid ""
"%ls has been declared bankrupt by the Interstellar Trading Bank.\n"
@ -687,7 +693,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:1079
msgctxt "label"
msgid "Amount paid per share: "
msgstr "Amount paid per share: "
@ -696,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:1077
#: src/move.c:1087
msgctxt "label"
msgid "Old share value: "
msgstr "Old share value: "
#: src/move.c:1170 src/exch.c:320
#: src/move.c:1180 src/exch.c:319
msgid " Interstellar Trading Bank "
msgstr " Interstellar Trading Bank "
#: src/move.c:1172
#: src/move.c:1182
#, c-format
msgid ""
"Your debt has amounted to %N!\n"
@ -746,19 +752,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 +777,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 +786,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 +848,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 +881,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 +938,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 +982,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"
@ -1409,7 +1415,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 <ANY> key?" :-)
#: src/help.c:473 src/intf.c:3024
#: src/help.c:473 src/intf.c:3035
msgid "[ Press <SPACE> to continue ] "
msgstr "[ Press <SPACE> to continue ] "
@ -1442,16 +1448,26 @@ 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
#. 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 +1476,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:2952
msgctxt "input|Yes"
msgid "Yy"
msgstr "Yy"
#: src/intf.c:2943
#: src/intf.c:2954
msgctxt "input|No"
msgid "Nn"
msgstr "Nn"
@ -1473,12 +1489,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:3005
msgctxt "answer"
msgid "Yes"
msgstr "Yes"
#: src/intf.c:2996
#: src/intf.c:3007
msgctxt "answer"
msgid "No"
msgstr "No"

1594
po/ru.po Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#########################################################################
# #
# Star Traders: A Game of Interstellar Trading #
# Copyright (C) 1990-2011, John Zaitseff #
# Copyright (C) 1990-2012, John Zaitseff #
# #
#########################################################################

View File

@ -1,7 +1,7 @@
**************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
**************************************************************************

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/
@ -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);

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/
@ -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;

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/
@ -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");

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/
@ -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:
@ -1992,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;
@ -2009,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);
@ -2054,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);
@ -2704,6 +2714,7 @@ int gettxline (WINDOW *win, wchar_t *restrict buf, int bufsize,
}
free(chbuf);
free(keycode_defval);
return ret;
}

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/
@ -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
@ -365,7 +361,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)

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/
@ -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);
@ -243,7 +247,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^}/^{<CTRL><C>^}]: "),
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 +279,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;
}
@ -665,6 +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 player's name. */
_("%ls has been declared bankrupt "
"by the Interstellar Trading Bank."),
player[current_player].name);
@ -672,6 +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 player's name. */
_("%ls has declared bankruptcy."),
player[current_player].name);
}
@ -836,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);
@ -1016,6 +1024,7 @@ void adjust_values (void)
attr_error_title, attr_error_highlight,
attr_error_normal, 0, attr_error_waitforkey,
_(" Bankruptcy Court "),
/* TRANSLATORS: %ls represents the company name. */
_("%ls has been declared bankrupt "
"by the Interstellar Trading Bank.\n\n"
"^{All assets have been taken "
@ -1038,6 +1047,7 @@ void adjust_values (void)
lines = mkchstr(chbuf, BUFSIZE, attr_error_highlight,
attr_error_normal, 0, 6, 60 - 4, widthbuf, 6,
/* 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 ^}"

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -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);
}

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/
@ -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);
}
}

View File

@ -1,7 +1,7 @@
/************************************************************************
* *
* Star Traders: A Game of Interstellar Trading *
* Copyright (C) 1990-2011, John Zaitseff *
* Copyright (C) 1990-2012, John Zaitseff *
* *
************************************************************************/