diff --git a/.gitattributes b/.gitattributes index 3827ab4..1737e98 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,9 @@ Makefile.am ident /configure.ac ident /build-aux/bootstrap ident +/build-aux/msgfmt-appdata ident /build-aux/msgfmt-desktop ident +/data/trader.appdata.xml.in ident /data/trader.desktop.in ident /data/trader.svg ident /doc/trader.* ident diff --git a/INSTALL b/INSTALL index 9c10bf3..0ae6151 100644 --- a/INSTALL +++ b/INSTALL @@ -54,7 +54,7 @@ and installation: 5. The GNU ``libiconv`` library for supporting multiple character encodings, if required by the GNU Gettext library. This is not needed on systems with the GNU C Library (``glibc``) version 2.2 or - later, or on Mac OS X (now called macOS) 10.3 or newer. + later, or on macOS 10.3 or newer. 6. Development libraries and header files for all of the above. On many systems, these files are part of ``XXX-dev`` or ``XXX-devel`` @@ -143,11 +143,11 @@ This feature requires GNU Make and allows you to keep the source code tree from being modified by the compilation process. To use this option, create a separate `build` directory, then run ``configure``. For example, if you placed the Star Traders source code tree in -`$HOME/src/trader-7.15`, you could run something like:: +`$HOME/src/trader-7.16`, you could run something like:: - mkdir $HOME/build/trader-build-7.15 - cd $HOME/build/trader-build-7.15 - $HOME/src/trader-7.15/configure + mkdir $HOME/build/trader-build-7.16 + cd $HOME/build/trader-build-7.16 + $HOME/src/trader-7.16/configure Once again, the `Autoconf manual`__ describes these options (and many others). @@ -219,6 +219,7 @@ Ubuntu 20.10 x86_64 2.32 Clang (LLVM) 11.0.0 Ubuntu 20.10 x86_64 2.32 NVIDIA HPC SDK 20.11 Ubuntu 20.04 LTS x86_64 2.31 GNU C Compiler 9.3.0 Ubuntu 20.04 LTS x86_64 2.31 Clang (LLVM) 10.0.0 +Ubuntu 18.04 LTS x86_64 2.27 GNU C Compiler 7.5.0 Fedora 33 x86_64 2.32 GNU C Compiler 10.2.1 CentOS 8.3 x86_64 2.28 GNU C Compiler 8.3.1 CentOS 8.3 x86_64 2.28 Intel C/C++ 19.1.2.254 @@ -241,8 +242,6 @@ Cygwin 3.1.7 (Win10) x86_64 GNU C Compiler 10.2.0 Cygwin 3.1.7 (Win7 SP1) i686 GNU C Compiler 10.2.0 ======================= ====== ============================ ============ -Notes: - .. [#freebsd1] FreeBSD with the ``gettext``, ``gettext-runtime``, ``gettext-tools`` and ``libiconv`` binary packages installed with ``pkg``\(1), using:: @@ -251,11 +250,20 @@ Notes: --with-libintl-prefix=/usr/local .. [#netbsd1] NetBSD with the ``gettext``, ``libiconv`` and ``ncursesw`` - packages installed with ``pkgin``\(1) (or ``pkg_add``\(1) in older - versions of NetBSD), using:: + packages installed with ``pkgin``\(1), using:: ./configure LDFLAGS=-L/usr/pkg/lib + Note that current versions of NetBSD have a known bug in their + :code:`strfmon()` function: if the locale is not ``C`` or ``C.UTF-8``, + amounts may be displayed incorrectly. For example, under the + ``en_US.UTF-8`` locale, an amount of $6000 is displayed as + ``$6,000.0,000.00`` instead of ``$6,000.00``. + + If the current locale is ``C``, game loads and saves may fail with the + error message ``trader: iconv_open: Invalid argument``. The + ``C.UTF-8`` locale works correctly. + .. [#macos1] macOS with Xcode command line tools, with the ``gettext`` package installed with Homebrew, using:: @@ -286,8 +294,6 @@ OpenBSD 6.8 x86_64 GNU C Compiler 4.2.1 [#openbsd1]_ OpenBSD 6.8 x86_64 Clang (LLVM) 10.0.1 [#openbsd1]_ ================ ====== ==================== ============ -Notes: - .. [#openbsd1] The OpenBSD C library does not include :code:`` nor its associated functions, particularly :code:`strfmon()`. @@ -309,12 +315,13 @@ so: 1. `Autoconf`__ v2.69 or later 2. `Automake`__ v1.15 or later -3. `pkg-config`__ v0.9.0 or later +3. `pkgconf`__ v0.9.0 or later, or `pkg-config`__ v0.29 or later 4. `GNU Portability Library`__ __ https://www.gnu.org/software/autoconf/ __ https://www.gnu.org/software/automake/ -__ https://pkg-config.freedesktop.org/ +__ https://git.sr.ht/~kaniini/pkgconf +__ https://www.freedesktop.org/wiki/Software/pkg-config/ __ https://www.gnu.org/software/gnulib/ The GNU Portability Library may be installed by retrieving the latest diff --git a/Makefile.am b/Makefile.am index 39412eb..c1198b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,7 @@ SUBDIRS = lib src po data doc m4 # Additional files to distribute EXTRA_DIST = \ build-aux/bootstrap \ + build-aux/msgfmt-appdata \ build-aux/msgfmt-desktop \ lib/obsolete-strings.c \ lib/xopen-source.h diff --git a/Makefile.in b/Makefile.in index e8575b4..e218406 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,7 +22,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: 39412eb799013e2451558a4bb4397dfe7dea66c1 $ +# $Id: c1198b53c770b75257ca7caae1923699f510070d $ # # This file, Makefile.am, contains the top-level Makefile for Star # Traders. It needs to be processed by automake to produce the @@ -1178,6 +1178,7 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appdatadir = @appdatadir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -1233,6 +1234,7 @@ SUBDIRS = lib src po data doc m4 # Additional files to distribute EXTRA_DIST = \ build-aux/bootstrap \ + build-aux/msgfmt-appdata \ build-aux/msgfmt-desktop \ lib/obsolete-strings.c \ lib/xopen-source.h diff --git a/NEWS b/NEWS index a3b26f5..2fb5857 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,20 @@ __ https://www.zap.org.au/ .. contents:: +Version 7.16 (19th January, 2021) +--------------------------------- + +Added code to allow the ``TEXTDOMAINDIR`` environment variable to specify +where compiled translations are located. Updated the documentation to +mention this new feature. + +Added an application metadata file that conforms to the AppStream 0.12 +specification. Updated all translations to suit, using parts of existing +strings. + +Updated the German translation, with thanks to Mario Blättermann. + + Version 7.15 (12th January, 2021) --------------------------------- diff --git a/aclocal.m4 b/aclocal.m4 index c005385..cc0f941 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -507,7 +507,7 @@ AC_DEFUN([AM_NLS], ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 12 (pkg-config-0.29.2) +# serial 11 (pkg-config-0.29.1) dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson @@ -549,7 +549,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.2]) +[m4_define([PKG_MACROS_VERSION], [0.29.1]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -650,7 +650,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $2]) +AC_MSG_CHECKING([for $1]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -660,11 +660,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -681,7 +681,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -782,6 +782,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES + # po.m4 serial 31 (gettext-0.20.2) dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation diff --git a/build-aux/msgfmt-appdata b/build-aux/msgfmt-appdata new file mode 100755 index 0000000..a6acade --- /dev/null +++ b/build-aux/msgfmt-appdata @@ -0,0 +1,23 @@ +#!/bin/sh + +# Create or update AppData files using msgfmt(1) +# $Id$ + +# Usage: +# msgfmt-appdata -d PODIR INPUT OUTPUT + +set -e + +if [ x"$1" != x"-d" ]; then + echo "$0: Missing parameters" 1>&2 + exit 1 +fi + +PODIR="$2" +INPUT="$3" +OUTPUT="$4" + +if ! msgfmt --xml -d "$PODIR" --template "$INPUT" -o "$OUTPUT"; then + echo "$0: Using cp(1) program instead" + cp "$INPUT" "$OUTPUT" +fi diff --git a/configure b/configure index 25b2ece..61ff18c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Star Traders 7.15. +# Generated by GNU Autoconf 2.69 for Star Traders 7.16. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Star Traders' PACKAGE_TARNAME='trader' -PACKAGE_VERSION='7.15' -PACKAGE_STRING='Star Traders 7.15' +PACKAGE_VERSION='7.16' +PACKAGE_STRING='Star Traders 7.16' PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au' PACKAGE_URL='https://www.zap.org.au/projects/trader/' @@ -636,6 +636,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS iconsdir +appdatadir desktopdir PKG_CONFIG_LIBDIR PKG_CONFIG_PATH @@ -2201,7 +2202,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Star Traders 7.15 to adapt to many kinds of systems. +\`configure' configures Star Traders 7.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2272,7 +2273,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Star Traders 7.15:";; + short | recursive ) echo "Configuration of Star Traders 7.16:";; esac cat <<\_ACEOF @@ -2391,7 +2392,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Star Traders configure 7.15 +Star Traders configure 7.16 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3048,7 +3049,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Star Traders $as_me 7.15, which was +It was created by Star Traders $as_me 7.16, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3946,7 +3947,7 @@ fi # Define the identity of the package. PACKAGE='trader' - VERSION='7.15' + VERSION='7.16' cat >>confdefs.h <<_ACEOF @@ -15194,12 +15195,6 @@ $as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h - - - - - - # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is # irrelevant for anonymous mappings. @@ -15264,6 +15259,13 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h + + + + + + + # Detect platform-specific bugs in some versions of glibc: # memchr should not dereference anything with length 0 # https://bugzilla.redhat.com/show_bug.cgi?id=499689 @@ -21802,6 +21804,8 @@ fi desktopdir='${datadir}/applications' +appdatadir='${datadir}/metainfo' + iconsdir='${datadir}/icons/hicolor' @@ -22478,7 +22482,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Star Traders $as_me 7.15, which was +This file was extended by Star Traders $as_me 7.16, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22545,7 +22549,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Star Traders config.status 7.15 +Star Traders config.status 7.16 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -23533,7 +23537,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: - Configuration summary for Star Traders 7.15: + Configuration summary for Star Traders 7.16: Building for host: $host Using C compiler with options: $CC $CFLAGS @@ -23543,7 +23547,7 @@ fi " >&5 $as_echo "$as_me: - Configuration summary for Star Traders 7.15: + Configuration summary for Star Traders 7.16: Building for host: $host Using C compiler with options: $CC $CFLAGS diff --git a/configure.ac b/configure.ac index 4ce867a..1929cfe 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see https://www.gnu.org/licenses/. -AC_INIT([Star Traders], [7.15], [J.Zaitseff@zap.org.au], [trader], +AC_INIT([Star Traders], [7.16], [J.Zaitseff@zap.org.au], [trader], [https://www.zap.org.au/projects/trader/]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) @@ -82,6 +82,7 @@ AS_IF([test "x$ax_cv_curses_enhanced" = xyes], [], ]) AC_SUBST([desktopdir],['${datadir}/applications']) +AC_SUBST([appdatadir],['${datadir}/metainfo']) AC_SUBST([iconsdir],['${datadir}/icons/hicolor']) AC_CONFIG_FILES([ diff --git a/data/Makefile.am b/data/Makefile.am index 783f3ec..29d8835 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -28,6 +28,7 @@ dist_desktop_DATA = trader.desktop +dist_appdata_DATA = trader.appdata.xml icons16dir = ${iconsdir}/16x16/apps icons22dir = ${iconsdir}/22x22/apps @@ -55,8 +56,12 @@ dist_iconsscalable_DATA = trader.svg EXTRA_DIST = \ README \ - trader.desktop.in + trader.desktop.in \ + trader.appdata.xml.in trader.desktop: trader.desktop.in $(top_srcdir)/build-aux/msgfmt-desktop -d $(top_srcdir)/po $< $@ + +trader.appdata.xml: trader.appdata.xml.in + $(top_srcdir)/build-aux/msgfmt-appdata -d $(top_srcdir)/po $< $@ diff --git a/data/Makefile.in b/data/Makefile.in index 47319fa..f0f7bba 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -22,7 +22,7 @@ ######################################################################### # Author: John Zaitseff -# $Id: 783f3ecac400119980dd21bb43132760de321574 $ +# $Id: 29d8835de9818f88a2b3ffed5351f31d88c29663 $ # # This file, data/Makefile.am, contains the non-code data directory # Makefile for Star Traders. It needs to be processed by automake to @@ -164,9 +164,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/zzgnulib.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(dist_desktop_DATA) \ - $(dist_icons128_DATA) $(dist_icons16_DATA) \ - $(dist_icons22_DATA) $(dist_icons24_DATA) \ +DIST_COMMON = $(srcdir)/Makefile.am $(dist_appdata_DATA) \ + $(dist_desktop_DATA) $(dist_icons128_DATA) \ + $(dist_icons16_DATA) $(dist_icons22_DATA) $(dist_icons24_DATA) \ $(dist_icons256_DATA) $(dist_icons32_DATA) \ $(dist_icons48_DATA) $(dist_icons512_DATA) \ $(dist_icons64_DATA) $(dist_icons96_DATA) \ @@ -221,14 +221,15 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons128dir)" \ - "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" \ - "$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons256dir)" \ - "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" \ - "$(DESTDIR)$(icons512dir)" "$(DESTDIR)$(icons64dir)" \ - "$(DESTDIR)$(icons96dir)" "$(DESTDIR)$(iconsscalabledir)" -DATA = $(dist_desktop_DATA) $(dist_icons128_DATA) $(dist_icons16_DATA) \ - $(dist_icons22_DATA) $(dist_icons24_DATA) \ +am__installdirs = "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(icons128dir)" "$(DESTDIR)$(icons16dir)" \ + "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons24dir)" \ + "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" \ + "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons512dir)" \ + "$(DESTDIR)$(icons64dir)" "$(DESTDIR)$(icons96dir)" \ + "$(DESTDIR)$(iconsscalabledir)" +DATA = $(dist_appdata_DATA) $(dist_desktop_DATA) $(dist_icons128_DATA) \ + $(dist_icons16_DATA) $(dist_icons22_DATA) $(dist_icons24_DATA) \ $(dist_icons256_DATA) $(dist_icons32_DATA) \ $(dist_icons48_DATA) $(dist_icons512_DATA) \ $(dist_icons64_DATA) $(dist_icons96_DATA) \ @@ -1134,6 +1135,7 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appdatadir = @appdatadir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -1183,6 +1185,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ dist_desktop_DATA = trader.desktop +dist_appdata_DATA = trader.appdata.xml icons16dir = ${iconsdir}/16x16/apps icons22dir = ${iconsdir}/22x22/apps icons24dir = ${iconsdir}/24x24/apps @@ -1207,7 +1210,8 @@ dist_icons512_DATA = icons-512/trader.png dist_iconsscalable_DATA = trader.svg EXTRA_DIST = \ README \ - trader.desktop.in + trader.desktop.in \ + trader.appdata.xml.in all: all-am @@ -1241,6 +1245,27 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-dist_appdataDATA: $(dist_appdata_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ + done + +uninstall-dist_appdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) install-dist_desktopDATA: $(dist_desktop_DATA) @$(NORMAL_INSTALL) @list='$(dist_desktop_DATA)'; test -n "$(desktopdir)" || list=; \ @@ -1537,7 +1562,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons128dir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons512dir)" "$(DESTDIR)$(icons64dir)" "$(DESTDIR)$(icons96dir)" "$(DESTDIR)$(iconsscalabledir)"; do \ + for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons128dir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons512dir)" "$(DESTDIR)$(icons64dir)" "$(DESTDIR)$(icons96dir)" "$(DESTDIR)$(iconsscalabledir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1590,12 +1615,13 @@ info: info-am info-am: -install-data-am: install-dist_desktopDATA install-dist_icons128DATA \ - install-dist_icons16DATA install-dist_icons22DATA \ - install-dist_icons24DATA install-dist_icons256DATA \ - install-dist_icons32DATA install-dist_icons48DATA \ - install-dist_icons512DATA install-dist_icons64DATA \ - install-dist_icons96DATA install-dist_iconsscalableDATA +install-data-am: install-dist_appdataDATA install-dist_desktopDATA \ + install-dist_icons128DATA install-dist_icons16DATA \ + install-dist_icons22DATA install-dist_icons24DATA \ + install-dist_icons256DATA install-dist_icons32DATA \ + install-dist_icons48DATA install-dist_icons512DATA \ + install-dist_icons64DATA install-dist_icons96DATA \ + install-dist_iconsscalableDATA install-dvi: install-dvi-am @@ -1639,31 +1665,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_desktopDATA uninstall-dist_icons128DATA \ - uninstall-dist_icons16DATA uninstall-dist_icons22DATA \ - uninstall-dist_icons24DATA uninstall-dist_icons256DATA \ - uninstall-dist_icons32DATA uninstall-dist_icons48DATA \ - uninstall-dist_icons512DATA uninstall-dist_icons64DATA \ - uninstall-dist_icons96DATA uninstall-dist_iconsscalableDATA +uninstall-am: uninstall-dist_appdataDATA uninstall-dist_desktopDATA \ + uninstall-dist_icons128DATA uninstall-dist_icons16DATA \ + uninstall-dist_icons22DATA uninstall-dist_icons24DATA \ + uninstall-dist_icons256DATA uninstall-dist_icons32DATA \ + uninstall-dist_icons48DATA uninstall-dist_icons512DATA \ + uninstall-dist_icons64DATA uninstall-dist_icons96DATA \ + uninstall-dist_iconsscalableDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic cscopelist-am \ ctags-am distclean distclean-generic distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dist_desktopDATA \ - install-dist_icons128DATA install-dist_icons16DATA \ - install-dist_icons22DATA install-dist_icons24DATA \ - install-dist_icons256DATA install-dist_icons32DATA \ - install-dist_icons48DATA install-dist_icons512DATA \ - install-dist_icons64DATA install-dist_icons96DATA \ - install-dist_iconsscalableDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags-am uninstall uninstall-am \ + install-data-am install-dist_appdataDATA \ + install-dist_desktopDATA install-dist_icons128DATA \ + install-dist_icons16DATA install-dist_icons22DATA \ + install-dist_icons24DATA install-dist_icons256DATA \ + install-dist_icons32DATA install-dist_icons48DATA \ + install-dist_icons512DATA install-dist_icons64DATA \ + install-dist_icons96DATA install-dist_iconsscalableDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \ + uninstall uninstall-am uninstall-dist_appdataDATA \ uninstall-dist_desktopDATA uninstall-dist_icons128DATA \ uninstall-dist_icons16DATA uninstall-dist_icons22DATA \ uninstall-dist_icons24DATA uninstall-dist_icons256DATA \ @@ -1677,6 +1705,9 @@ uninstall-am: uninstall-dist_desktopDATA uninstall-dist_icons128DATA \ trader.desktop: trader.desktop.in $(top_srcdir)/build-aux/msgfmt-desktop -d $(top_srcdir)/po $< $@ +trader.appdata.xml: trader.appdata.xml.in + $(top_srcdir)/build-aux/msgfmt-appdata -d $(top_srcdir)/po $< $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/README b/data/README index c8d0c6e..82c9746 100644 --- a/data/README +++ b/data/README @@ -7,4 +7,4 @@ Star Traders: A Game of Interstellar Trading ============================================ This directory, `data`, contains non-code data related to Star Traders. -In particular, the desktop file and icons are located here. +In particular, the desktop file, AppData file and icons are located here. diff --git a/data/trader.appdata.xml b/data/trader.appdata.xml new file mode 100644 index 0000000..2884389 --- /dev/null +++ b/data/trader.appdata.xml @@ -0,0 +1,119 @@ + + + + au.org.zap.trader + Star Traders + Star Traders + Звездани трговци + Звёздные торговцы + Comerciantes Estelares + Star Traders + Star Traders + Star Traders + Star Traders + Tähtikauppiaat + Star Traders + Star Traders + Star Traders + Star Traders + Star Traders + Star Traders + Star Traders + Star Traders + Play Star Traders, a simple game of interstellar trading + Spela Star Traders, ett enkelt spel om interstellär handel + Играјте Звездане трговце, једноставну игру међузвезданог трговања + Играть в «Звёздные торговцы», простую игру о межзвёздной торговле + Jogue Comerciantes Estelares, um jogo simples de comércio interestelar + Spill Star Traders, et enkelt spill med interstellar handel + A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása + Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja + Jouer à Star Traders, un simple jeu de commerce interstellaire + Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä + Ludi Star Traders, simpla ludo pri interstelara komerco + Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel + Spil Star Traders, et simpelt spil med rumhandel + Play Star Traders, a simple game of interstellar trading + Play Star Traders, a simple game of interstellar trading + Play Star Traders, a simple game of interstellar trading + Play Star Traders, a simple game of interstellar trading + Play Star Traders, a simple game of interstellar trading + +

+ Star Traders is a simple game of interstellar trading, where the + objective is to create companies, buy and sell shares, borrow and + repay money, in order to become the wealthiest player (the winner). +

+

Star Traders är ett enkelt spel om interstellär handel, där spelets mål är att bilda företag, köpa och sälja aktier, låna och betala tillbaka pengar för att bli den rikaste spelaren (vinnaren).

+

Звездани трговци је једноставна игра међузвезданог трговања, у којој треба да оснивате предузећа, купујете и продајете акције, позајмљујете и враћате новац, да бисте постали најбогатији играч (победник).

+

«Звёздные торговцы» — это простая игра о межзвёздной торговле, где целью игры является создание компаний, покупка и продажа акций, получение и погашение кредита, чтобы стать самым богатым игроком-победителем.

+

Comerciantes Estelares é um jogo simples de negociação interestelar, cujo objetivo é criar empresas, comprar e vender ações, emprestar e pagar dinheiro, para se tornar o jogador mais rico (o vencedor).

+

Star Traders er et enkelt spill med interstellar handel, der målet med spillet er å opprette firmaer, kjøpe og selge aksjer, låne og betale tilbake penger for å bli den rikeste spilleren (vinneren).

+

A Star Traders egy egyszerű csillagközi kereskedelmi játék, ahol a játék célja társaságok létrehozása, részvények vásárlása és eladása, pénz kölcsönkérése és visszafizetése azért, hogy a leggazdagabb játékossá (győztessé) váljon.

+

„Star Traders” (Međuzvjezdani trgovci) je jednostavna igra međuzvjezadnog trgovanja, gdje je cilj igre stvarati tvrtke, kupovati i prodavati dionice te posuđivati i vraćati novac kako biste postali najbogatiji igrač (pobjednik).

+

Star Traders est un simple jeu de commerce interstellaire où l'objectif du jeu est de créer des compagnies, acheter et vendre des parts, emprunter et rembourser de l'argent dans le but de devenir le joueur le plus riche (le gagnant).

+

Tähtikauppiaat on yksinkertainen tähtienvälisen kaupan peli, jossa pelin tarkoitus on luoda yhtiöitä, ostaa ja myydä osakkeita, lainata ja maksaa takaisin rahaa, tarkoituksena tulla varakkaimmaksi pelaajaksi (voittaja).

+

Star Traders estas simpla ludo pri interstelara komerco, kie la celo de la ludo estas krei kompaniojn, aĉeti kaj vendi akciojn, pruntepreni kaj repagi monon, por fariĝi la plej riĉa ludanto (la venkanto).

+

Star Traders ist ein einfaches Spiel um interstellaren Handel. Das Ziel des Spiels ist es, Firmen zu gründen, Aktien zu kaufen und zu verkaufen, Geld zu leihen und zurück zu zahlen, um der reichste Spieler und damit der Gewinner zu werden.

+

Star Traders er et simpelt spil med rumhandel, hvor formålet er at oprette firmaer, købe og sælge aktier, låne og betale tilbage på lån, alt sammen for at blive den rigeste spiller (vinderen).

+

Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, borrow and repay money, in order to become the wealthiest player (the winner).

+

Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, borrow and repay money, in order to become the wealthiest player (the winner).

+

Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, borrow and repay money, in order to become the wealthiest player (the winner).

+

Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, borrow and repay money, in order to become the wealthiest player (the winner).

+

Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow and repay money, in order to become the wealthiest player (the winner).

+ + trader.svg + trader.desktop + + trader + + + Game + StrategyGame + + https://www.zap.org.au/projects/trader/ + John Zaitseff + John Zaitseff + Џон Зајцеф (John Zaitseff) + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + John Zaitseff + + + https://www.zap.org.au/projects/trader/screenshot.png + + + FSFAP + GPL-3.0+ + + diff --git a/data/trader.appdata.xml.in b/data/trader.appdata.xml.in new file mode 100644 index 0000000..deb031f --- /dev/null +++ b/data/trader.appdata.xml.in @@ -0,0 +1,59 @@ + + + + + + au.org.zap.trader + + Star Traders + Play Star Traders, a simple game of interstellar trading + +

+ Star Traders is a simple game of interstellar trading, where the + objective is to create companies, buy and sell shares, borrow and + repay money, in order to become the wealthiest player (the winner). +

+ + + trader.svg + trader.desktop + + trader + + + + Game + StrategyGame + + + https://www.zap.org.au/projects/trader/ + John Zaitseff + + + + https://www.zap.org.au/projects/trader/screenshot.png + + + + FSFAP + GPL-3.0+ + + diff --git a/doc/Makefile.in b/doc/Makefile.in index a202712..75afb57 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1119,6 +1119,7 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appdatadir = @appdatadir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/doc/trader.6 b/doc/trader.6 index 66bd069..130bf40 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "12th January, 2021" "Unix-like systems" +.TH TRADER 6 "19th January, 2021" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* @@ -183,6 +183,12 @@ using \fBLC_NUMERIC\fP and monetary quantities will use or .BR setlocale (3) manual pages for more details on locale settings. +.TP +.B TEXTDOMAINDIR +If set, Star Traders will use this path as the base with which to locate +its message catalogs instead of the compiled-in path; the relevant +\fItrader.mo\fP files should be located in language-code subdirectories +(such as \fIen_AU\fP), in \fILC_MESSAGES\fP sub-subdirectories. .\" ********************************************************************* .SH FILES .TP diff --git a/lib/Makefile.in b/lib/Makefile.in index aa6ec05..156094d 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1254,6 +1254,7 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appdatadir = @appdatadir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/lib/verify.h b/lib/verify.h index 3cdcdca..65514c3 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -22,16 +22,10 @@ /* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert (R, DIAGNOSTIC) - works as per C11. This is supported by GCC 4.6.0 and later, in C - mode, and by clang (also in C++ mode). + works as per C11. This is supported by GCC 4.6.0+ and by clang 4+. Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as - per C2X. This is supported by GCC 9.1 and later, and by clang in - C++1z mode. - - Define _GL_HAVE_STATIC_ASSERT1 if static_assert (R) works as per - C++17. This is supported by GCC 9.1 and later, and by clang in - C++1z mode. + per C2X. This is supported by GCC 9.1+. Support compilers claiming conformance to the relevant standard, and also support GCC when not pedantic. If we were willing to slow @@ -47,18 +41,6 @@ || (!defined __STRICT_ANSI__ && 9 <= __GNUC__)) # define _GL_HAVE__STATIC_ASSERT1 1 # endif -#else -# if 4 <= __clang_major__ -# define _GL_HAVE__STATIC_ASSERT 1 -# endif -# if 4 <= __clang_major__ && 201411 <= __cpp_static_assert -# define _GL_HAVE__STATIC_ASSERT1 1 -# endif -# if 201703L <= __cplusplus \ - || 9 <= __GNUC__ \ - || (4 <= __clang_major__ && 201411 <= __cpp_static_assert) -# define _GL_HAVE_STATIC_ASSERT1 1 -# endif #endif /* FreeBSD 9.1 , included by and lots of other @@ -225,7 +207,9 @@ template Unfortunately, unlike C11, this implementation must appear as an ordinary declaration, and cannot appear inside struct { ... }. */ -#if defined _GL_HAVE__STATIC_ASSERT +#if 200410 <= __cpp_static_assert +# define _GL_VERIFY(R, DIAGNOSTIC, ...) static_assert (R, DIAGNOSTIC) +#elif defined _GL_HAVE__STATIC_ASSERT # define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC) #else # define _GL_VERIFY(R, DIAGNOSTIC, ...) \ @@ -239,7 +223,7 @@ template # define _Static_assert(...) \ _GL_VERIFY (__VA_ARGS__, "static assertion failed", -) # endif -# if !defined _GL_HAVE_STATIC_ASSERT1 && !defined static_assert +# if __cpp_static_assert < 201411 && !defined static_assert # define static_assert _Static_assert /* C11 requires this #define. */ # endif #endif diff --git a/m4/Makefile.in b/m4/Makefile.in index 29da9bd..f5bab6c 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1088,6 +1088,7 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appdatadir = @appdatadir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index 5a9f968..e47aa2d 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,4 +1,4 @@ -# mmap-anon.m4 serial 11 +# mmap-anon.m4 serial 12 dnl Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,7 +13,7 @@ dnl with or without modifications, as long as this notice is preserved. # - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be # used. -AC_DEFUN([gl_FUNC_MMAP_ANON], +AC_DEFUN_ONCE([gl_FUNC_MMAP_ANON], [ dnl Persuade glibc to define MAP_ANONYMOUS. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) diff --git a/po/POTFILES.in b/po/POTFILES.in index 05875d1..047de6c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,6 +28,7 @@ # Data files from Star Traders data/trader.desktop.in +data/trader.appdata.xml.in # Source files from Star Traders src/trader.c diff --git a/po/da.gmo b/po/da.gmo index 35c7a19..73ed831 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 428b00c..625bc84 100644 --- a/po/da.po +++ b/po/da.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:55+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:42+1100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -29,12 +29,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Spil Star Traders, et simpelt spil med rumhandel" @@ -44,22 +44,34 @@ msgstr "Spil Star Traders, et simpelt spil med rumhandel" msgid "game;interstellar;trading;strategy;" msgstr "spil;interstellar;handel;strategi;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders er et simpelt spil med rumhandel, hvor formålet er at oprette firmaer, købe og sælge aktier, låne og betale tilbage " +"på lån, alt sammen for at blive den rigeste spiller (vinderen)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: ugyldig værdi for --max-turn: »%s«\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: ugyldig operand »%s«\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: ugyldigt spilnummer »%s«\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: ekstra operand »%s«\n" @@ -67,7 +79,7 @@ msgstr "%s: ekstra operand »%s«\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -95,17 +107,17 @@ msgstr "" "program har INGEN GARANTI, indenfor lovens rammer; se licensen for yderligere\n" "detaljer.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Prøv »%s --help« for yderligere information.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Brug: %s [TILVALG ...] [SPIL]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -114,7 +126,7 @@ msgstr "" "Spil Star Traders, et simpelt spil med rumhandel.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -131,7 +143,7 @@ msgstr "" " --max-turn=ANT sæt antallet af runder til ANT\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -148,7 +160,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -160,7 +172,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -169,12 +181,12 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Rapporter fejl for %s til <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Hjemmeside for Star Traders: <%s>.\n" @@ -1665,31 +1677,31 @@ msgctxt "answer" msgid "No" msgstr "Nej" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "ikke nok hukommelse" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: »%s«" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: »%lc«" diff --git a/po/de.gmo b/po/de.gmo index 0111bf0..2bca754 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 47993d8..a4c5171 100644 --- a/po/de.po +++ b/po/de.po @@ -9,14 +9,15 @@ # # Contributors: # Philipp Thomas , 2012, 2015, 2017. +# Mario Blättermann , 2021. # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:55+1100\n" -"Last-Translator: Philipp Thomas \n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 18:48+1100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -29,12 +30,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel" @@ -44,22 +45,34 @@ msgstr "Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel" msgid "game;interstellar;trading;strategy;" msgstr "spiel;universum;galaxie;handel;strategie;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders ist ein einfaches Spiel um interstellaren Handel. Das Ziel des Spiels ist es, Firmen zu gründen, Aktien zu kaufen " +"und zu verkaufen, Geld zu leihen und zurück zu zahlen, um der reichste Spieler und damit der Gewinner zu werden." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: ungültiger Wert für --max-turn: „%s“\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: ungültiger Operand „%s“\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: ungültige Spielnummer „%s“\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: zusätzlicher Operand „%s“\n" @@ -67,7 +80,7 @@ msgstr "%s: zusätzlicher Operand „%s“\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -86,8 +99,8 @@ msgstr "" "Copyright © %s, John Zaitseff.\n" "\n" "Star Traders ist ein einfaches Spiel um interstellaren Handel. Das Ziel\n" -"des Spiels ist es, Firmen zu gründen, Aktien zu kaufen und verkaufen und\n" -"Geld zu leihen und zurück zu zahlen um der reichste Spieler und damit der\n" +"des Spiels ist es, Firmen zu gründen, Aktien zu kaufen und zu verkaufen,\n" +"Geld zu leihen und zurück zu zahlen, um der reichste Spieler und damit der\n" "Gewinner zu werden.\n" "\n" "Dieses Programm ist freie Software und wird unter den Bedingungen der GNU\n" @@ -96,17 +109,17 @@ msgstr "" "Programm hat KEINERLEI GARANTIE, soweit die Gesetzgebung dies zulässt;\n" "bitte lesen Sie die Lizenz für die Details.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Versuchen Sie „%s --help“ für ausführlichere Informationen.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Aufruf: %s [OPTION ...] [SPIEL]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -115,7 +128,7 @@ msgstr "" "Spielen Sie Star Trader, ein einfaches Spiel um interstellaren Handel.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -126,13 +139,13 @@ msgid "" "\n" msgstr "" "Options:\n" -" -V, --version Ausgabe der Versionsnummer und beenden des Spiels\n" +" -V, --version Ausgabe der Versionsnummer und Beenden des Spiels\n" " -h, --help diese Hilfe ausgeben und Programm beenden\n" " --no-color keine Farben für die Ausgabe von Texten verwenden\n" -" --max-turn=ZAHL die maximale Anzahl von Runden auf ZAHL setzten\n" +" --max-turn=ZAHL die maximale Anzahl von Runden auf ZAHL setzen\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -140,7 +153,7 @@ msgid "" "\n" msgstr "" "Wenn SPIEL als Zahl zwischen 1 und 9 angegeben wird, wird dieses Spiel\n" -"geladen und fort geführt. Wird SPIEL nicht angegeben, wird ein neues\n" +"geladen und fortgeführt. Wird SPIEL nicht angegeben, wird ein neues\n" "Spiel gestartet.\n" "\n" @@ -150,12 +163,12 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" -"Berichten Sie Fehler (in Englisch) an %s <%s>.\n" -"Fehler in der Übersetzung berichten Sie bitte an\n" +"Melden Sie Fehler (auf Englisch) an %s <%s>.\n" +"Fehler in der Übersetzung melden Sie bitte an\n" ".\n" #. TRANSLATORS: %s is the email address for reporting bugs. As @@ -163,25 +176,25 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" -"Berichten Sie Fehler (in Englisch) an <%s>.\n" -"Fehler in der Übersetzung berichten Sie bitte an\n" +"Melden Sie Fehler (auf Englisch) an <%s>.\n" +"Fehler in der Übersetzung melden Sie bitte an\n" ".\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 -#, c-format -msgid "Report %s bugs to <%s>.\n" -msgstr "Berichen Sie %s Fehler an <%s>.\n" - #: src/trader.c:349 #, c-format +msgid "Report %s bugs to <%s>.\n" +msgstr "Melden Sie %s Fehler an <%s>.\n" + +#: src/trader.c:352 +#, c-format msgid "Star Traders home page: <%s>.\n" -msgstr "Star Traders Homepage: <%s>.\n" +msgstr "Homepage von Star Traders: <%s>.\n" #. TRANSLATORS: The eight company names do NOT have to be literal #. translations of the English names. In fact, if possible, the @@ -195,7 +208,7 @@ msgstr "Altair AG" #: src/globals.c:48 msgid "Betelgeuse, Ltd" -msgstr "Beteleuse GmbH" +msgstr "Betelgeuse GmbH" #: src/globals.c:49 msgid "Capella Freight Co" @@ -315,7 +328,7 @@ msgstr " Erster Spieler " #: src/game.c:227 #, c-format msgid "The first player to go is ^{%ls^}." -msgstr "Der Spieler der anfängt ist ^{%ls^}." +msgstr "Der Spieler, der beginnt ist ^{%ls^}." #. TRANSLATORS: The keycode should be modified to #. match that (or those) specified with msgctxt @@ -324,8 +337,8 @@ msgstr "Der Spieler der anfängt ist ^{%ls^}." #, c-format msgid "Enter number of players [^{1^}-^{%d^}] or ^{^} to continue a game: " msgstr "" -"Geben Sie die Anzahl der Spieler [^{1^}-^{%d^}] ein\n" -"oder ^{^} um ein Spiel fortzusetzen: " +"Geben Sie die Anzahl der Spieler [^{1^}-^{%d^}] oder\n" +"^{^} ein, um ein Spiel fortzusetzen: " #. TRANSLATORS: This string specifies the keycodes used to continue a #. game; these must NOT contain any numeric digit from 1 to 9. The @@ -341,8 +354,8 @@ msgstr "Ww" #, c-format msgid "Enter game number [^{1^}-^{9^}] or ^{^} to cancel: " msgstr "" -"Geben Sie die Spielnummer [^{1^}-^{9^}] ein\n" -"oder ^{^} um abzubrechen: " +"Geben Sie die Spielnummer [^{1^}-^{9^}] oder\n" +"^{^} ein, um abzubrechen: " #: src/game.c:406 #, c-format @@ -931,7 +944,7 @@ msgstr "Die Bank wird Ihnen kein weiteres Geld leihen." #: src/exch.c:447 #, c-format msgid "How much do you wish to borrow? " -msgstr "Wie viel wollen Sie borgen? " +msgstr "Wie viel wollen Sie leihen? " #: src/exch.c:479 #, c-format @@ -951,7 +964,7 @@ msgstr " Kein Bargeld " #: src/exch.c:485 #, c-format msgid "You have no cash with which to repay the debt!" -msgstr "Sie haben kein Bargeld um Ihre Schulden zu begleichen!" +msgstr "Sie haben kein Bargeld, um Ihre Schulden zu begleichen!" #: src/exch.c:505 #, c-format @@ -1069,7 +1082,7 @@ msgstr "Keine erwerbbaren Aktien vorhanden." #: src/exch.c:724 #, c-format msgid " Insufficient Cash " -msgstr " Unzureichnedes Bargeld " +msgstr " Unzureichendes Bargeld " #: src/exch.c:725 #, c-format @@ -1117,7 +1130,7 @@ msgstr "Wieviele Aktien wollen Sie verkaufen? " #: src/exch.c:805 #, c-format msgid " No Shares Issued " -msgstr " Keine Aktien Ausgegeben " +msgstr " Keine Aktien ausgegeben " #. TRANSLATORS: %ls represents the company name. #: src/exch.c:807 @@ -1132,7 +1145,7 @@ msgstr "" #: src/exch.c:812 #, c-format msgid " Shares Issued " -msgstr " Ausgegeben Aktien " +msgstr " Ausgegebene Aktien " #. TRANSLATORS: %ls represents the company name. #: src/exch.c:814 @@ -1209,7 +1222,7 @@ msgid "" msgstr "" "Spiel %d konnte nicht geladen werden.\n" "\n" -"^{Spiel %s: %s^}" +"^{Datei %s: %s^}" #: src/fileio.c:319 #, c-format @@ -1244,7 +1257,7 @@ msgstr "%s: unzulässiges oder fehlendes Feld in Zeile %d" #: src/fileio.c:473 src/fileio.c:494 #, c-format msgid " Game Not Saved " -msgstr " Spiel Nicht Gespeichert " +msgstr " Spiel nicht gespeichert " #: src/fileio.c:474 #, c-format @@ -1357,16 +1370,15 @@ msgid "" " ^e ~. ~. ~. ~. ~. ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" msgstr "" -"^BStar Traders^N ist ein einfaches Spiel um instellaren Handel. Das Ziel des\n" -"Spieles ist das Anhäufen des grösstmöglichen Reichtums. Dies wird erreicht\n" +"^BStar Traders^N ist ein einfaches Spiel um interstellaren Handel. Das Ziel des\n" +"Spieles ist das Anhäufen des größtmöglichen Reichtums. Dies wird erreicht\n" "durch das Aufbauen interstellarer Handelsrouten, ihrer Erweiterung und dem\n" "Kauf von Aktien der Firmen, die sie kontrollieren. Aktien steigen im Wert,\n" -"wenn sich die Tätigkeit der Firma erweitert. Ausserdem erhöht sich damit\n" -"auch die prozentuale Dividende. Die Spieler können sich ausserdem Geld von\n" -"der Interstellaren Handelsbank leihen, um weitere Akteinkäufe zu finan-\n" -"zieren.\n" +"wenn sich die Tätigkeit der Firma erweitert. Außerdem erhöht sich damit auch\n" +"die prozentuale Dividende. Die Spieler können sich außerdem Geld von der\n" +"Interstellaren Handelsbank leihen, um weitere Aktienkäufe zu finanzieren.\n" "\n" -"Die Karte der Galaxie wird dargetellt durch ein ^B~x^N × ^B~y^N Raster. Ein typi-\n" +"Die Karte der Galaxie wird durch ein ^B~x^N × ^B~y^N-Raster dargestellt. Ein typi-\n" "scher Teil von ihr könnte so aussehen:\n" "\n" " ^e ~. ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1392,10 +1404,10 @@ msgid "" "will set up an ^Boutpost^N, not belonging to any company. Thus, if move ^k~3^N is\n" "selected on the above map, a ^o ~+ ^N would be placed at that position.\n" msgstr "" -"Der Computer wählt zufällig ^B~m^N Züge (bezeichnet mit ^k~1^N bis ^k~M^N) trägt sie auf\n" -"der Karte ein. Um eine der hervorgehobenen Positionen auszuwählen, drücken\n" -"Sie den entsprechenden Buchstaben. Einige der Züge auf der Karte könnten\n" -"z.B. so aussehen:\n" +"Der Computer wählt zufällig ^B~m^N Züge (bezeichnet mit ^k~1^N bis ^k~M^N) und trägt sie\n" +"auf der Karte ein. Um eine der hervorgehobenen Positionen auszuwählen, drü-\n" +"cken Sie den entsprechenden Buchstaben. Einige der Züge auf der Karte könn-\n" +"ten z.B. so aussehen:\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^k~3^e ~. ~. ~. ~. ~. ^N\n" @@ -1403,10 +1415,10 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ~. ^N\n" "\n" -"Die Wahl einer Position die ^Bnicht^N bei einem Stern ist (so wie Züge ^k~1^N, ^k~3^N oder\n" -"^k~5^N), erstellt einen Aussenposten, der zu keiner Firma gehört. Wenn daher auf\n" -"der obigen Karte Zug ^k~3^N gewählt wird, würde ein ^o + ^N an dieser Position er-\n" -"scheinen.\n" +"Die Wahl einer Position, die ^Bnicht^N bei einem Stern ist (so wie Züge ^k~1^N, ^k~3^N\n" +"oder ^k~5^N), erstellt einen Außenposten, der zu keiner Firma gehört. Wenn daher\n" +"auf der obigen Karte Zug ^k~3^N gewählt wird, würde ein ^o + ^N an dieser Position\n" +"erscheinen.\n" #: src/help.c:150 msgid "" @@ -1438,7 +1450,7 @@ msgstr "" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" " ^e ~. ~. ~. ^o~+^e ~. ~. ^k~6^e ~. ~. ^N\n" -" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Zug ^k~6^N oder ^k~8^N vergrössert Firma ^B~B^N.\n" +" ^e ~. ^s~*^e ~. ~. ~. ~. ^c~B^e ^c~B^e ^c~B^e ^N Zug ^k~6^N oder ^k~8^N vergrößert Firma ^B~B^N.\n" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" @@ -1461,7 +1473,7 @@ msgid "" "than it would for outposts not next to stars.\n" msgstr "" "Die Wahl von Positionen neben Sternen erhöht den Wert Ihrer Aktien um etwa\n" -"das fünffache einer Position nicht neben einem Stern. Daher sollte Zug ^k~6^N den\n" +"das Fünffache einer Position nicht neben einem Stern. Daher sollte Zug ^k~6^N den\n" "Vorzug vor Zug ^k~8^N erhalten.\n" "\n" " ^e ^c~C^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1470,11 +1482,11 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ^k~4^e ~. ~. ^s~*^e ^c~B^e ^N\n" " ^e ~. ~. ~. ~. ^s~*^e ~. ~. ~. ^k~8^e ^N\n" "\n" -"Sie können auch eine Firma erweitern indem Sie eine Position neben eienm.\n" -"Aussenposten wählen. Dieser Aussenposten wird dann von der Firma übernommen.\n" -"Daher wird Zug ^k~1^N Firma ^B~C^N um ^Bzwei^N Felder erweitern. Ausserdem sind Aussenpos-\n" -"ten neben einem Stern wertvoller: die Aktien der Firma werden sich um einen\n" -"größeren Betrag erhöhen als bei Aussenposten, die nicht neben einem Stern\n" +"Sie können auch eine Firma erweitern, indem Sie eine Position neben einem\n" +"Außenposten wählen. Dieser Außenposten wird dann von der Firma übernommen.\n" +"Daher wird Zug ^k~1^N Firma ^B~C^N um ^Bzwei^N Felder erweitern. Außerdem sind Außenposten\n" +"neben einem Stern wertvoller: die Aktien der Firma werden sich um einen grö-\n" +"ßeren Betrag erhöhen als bei Außenposten, die nicht neben einem Stern\n" "liegen.\n" #: src/help.c:186 @@ -1500,7 +1512,7 @@ msgstr "" "zu einer Firma ^Bfusionieren^N, wenn man diese Position wählt (so verfügbar). So\n" "können z.B. auf der Karte unten die Firmen ^B~A^N und ^B~B^N durch Wahl von ^k~5^N fusio-\n" "niert werden. Wenn dies geschieht, übernimmt die Firma, deren Besitz den\n" -"größeren Wert hat die andere. Hier kann Firma ^B~B^N die Firma ^B~A^N übernehmen.\n" +"größeren Wert von beiden hat. Hier kann Firma ^B~B^N die Firma ^B~A^N übernehmen.\n" "Firma ^B~A^N hört auf zu existieren, kann aber als neue Firma wieder auftauchen.\n" "\n" " ^e ^k~1^e ~. ^s~*^e ~. ~. ~. ^s~*^e ^s~*^e ~. ^N\n" @@ -1509,9 +1521,8 @@ msgstr "" " ^e ~. ^k~2^e ~. ~. ~. ~. ~. ^s~*^e ^c~B^e ^N\n" "\n" "Wenn Firmen fusionieren, bekommen die Spieler Anteile an der dominanten Fir-\n" -"ma proportional zu ihrem Anteil an der alten Firma. Ausserdem erhalten Sie\n" -"sie einen Bargeldbonus proportional zum prozentualen Anteil an der alten\n" -"Firma.\n" +"ma proportional zu ihrem Anteil an der alten Firma. Außerdem erhalten Sie\n" +"einen Bargeldbonus proportional zum prozentualen Anteil an der alten Firma.\n" #: src/help.c:205 msgid "" @@ -1535,23 +1546,23 @@ msgstr "" "Wenn Sie Ihren Zug gewählt haben, betreten Sie die ^BInterstellare Börse^N. Hier\n" "können Sie Aktien kaufen oder verkaufen, sich von der Handelsbank Geld lei-\n" "hen oder einen Teil ihrer Schulden (so vorhanden) zurückzahlen. Beachten\n" -"Sie, daß jede Firma eine beschränkte Zahl von Aktien ausgibt — Sie können\n" +"Sie, dass jede Firma eine beschränkte Zahl von Aktien ausgibt — Sie können\n" "nicht endlos kaufen! Sie können aber die Firma bitten, weitere Aktien aus-\n" -"zugeben. Je größer ihr Anteil an der Firma, desdo höher die Chance, das dem\n" -"statt gegeben wird.\n" +"zugeben. Je größer ihr Anteil an der Firma, desto höher die Chance, dass dem\n" +"stattgegeben wird.\n" "\n" "\n" -"Das Spiel endet normalerweise nach ^B~t^N Runden. Sie können aber das Spiel\n" -"vorzeitig beenden, indem Sie ^K^N drücken, wenn Sie nach Ihrem Zug\n" -"gefragt werden. Ausserdem kann ein Spieler jederzeit Bankrott erklären.\n" -"Wenn Ihre Schulden hoch genug sind, macht das eventuell die Bank für Sie!\n" -"Reicht die Zeit nicht aus, um das Spiel zu beenden, können Sie es abspei\n" -"chern und später fortsetzen.\n" +"Das Spiel endet normalerweise nach ^B~t^N Runden. Sie können aber das Spiel vor-\n" +"zeitig beenden, indem Sie ^K^N drücken, wenn Sie nach Ihrem Zug gefragt\n" +"werden. Außerdem kann ein Spieler jederzeit Bankrott erklären. Wenn Ihre\n" +"Schulden hoch genug sind, macht das eventuell die Bank für Sie! Reicht die\n" +"Zeit nicht aus, um das Spiel zu beenden, können Sie es abspeichern und spä-\n" +"ter fortsetzen.\n" #: src/help.c:225 msgid "@ Help text, page 7\n" msgstr "" -"Der ^BGewinner des Spiels^N ist die Person mit dem größten Nettowert (Summe aus\n" +"Der ^BGewinner des Spiels^N ist die Person mit dem größten Nettowert (Summe aus\n" "Bargeld, Aktien und Schulden). ^HViel Glück^N, möge der Beste gewinnen!\n" #: src/help.c:226 @@ -1585,7 +1596,7 @@ msgstr "Seite %1$d von %2$d" #: src/help.c:486 src/intf.c:3026 #, c-format msgid "[ Press to continue ] " -msgstr "[ drücken um fortzufahren ] " +msgstr "[ drücken, um fortzufahren ] " #. TRANSLATORS: The specific use of and #. is not essential: you can use , , , @@ -1666,31 +1677,31 @@ msgctxt "answer" msgid "No" msgstr "Nein" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" -msgstr "Kein frier Speicer mehr vorhanden" +msgstr "Kein freier Speicher mehr vorhanden" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s“" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" @@ -1718,7 +1729,7 @@ msgstr "%s: Option „%s%s“ akzeptiert keine Argumente\n" #: lib/getopt.c:360 lib/obsolete-strings.c:71 #, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: Option „%s%s“ erfordert ein Argumente\n" +msgstr "%s: Option „%s%s“ erfordert ein Argument\n" #: lib/getopt.c:621 lib/obsolete-strings.c:73 #, c-format @@ -1767,7 +1778,7 @@ msgstr "%s: Option „%s%s“ akzeptiert keine Argumente\n" #: lib/obsolete-strings.c:70 #, c-format msgid "%s: option `%s%s' requires an argument\n" -msgstr "%s: Option „%s%s“ erfordert ein Argumente\n" +msgstr "%s: Option „%s%s“ erfordert ein Argument\n" #: lib/obsolete-strings.c:72 #, c-format @@ -1822,12 +1833,12 @@ msgstr "%s: Option „%c%s“ akzeptiert keine Argumente\n" #: lib/obsolete-strings.c:85 #, c-format msgid "%s: option `--%s' requires an argument\n" -msgstr "%s: Option „--%s“ erfordert ein Argumente\n" +msgstr "%s: Option „--%s“ erfordert ein Argument\n" #: lib/obsolete-strings.c:86 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: Option „--%s“ erfordert ein Argumente\n" +msgstr "%s: Option „--%s“ erfordert ein Argument\n" #: lib/obsolete-strings.c:87 #, c-format @@ -1872,9 +1883,9 @@ msgstr "%s: Option „-W %s“ akzeptiert keine Argumente\n" #: lib/obsolete-strings.c:95 #, c-format msgid "%s: option `-W %s' requires an argument\n" -msgstr "%s: Option „-W %s“ erfordert ein Argumente\n" +msgstr "%s: Option „-W %s“ erfordert ein Argument\n" #: lib/obsolete-strings.c:96 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: Option „-W %s“ erfordert ein Argumente\n" +msgstr "%s: Option „-W %s“ erfordert ein Argument\n" diff --git a/po/en@quot.gmo b/po/en@quot.gmo index 2208de1..31d09ab 100644 Binary files a/po/en@quot.gmo and b/po/en@quot.gmo differ diff --git a/po/en@quot.po b/po/en@quot.po index 816a593..c09cb4f 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-12 11:31+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-19 16:43+1100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@quot\n" @@ -43,12 +43,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Play Star Traders, a simple game of interstellar trading" @@ -58,22 +58,34 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: invalid value for --max-turn: ‘%s’\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: invalid operand ‘%s’\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: invalid game number ‘%s’\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: extra operand ‘%s’\n" @@ -81,7 +93,7 @@ msgstr "%s: extra operand ‘%s’\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -108,28 +120,28 @@ msgstr "" "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" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Try ‘%s --help’ for more information.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Usage: %s [OPTION ...] [GAME]\n" -#: src/trader.c:312 -#, c-format -msgid "" -"Play Star Traders, a simple game of interstellar trading.\n" -"\n" -msgstr "" -"Play Star Traders, a simple game of interstellar trading.\n" -"\n" - #: src/trader.c:315 #, c-format msgid "" +"Play Star Traders, a simple game of interstellar trading.\n" +"\n" +msgstr "" +"Play Star Traders, a simple game of interstellar trading.\n" +"\n" + +#: src/trader.c:318 +#, c-format +msgid "" "Options:\n" " -V, --version output version information and exit\n" " -h, --help display this help and exit\n" @@ -144,7 +156,7 @@ msgstr "" " --max-turn=NUM set the number of turns to NUM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -161,7 +173,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "Report bugs to %s <%s>.\n" @@ -171,19 +183,19 @@ msgstr "Report bugs to %s <%s>.\n" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "Report bugs to <%s>.\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Report %s bugs to <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Star Traders home page: <%s>.\n" @@ -1665,31 +1677,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_AU.gmo b/po/en_AU.gmo index 0c0ba3e..18c527e 100644 Binary files a/po/en_AU.gmo and b/po/en_AU.gmo differ diff --git a/po/en_AU.po b/po/en_AU.po index 0a0084f..294745b 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:56+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:47+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" "Language: en_AU\n" @@ -28,12 +28,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Play Star Traders, a simple game of interstellar trading" @@ -43,22 +43,34 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, " +"borrow and repay money, in order to become the wealthiest player (the winner)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: invalid value for --max-turn: ‘%s’\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: invalid operand ‘%s’\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: invalid game number ‘%s’\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: extra operand ‘%s’\n" @@ -66,7 +78,7 @@ msgstr "%s: extra operand ‘%s’\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -93,17 +105,17 @@ msgstr "" "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" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Try ‘%s --help’ for more information.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Usage: %s [OPTION ...] [GAME]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -112,7 +124,7 @@ msgstr "" "Play Star Traders, a simple game of interstellar trading.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -129,7 +141,7 @@ msgstr "" " --max-turn=NUM set the number of turns to NUM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -146,7 +158,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "Report bugs to %s <%s>.\n" @@ -156,19 +168,19 @@ msgstr "Report bugs to %s <%s>.\n" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "Report bugs to <%s>.\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Report %s bugs to <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Star Traders home page: <%s>.\n" @@ -1650,31 +1662,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_CA.gmo b/po/en_CA.gmo index d480b3c..ffe5a98 100644 Binary files a/po/en_CA.gmo and b/po/en_CA.gmo differ diff --git a/po/en_CA.po b/po/en_CA.po index c2628ed..87fb860 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:56+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:47+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" "Language: en_CA\n" @@ -28,12 +28,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Play Star Traders, a simple game of interstellar trading" @@ -43,22 +43,34 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, " +"borrow and repay money, in order to become the wealthiest player (the winner)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: invalid value for --max-turn: ‘%s’\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: invalid operand ‘%s’\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: invalid game number ‘%s’\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: extra operand ‘%s’\n" @@ -66,7 +78,7 @@ msgstr "%s: extra operand ‘%s’\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -93,17 +105,17 @@ msgstr "" "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" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Try ‘%s --help’ for more information.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Usage: %s [OPTION ...] [GAME]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -112,7 +124,7 @@ msgstr "" "Play Star Traders, a simple game of interstellar trading.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -129,7 +141,7 @@ msgstr "" " --max-turn=NUM set the number of turns to NUM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -146,7 +158,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "Report bugs to %s <%s>.\n" @@ -156,19 +168,19 @@ msgstr "Report bugs to %s <%s>.\n" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "Report bugs to <%s>.\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Report %s bugs to <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Star Traders home page: <%s>.\n" @@ -1650,31 +1662,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index fc8bd56..8154bf1 100644 Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ diff --git a/po/en_GB.po b/po/en_GB.po index 5226700..0c58a41 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:56+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:48+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" "Language: en_GB\n" @@ -28,12 +28,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Play Star Traders, a simple game of interstellar trading" @@ -43,22 +43,34 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, " +"borrow and repay money, in order to become the wealthiest player (the winner)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: invalid value for --max-turn: ‘%s’\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: invalid operand ‘%s’\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: invalid game number ‘%s’\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: extra operand ‘%s’\n" @@ -66,7 +78,7 @@ msgstr "%s: extra operand ‘%s’\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -93,17 +105,17 @@ msgstr "" "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" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Try ‘%s --help’ for more information.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Usage: %s [OPTION ...] [GAME]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -112,7 +124,7 @@ msgstr "" "Play Star Traders, a simple game of interstellar trading.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -129,7 +141,7 @@ msgstr "" " --max-turn=NUM set the number of turns to NUM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -146,7 +158,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "Report bugs to %s <%s>.\n" @@ -156,19 +168,19 @@ msgstr "Report bugs to %s <%s>.\n" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "Report bugs to <%s>.\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Report %s bugs to <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Star Traders home page: <%s>.\n" @@ -1650,31 +1662,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/en_US.gmo b/po/en_US.gmo index 3e33452..99bb832 100644 Binary files a/po/en_US.gmo and b/po/en_US.gmo differ diff --git a/po/en_US.po b/po/en_US.po index 0e69a3d..b54b592 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:56+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:48+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" "Language: en_US\n" @@ -28,12 +28,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Play Star Traders, a simple game of interstellar trading" @@ -43,22 +43,34 @@ msgstr "Play Star Traders, a simple game of interstellar trading" msgid "game;interstellar;trading;strategy;" msgstr "game;interstellar;trading;strategy;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders is a simple game of interstellar trading, where the object of the game is to create companies, buy and sell shares, " +"borrow and repay money, in order to become the wealthiest player (the winner)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: invalid value for --max-turn: ‘%s’\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: invalid operand ‘%s’\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: invalid game number ‘%s’\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: extra operand ‘%s’\n" @@ -66,7 +78,7 @@ msgstr "%s: extra operand ‘%s’\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -93,17 +105,17 @@ msgstr "" "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" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Try ‘%s --help’ for more information.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Usage: %s [OPTION ...] [GAME]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -112,7 +124,7 @@ msgstr "" "Play Star Traders, a simple game of interstellar trading.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -129,7 +141,7 @@ msgstr "" " --max-turn=NUM set the number of turns to NUM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -146,7 +158,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "Report bugs to %s <%s>.\n" @@ -156,19 +168,19 @@ msgstr "Report bugs to %s <%s>.\n" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "Report bugs to <%s>.\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Report %s bugs to <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Star Traders home page: <%s>.\n" @@ -1650,31 +1662,31 @@ msgctxt "answer" msgid "No" msgstr "No" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "out of memory" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ‘%s’" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ‘%lc’" diff --git a/po/eo.gmo b/po/eo.gmo index f211cc1..3a0c861 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 91e3c57..8738f62 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:57+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:49+1100\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -30,12 +30,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Ludi Star Traders, simpla ludo pri interstelara komerco" @@ -45,22 +45,34 @@ msgstr "Ludi Star Traders, simpla ludo pri interstelara komerco" msgid "game;interstellar;trading;strategy;" msgstr "ludo;kosmo;negoco;strategio;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders estas simpla ludo pri interstelara komerco, kie la celo de la ludo estas krei kompaniojn, aĉeti kaj vendi akciojn, " +"pruntepreni kaj repagi monon, por fariĝi la plej riĉa ludanto (la venkanto)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: malvalida valoro por --max-turn: '%s'\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: malvalida argumento '%s'\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: malvalida seanc-numero '%s'\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: troa argumento: '%s'\n" @@ -68,7 +80,7 @@ msgstr "%s: troa argumento: '%s'\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -96,17 +108,17 @@ msgstr "" "NENIU GARANTIO, laŭ plejamplekse permesite de la leĝo; konsultu la Permesilon\n" "por pli da detaloj.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Provu '%s --help' por pli da informoj.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Uzmaniero: %s [MODIFILO ...] [SEANCO]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -115,7 +127,7 @@ msgstr "" "Ludi Star Traders, simpla ludo pri interstelara komerco.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -132,7 +144,7 @@ msgstr "" " --max-turn=NUM difini la nombron da cikloj kiel NUM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -149,7 +161,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -161,7 +173,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -170,12 +182,12 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Raportu %s-misojn al <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Hejmpaĝo de Star Traders: <%s>.\n" @@ -1657,31 +1669,31 @@ msgctxt "answer" msgid "No" msgstr "Ne" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "memoro plenpleniĝas" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: '%s'" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: '%lc'" diff --git a/po/fi.gmo b/po/fi.gmo index e9dfd20..87599e7 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index bba9909..de75339 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:57+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:50+1100\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -30,12 +30,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Tähtikauppiaat" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä" @@ -45,22 +45,34 @@ msgstr "Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä" msgid "game;interstellar;trading;strategy;" msgstr "" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Tähtikauppiaat on yksinkertainen tähtienvälisen kaupan peli, jossa pelin tarkoitus on luoda yhtiöitä, ostaa ja myydä osakkeita, " +"lainata ja maksaa takaisin rahaa, tarkoituksena tulla varakkaimmaksi pelaajaksi (voittaja)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: virheellinen arvo valitsimelle --max-turn: ”%s”\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: virheellinen operandi ”%s”\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: virheellinen pelinumero ”%s”\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: ylimääräinen operandi ”%s”\n" @@ -68,7 +80,7 @@ msgstr "%s: ylimääräinen operandi ”%s”\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -95,17 +107,17 @@ msgstr "" "ja/tai jakaa sitä edelleen tiettyjen ehtojen mukaisesti. Tällä ohjelmalla\n" "EI OLE TAKUUTA, lain sallimassa laajuudessa; katso yksityiskohdat lisenssistä.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Lisätietoja saa komennolla ”%s --help”.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Käyttö: %s [VALITSIN ...] [PELI]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -114,7 +126,7 @@ msgstr "" "Pelaa Tähtikauppiaita, yksinkertaista tähtienvälisen kaupan peliä.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -131,7 +143,7 @@ msgstr "" " --max-turn=NUM aseta kierrrosten lukumääräksi NUM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -148,7 +160,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -161,7 +173,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -171,7 +183,7 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "" @@ -179,7 +191,7 @@ msgstr "" "Ilmoita käännösvirheistä osoitteeseen\n" ".\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Tähtikauppiaiden kotisivu: <%s>.\n" @@ -1661,31 +1673,31 @@ msgctxt "answer" msgid "No" msgstr "Ei" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "muisti loppui" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ”%s”" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" diff --git a/po/fr.gmo b/po/fr.gmo index fa4f20e..c234de9 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 5ef43b2..67c6866 100644 --- a/po/fr.po +++ b/po/fr.po @@ -19,10 +19,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:57+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:50+1100\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" @@ -36,12 +36,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Jouer à Star Traders, un simple jeu de commerce interstellaire" @@ -51,22 +51,34 @@ msgstr "Jouer à Star Traders, un simple jeu de commerce interstellaire" msgid "game;interstellar;trading;strategy;" msgstr "jeu;interstellaire;commerce;stratégie;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders est un simple jeu de commerce interstellaire où l'objectif du jeu est de créer des compagnies, acheter et vendre des " +"parts, emprunter et rembourser de l'argent dans le but de devenir le joueur le plus riche (le gagnant)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: valeur invalide pour --max-turn: « %s »\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: opérande invalide « %s »\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: numéro de jeu invalide « %s »\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: opérande surnuméraire « %s »\n" @@ -74,7 +86,7 @@ msgstr "%s: opérande surnuméraire « %s »\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -103,17 +115,17 @@ msgstr "" "vient avec AUCUNE GARANTIE, dans les limites permises par la loi; voyez\n" "la licence pour plus de détails.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Essayez « %s --help » pour plus d'informations.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Utilisation: %s [OPTION ...] [JEU]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -122,7 +134,7 @@ msgstr "" "Jouer à Star Traders, un simple jeu de commerce interstellaire.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -139,7 +151,7 @@ msgstr "" " --max-turn=NUM effectuer NUM tours\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -156,7 +168,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -168,7 +180,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -177,12 +189,12 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Rapportez les bugs %s à <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Page d'accueil de Star Traders: <%s>.\n" @@ -1676,31 +1688,31 @@ msgctxt "answer" msgid "No" msgstr "Non" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "pas assez de mémoire" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: « %s »" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: « %lc »" diff --git a/po/hr.gmo b/po/hr.gmo index 489f3e8..2f9824e 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index cd22724..34f25b2 100644 --- a/po/hr.po +++ b/po/hr.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:57+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:52+1100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" @@ -29,12 +29,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja" @@ -44,22 +44,34 @@ msgstr "Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja" msgid "game;interstellar;trading;strategy;" msgstr "" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"„Star Traders” (Međuzvjezdani trgovci) je jednostavna igra međuzvjezadnog trgovanja, gdje je cilj igre stvarati tvrtke, kupovati " +"i prodavati dionice te posuđivati i vraćati novac kako biste postali najbogatiji igrač (pobjednik)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: neispravna vrijednost za --max-turn: „%s”\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: neispravan operand „%s”\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: neispravan broj igre „%s”\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: operand viška „%s”\n" @@ -67,7 +79,7 @@ msgstr "%s: operand viška „%s”\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -94,17 +106,17 @@ msgstr "" "pod određenim uvjetima. Ovaj program NEMA JAMSTAVA, do krajnje mjere\n" "dozvoljene zakonom; pogledajte Licencu za pojedinosti.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Pokušajte „%s --help” za više informacija.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Uporaba: %s [OPCIJA ...] [IGRA]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -113,7 +125,7 @@ msgstr "" "Igrajte Star Traders, jednostavnu igru međuzvjezdanog trgovanja.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -130,7 +142,7 @@ msgstr "" " --max-turn=BROJ postavi broj poteza na BROJ\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -147,7 +159,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -159,7 +171,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -168,12 +180,12 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Prijavite greške %s na <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Star Traders početna stranica: <%s>.\n" @@ -1661,31 +1673,31 @@ msgctxt "answer" msgid "No" msgstr "Ne" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "nema dovoljno memorije" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s”" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc”" diff --git a/po/hu.gmo b/po/hu.gmo index 24739de..0eaa4ee 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index b6be4a1..cdf72eb 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:58+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:54+1100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -29,12 +29,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása" @@ -44,22 +44,34 @@ msgstr "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítá msgid "game;interstellar;trading;strategy;" msgstr "játék;csillagközi;kereskedés;stratégia;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"A Star Traders egy egyszerű csillagközi kereskedelmi játék, ahol a játék célja társaságok létrehozása, részvények vásárlása és " +"eladása, pénz kölcsönkérése és visszafizetése azért, hogy a leggazdagabb játékossá (győztessé) váljon." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: érvénytelen érték a --max-turn kapcsolóhoz: „%s”\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: érvénytelen operandus: „%s”\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: érvénytelen játékszám: „%s”\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: extra operandus: „%s”\n" @@ -67,7 +79,7 @@ msgstr "%s: extra operandus: „%s”\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -96,17 +108,17 @@ msgstr "" "törvény által megengedett mértékben; a részletekért tekintse meg a\n" "licencet.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: További információkért próbálja a(z) „%s --help” parancsot.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Használat: %s [KAPCSOLÓ …] [JÁTÉK]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -115,7 +127,7 @@ msgstr "" "A Star Traders, egy egyszerű csillagközi kereskedelmi játék indítása.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -132,7 +144,7 @@ msgstr "" " --max-turn=SZÁM körök számának beállítása SZÁMRA\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -149,7 +161,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "A hibák itt jelenthetők: %s <%s>.\n" @@ -159,19 +171,19 @@ msgstr "A hibák itt jelenthetők: %s <%s>.\n" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "A hibák itt jelenthetők: <%s>.\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "A %s hibái ezen a címen jelenthetők: <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "A Star Traders honlapja: <%s>.\n" @@ -1655,31 +1667,31 @@ msgctxt "answer" msgid "No" msgstr "Nem" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "nincs elég memória" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s”" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc”" diff --git a/po/nb.gmo b/po/nb.gmo index b7e97f6..b578bdc 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index 19f767b..e4e76ad 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:58+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:54+1100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -29,12 +29,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Spill Star Traders, et enkelt spill med interstellar handel" @@ -44,22 +44,34 @@ msgstr "Spill Star Traders, et enkelt spill med interstellar handel" msgid "game;interstellar;trading;strategy;" msgstr "spill;interstellar;handel;strategi;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders er et enkelt spill med interstellar handel, der målet med spillet er å opprette firmaer, kjøpe og selge aksjer, låne " +"og betale tilbake penger for å bli den rikeste spilleren (vinneren)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: ugyldig verdi for --max-turn: «%s»\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: ugyldig operand «%s»\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: ugyldig spillnummer «%s»\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: ekstra operand «%s»\n" @@ -67,7 +79,7 @@ msgstr "%s: ekstra operand «%s»\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -95,17 +107,17 @@ msgstr "" "programmet har INGEN GARANTI i den grad loven tillater, se lisens for\n" "detaljer.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Prøv «%s --help» for mer informasjon.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Bruksmåte: %s [VALG ...] [SPILL]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -114,7 +126,7 @@ msgstr "" "Spill Star Traders, et enkelt spill med interstellar handel.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -131,7 +143,7 @@ msgstr "" " --max-turn=NUM sette antall runder til NUM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -148,7 +160,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -160,7 +172,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -169,12 +181,12 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Rapporter %s feil til <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Star Traders hjemmeside: <%s>.\n" @@ -1656,31 +1668,31 @@ msgctxt "answer" msgid "No" msgstr "Nei" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "ikke mer minne" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: «%s»" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: «%lc»" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 7e94343..05f5744 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 59b10e6..ef99ca1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 16:58+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:55+1100\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -30,12 +30,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Comerciantes Estelares" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Jogue Comerciantes Estelares, um jogo simples de comércio interestelar" @@ -45,22 +45,34 @@ msgstr "Jogue Comerciantes Estelares, um jogo simples de comércio interestelar" msgid "game;interstellar;trading;strategy;" msgstr "jogo;interestelar;comércio;estratégia;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Comerciantes Estelares é um jogo simples de negociação interestelar, cujo objetivo é criar empresas, comprar e vender ações, " +"emprestar e pagar dinheiro, para se tornar o jogador mais rico (o vencedor)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: valor inválido para --max-turn: “%s”\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: operando inválido “%s”\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: número de jogo inválido “%s”\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: operando extra “%s”\n" @@ -68,7 +80,7 @@ msgstr "%s: operando extra “%s”\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -95,17 +107,17 @@ msgstr "" "e/ou distribuí-lo sob certas condições. Este programa NÃO TEM GARANTIA,\n" "na extensão permitida por lei; consulte a licença para obter detalhes.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Tente “%s --help” para mais informações.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Uso: %s [OPÇÃO ...] [JOGO]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -114,7 +126,7 @@ msgstr "" "Jogue Comerciantes Estelares, um jogo simples de comércio interestelar.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -131,7 +143,7 @@ msgstr "" " --max-turn=NÚM define o número de turnos para NÚM\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -148,7 +160,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -160,7 +172,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -169,12 +181,12 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Relate erros de %s para <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Site do Comerciantes Estelares: <%s>.\n" @@ -1657,31 +1669,31 @@ msgctxt "answer" msgid "No" msgstr "Não" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "memória esgotada" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: “%s”" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NULO" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: “%lc”" diff --git a/po/ru.gmo b/po/ru.gmo index a552c4c..2146d1d 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 6e1ab14..d0a9022 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,10 +15,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-08 00:14+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:56+1100\n" "Last-Translator: John Zaitseff \n" "Language-Team: Russian \n" "Language: ru\n" @@ -31,12 +31,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Звёздные торговцы" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Играть в «Звёздные торговцы», простую игру о межзвёздной торговле" @@ -46,22 +46,34 @@ msgstr "Играть в «Звёздные торговцы», простую и msgid "game;interstellar;trading;strategy;" msgstr "игра;межзвёздная;торговля;стратегия;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"«Звёздные торговцы» — это простая игра о межзвёздной торговле, где целью игры является создание компаний, покупка и продажа " +"акций, получение и погашение кредита, чтобы стать самым богатым игроком-победителем." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: неверное значение аргумента для --max-turn: «%s»\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: неверный аргумент «%s»\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: неверный номер игры «%s»\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: лишний аргумент «%s»\n" @@ -69,7 +81,7 @@ msgstr "%s: лишний аргумент «%s»\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -97,17 +109,17 @@ msgstr "" "ГАРАНТИЙ до степени, разрешённой законом. Для получения более подробной\n" "информации, обратитесь к веб-странице .\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Попробуйте «%s --help» для получения более подробного описания.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Использование: %s [КЛЮЧ ...] [ИГРА]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -116,7 +128,7 @@ msgstr "" "Играть в «Звёздные торговцы», простую игру о межзвёздной торговле.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -133,7 +145,7 @@ msgstr "" " --max-turn=НОМЕР установить НОМЕР как максимальный ход игры\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -151,7 +163,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -163,7 +175,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -172,12 +184,12 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Об ошибках в %s сообщайте по адресу <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "" @@ -1666,31 +1678,31 @@ msgctxt "answer" msgid "No" msgstr "Нет" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "недостаточно памяти" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: «%s»" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: «%lc»" diff --git a/po/sr.gmo b/po/sr.gmo index 5b54f6a..8f8b36b 100644 Binary files a/po/sr.gmo and b/po/sr.gmo differ diff --git a/po/sr.po b/po/sr.po index 142d405..7041cf5 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 17:00+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:56+1100\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" @@ -30,12 +30,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Звездани трговци" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Играјте Звездане трговце, једноставну игру међузвезданог трговања" @@ -45,22 +45,34 @@ msgstr "Играјте Звездане трговце, једноставну msgid "game;interstellar;trading;strategy;" msgstr "игра;међузвездано;трговање;стратегиј;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Звездани трговци је једноставна игра међузвезданог трговања, у којој треба да оснивате предузећа, купујете и продајете акције, " +"позајмљујете и враћате новац, да бисте постали најбогатији играч (победник)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "Џон Зајцеф (John Zaitseff)" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: неисправна вредност за „--max-turn“: „%s“\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: неисправан операнд „%s“\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: неисправан број игре „%s“\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: додатни операнд „%s“\n" @@ -68,7 +80,7 @@ msgstr "%s: додатни операнд „%s“\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -95,17 +107,17 @@ msgstr "" "и/или расподељујете под одређеним условима. Овај програм је БЕЗ ГАРАНЦИЈЕ,\n" "у мери у којој то допушта закон; погледајте лиценцу за више детаља.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Пробајте „%s --help“ за више података.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Употреба: %s [ОПЦИЈА ...] [ИГРА]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -114,7 +126,7 @@ msgstr "" "Играјте Звездане трговце, једноставну игру међузвезданог трговања.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -131,7 +143,7 @@ msgstr "" " --max-turn=БРОЈ поставља број враћања на БРОЈ\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -148,7 +160,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "Грешке пријавите програмеру %s <%s>.\n" @@ -158,19 +170,19 @@ msgstr "Грешке пријавите програмеру %s <%s>.\n" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "Грешке пријавите на <%s>.\n" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Грешке „%s“ пријавите на <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Матична страница: <%s>.\n" @@ -1658,31 +1670,31 @@ msgctxt "answer" msgid "No" msgstr "Не" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "нема више меморије" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s“" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: НИШТА" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" diff --git a/po/sv.gmo b/po/sv.gmo index c6f29ac..d8b187c 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index faaaf24..3c3bf6f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" -"PO-Revision-Date: 2021-01-07 17:00+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" +"PO-Revision-Date: 2021-01-14 08:56+1100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -29,12 +29,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "Star Traders" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "Spela Star Traders, ett enkelt spel om interstellär handel" @@ -44,22 +44,34 @@ msgstr "Spela Star Traders, ett enkelt spel om interstellär handel" msgid "game;interstellar;trading;strategy;" msgstr "spel;interstellär;handel;strategi;" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" +"Star Traders är ett enkelt spel om interstellär handel, där spelets mål är att bilda företag, köpa och sälja aktier, låna och " +"betala tillbaka pengar för att bli den rikaste spelaren (vinnaren)." + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "John Zaitseff" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: ogiltigt värde för --max-turn: ”%s”\n" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "%s: ogiltig operand ”%s”\n" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "%s: ogiltigt spelnummer ”%s”\n" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "%s: extra operand ”%s”\n" @@ -67,7 +79,7 @@ msgstr "%s: extra operand ”%s”\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -94,17 +106,17 @@ msgstr "" "distribuera det under vissa villkor. Detta program har INGEN GARANTI så långt\n" "lagen tillåter; se licensen för detaljer.\n" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Prova ”%s --help” för mer information.\n" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "Användning: %s [FLAGGA …] [SPEL]\n" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" @@ -113,7 +125,7 @@ msgstr "" "Spela Star Traders, ett enkelt spel om interstellär handel.\n" "\n" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -130,7 +142,7 @@ msgstr "" " --max-turn=ANT ställ in antalet omgångar till ANT\n" "\n" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -147,7 +159,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -159,7 +171,7 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" @@ -168,12 +180,12 @@ msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "Rapportera %s-fel till <%s>.\n" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "Webbplats för Star Traders: <%s>.\n" @@ -1661,31 +1673,31 @@ msgctxt "answer" msgid "No" msgstr "Nej" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "%s: " -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr ": " -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "slut på minne" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: ”%s”" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "xwcrtomb: NUL" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: ”%lc”" diff --git a/po/trader.pot b/po/trader.pot index e638993..523f0b8 100644 --- a/po/trader.pot +++ b/po/trader.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: trader 7.15\n" +"Project-Id-Version: trader 7.16\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2021-01-12 11:31+1100\n" +"POT-Creation-Date: 2021-01-19 16:43+1100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,12 +22,12 @@ msgstr "" #. your own language (recommended) or keep it the same as the English #. version. Feel free to look through other translations to see how #. others have done this. -#: data/trader.desktop.in:23 src/intf.c:611 +#: data/trader.desktop.in:23 data/trader.appdata.xml.in:26 src/intf.c:611 #, c-format msgid "Star Traders" msgstr "" -#: data/trader.desktop.in:24 +#: data/trader.desktop.in:24 data/trader.appdata.xml.in:27 msgid "Play Star Traders, a simple game of interstellar trading" msgstr "" @@ -37,22 +37,32 @@ msgstr "" msgid "game;interstellar;trading;strategy;" msgstr "" -#: src/trader.c:235 +#: data/trader.appdata.xml.in:29 +msgid "" +"Star Traders is a simple game of interstellar trading, where the objective is to create companies, buy and sell shares, borrow " +"and repay money, in order to become the wealthiest player (the winner)." +msgstr "" + +#: data/trader.appdata.xml.in:48 +msgid "John Zaitseff" +msgstr "" + +#: src/trader.c:238 #, c-format msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "" -#: src/trader.c:251 +#: src/trader.c:254 #, c-format msgid "%s: invalid operand '%s'\n" msgstr "" -#: src/trader.c:260 +#: src/trader.c:263 #, c-format msgid "%s: invalid game number '%s'\n" msgstr "" -#: src/trader.c:269 +#: src/trader.c:272 #, c-format msgid "%s: extra operand '%s'\n" msgstr "" @@ -60,7 +70,7 @@ msgstr "" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper #. name of the author. The IPA pronunciation in this comment is in #. UTF-8 encoding. -#: src/trader.c:284 +#: src/trader.c:287 #, c-format msgid "" "Star Traders (%s) %s\n" @@ -76,24 +86,24 @@ msgid "" "NO WARRANTY, to the extent permitted by law; see the License for details.\n" msgstr "" -#: src/trader.c:308 +#: src/trader.c:311 #, c-format msgid "%s: Try '%s --help' for more information.\n" msgstr "" -#: src/trader.c:311 +#: src/trader.c:314 #, c-format msgid "Usage: %s [OPTION ...] [GAME]\n" msgstr "" -#: src/trader.c:312 +#: src/trader.c:315 #, c-format msgid "" "Play Star Traders, a simple game of interstellar trading.\n" "\n" msgstr "" -#: src/trader.c:315 +#: src/trader.c:318 #, c-format msgid "" "Options:\n" @@ -104,7 +114,7 @@ msgid "" "\n" msgstr "" -#: src/trader.c:322 +#: src/trader.c:325 #, c-format msgid "" "If GAME is specified as a number between 1 and 9, load and continue\n" @@ -118,7 +128,7 @@ msgstr "" #. with the (translated) text "Report translation bugs to #.
\n", with ADDRESS replaced with either an email #. address or web URL for reporting bugs in your translation. -#: src/trader.c:334 +#: src/trader.c:337 #, c-format msgid "Report bugs to %s <%s>.\n" msgstr "" @@ -128,19 +138,19 @@ msgstr "" #. (translated) text "Report translation bugs to
\n", #. with ADDRESS replaced with either an email address or web URL #. for reporting bugs in your translation. -#: src/trader.c:341 +#: src/trader.c:344 #, c-format msgid "Report bugs to <%s>.\n" msgstr "" #. TRANSLATORS: The first %s is for packagers and may be #. something like "Debian". -#: src/trader.c:346 +#: src/trader.c:349 #, c-format msgid "Report %s bugs to <%s>.\n" msgstr "" -#: src/trader.c:349 +#: src/trader.c:352 #, c-format msgid "Star Traders home page: <%s>.\n" msgstr "" @@ -1480,31 +1490,31 @@ msgctxt "answer" msgid "No" msgstr "" -#: src/utils.c:481 src/utils.c:502 +#: src/utils.c:489 src/utils.c:510 #, c-format msgid "%s: " msgstr "" -#: src/utils.c:507 +#: src/utils.c:515 msgid ": " msgstr "" -#: src/utils.c:520 +#: src/utils.c:528 #, c-format msgid "out of memory" msgstr "" -#: src/utils.c:1235 +#: src/utils.c:1265 #, c-format msgid "xmbstowcs: '%s'" msgstr "" -#: src/utils.c:1275 +#: src/utils.c:1305 #, c-format msgid "xwcrtomb: NUL" msgstr "" -#: src/utils.c:1280 +#: src/utils.c:1310 #, c-format msgid "xwcrtomb: '%lc'" msgstr "" diff --git a/src/Makefile.in b/src/Makefile.in index ee5c935..baae85b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1147,6 +1147,7 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appdatadir = @appdatadir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/src/trader.c b/src/trader.c index ed0bb80..b3a8053 100644 --- a/src/trader.c +++ b/src/trader.c @@ -117,6 +117,19 @@ static void show_version (void) __attribute__((noreturn)); static void show_usage (int status) __attribute__((noreturn)); +/* + Function: init_program_prelim - Initialise program preliminaries + Parameters: argc - Same as passed to main() + argv - Same as passed to main() + Returns: (nothing) + + This function initialises the program name, locale and message + catalogs. It must be called before command line arguments are + processed. +*/ +static void init_program_prelim (int argc, char *argv[]); + + /* Function: init_program - Initialise program-wide functions Parameters: (none) @@ -146,18 +159,8 @@ static void end_program (void); int main (int argc, char *argv[]) { - // Strip off leading pathname components from program name - init_program_name(argv[0]); - - // Initialise the locale - if (setlocale(LC_ALL, "") == NULL) { - err_exit("could not set locale " - "(check LANG, LC_ALL and LANGUAGE in environment)"); - } - - // Use correct message catalogs for the locale - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); + // Initialise program name, locale and message catalogs + init_program_prelim(argc, argv); // Process command line arguments process_cmdline(argc, argv); @@ -361,6 +364,19 @@ playing that game. If GAME is not specified, start a new game.\n\n\ // These functions are documented at the start of this file +/***********************************************************************/ +// init_program_prelim: Initialise program preliminaries + +void init_program_prelim (int argc, char *argv[]) +{ + // Strip off leading pathname components from program name + init_program_name(argv[0]); + + // Initialise the locale and message catalogs + init_locale(); +} + + /***********************************************************************/ // init_program: Initialise program-wide functions @@ -370,7 +386,7 @@ void init_program (void) init_rand(); // Initialise locale-specific variables - init_locale(); + init_locale_vars(); // Initialise the terminal display init_screen(); diff --git a/src/utils.c b/src/utils.c index fa9c8de..2fd36c7 100644 --- a/src/utils.c +++ b/src/utils.c @@ -53,6 +53,8 @@ wchar_t *mon_thousands_sep; // Locale's monetary thousands separator * Module-specific constants and macros * ************************************************************************/ +#define APPIMAGE_NAME "AppRun.wrapped" + #define DIRSEP "/" // Directory separator #define HIDDEN_PATH "." // Hidden file start char #define XDG_DATA_DEFAULT ".local" DIRSEP "share" @@ -325,6 +327,12 @@ void init_program_name (const char *argv0) } else { program_name = xstrdup(argv0); } + + // Prevent the AppImage internal name from leaking out + if (strcmp(program_name, APPIMAGE_NAME) == 0) { + free((void *) program_name); + program_name = PACKAGE; + } } } @@ -574,9 +582,31 @@ extern int randi (int limit) /***********************************************************************/ -// init_locale: Initialise locale-specific variables +// init_locale: Initialise locale and message catalogs -void init_locale (void) +extern void init_locale (void) +{ + const char *podir = getenv("TEXTDOMAINDIR"); + + + // Initialise the current locale + if (setlocale(LC_ALL, "") == NULL) { + err_exit("could not set locale " + "(check LANG, LC_ALL and LANGUAGE in environment)"); + } + + // Use correct message catalogs for the locale + bindtextdomain( + PACKAGE, + (podir != NULL && *podir != '\0') ? podir : LOCALEDIR); + textdomain(PACKAGE); +} + + +/***********************************************************************/ +// init_locale_vars: Initialise locale-specific variables + +void init_locale_vars (void) { char *cur, *cloc; struct lconv *lc; diff --git a/src/utils.h b/src/utils.h index 54089cd..8482c90 100644 --- a/src/utils.h +++ b/src/utils.h @@ -230,7 +230,22 @@ extern int randi (int limit); ************************************************************************/ /* - Function: init_locale - Initialise locale-specific variables + Function: init_locale - Initialise locale and message catalogs + Parameters: (none) + Returns: (nothing) + + This function initialises the locale and message catalog used by this + program. If the TEXTDOMAINDIR environment variable is set, the message + catalog must reside in that location, otherwise it must be in the + location specified during "./configure" via the "--localedir" option. + This function must be called before using any locale or Gettext + functions. +*/ +extern void init_locale (void); + + +/* + Function: init_locale_vars - Initialise locale-specific variables Parameters: (none) Returns: (nothing) @@ -241,7 +256,7 @@ extern int randi (int limit); and frac_digits members of lconvinfo are updated to be something reasonable. This function must be called before using localeconf_info. */ -extern void init_locale (void); +extern void init_locale_vars (void); /*