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