aniani/trader
1
0
Fork 0
mirror of https://git.zap.org.au/git/trader.git synced 2025-02-02 15:08:13 -05:00
Code

Merge branch with-autogenerated into with-debian: bug fix in utils.c

Browse Source
This commit is contained in:
John Zaitseff 2017-06-18 06:59:12 +10:00
commit 32c5e755a2
46 changed files with 102 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
INSTALL
View File

@ -102,12 +102,12 @@ You can also run configure in a separate build-only directory tree. This
feature requires GNU Make and allows you to keep the source code tree from 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 being modified by the compilation process. To use this option, create a
separate build directory, then run configure. For example, if you placed separate build directory, then run configure. For example, if you placed
the Star Traders source code tree in $HOME/src/trader-7.10, you could run the Star Traders source code tree in $HOME/src/trader-7.11, you could run
something like: something like:
mkdir $HOME/build/trader-build-7.10 mkdir $HOME/build/trader-build-7.11
cd $HOME/build/trader-build-7.10 cd $HOME/build/trader-build-7.11
$HOME/src/trader-7.10/configure $HOME/src/trader-7.11/configure
Once again, the Autoconf manual describes these options (and many others): Once again, the Autoconf manual describes these options (and many others):

2
Makefile.in
View File

@ -233,7 +233,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/build-aux/install-sh \ $(top_srcdir)/build-aux/install-sh \
$(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \ $(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \
build-aux/README build-aux/compile build-aux/config.guess \ build-aux/README build-aux/compile build-aux/config.guess \
build-aux/config.rpath build-aux/config.sub \ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/missing build-aux/install-sh build-aux/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION) distdir = $(PACKAGE)-$(VERSION)

8
NEWS
View File

@ -15,6 +15,14 @@ browse the Git repository on The ZAP Group web server at the following
location: http://www.zap.org.au/gitweb/trader.git location: http://www.zap.org.au/gitweb/trader.git
Version 7.11 (18th June, 2017)
------------------------------
Bug fix: some architectures (such as ARM, PowerPC and S390) treat "char"
as "unsigned char", and this caused b64decode() to fail while loading a
saved game. Changed the relevant type from "char" to "int" to fix this.
Version 7.10 (2nd June, 2017) Version 7.10 (2nd June, 2017)
----------------------------- -----------------------------

3
config.h.in
View File

@ -1034,6 +1034,9 @@
/* Define to 1 if you need to in order for 'stat' and other things to work. */ /* Define to 1 if you need to in order for 'stat' and other things to work. */
#undef _POSIX_SOURCE #undef _POSIX_SOURCE
/* For standard stat data types on VMS. */
#undef _USE_STD_STAT
/* Define to rpl_ if the getopt replacement functions and variables should be /* Define to rpl_ if the getopt replacement functions and variables should be
used. */ used. */
#undef __GETOPT_PREFIX #undef __GETOPT_PREFIX

24
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Star Traders 7.10. # Generated by GNU Autoconf 2.69 for Star Traders 7.11.
# #
# Report bugs to <J.Zaitseff@zap.org.au>. # Report bugs to <J.Zaitseff@zap.org.au>.
# #
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='Star Traders' PACKAGE_NAME='Star Traders'
PACKAGE_TARNAME='trader' PACKAGE_TARNAME='trader'
PACKAGE_VERSION='7.10' PACKAGE_VERSION='7.11'
PACKAGE_STRING='Star Traders 7.10' PACKAGE_STRING='Star Traders 7.11'
PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au' PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au'
PACKAGE_URL='http://www.zap.org.au/software/trader/' PACKAGE_URL='http://www.zap.org.au/software/trader/'
@ -2051,7 +2051,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures Star Traders 7.10 to adapt to many kinds of systems. \`configure' configures Star Traders 7.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -2122,7 +2122,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of Star Traders 7.10:";; short | recursive ) echo "Configuration of Star Traders 7.11:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -2239,7 +2239,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
Star Traders configure 7.10 Star Traders configure 7.11
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -2891,7 +2891,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by Star Traders $as_me 7.10, which was It was created by Star Traders $as_me 7.11, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -3791,7 +3791,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='trader' PACKAGE='trader'
VERSION='7.10' VERSION='7.11'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -12984,6 +12984,10 @@ fi
$as_echo "#define _USE_STD_STAT 1" >>confdefs.h
@ -20490,7 +20494,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by Star Traders $as_me 7.10, which was This file was extended by Star Traders $as_me 7.11, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -20557,7 +20561,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
Star Traders config.status 7.10 Star Traders config.status 7.11
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.ac
View File

@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see http://www.gnu.org/licenses/. dnl along with this program. If not, see http://www.gnu.org/licenses/.
AC_INIT([Star Traders], [7.10], [J.Zaitseff@zap.org.au], [trader], AC_INIT([Star Traders], [7.11], [J.Zaitseff@zap.org.au], [trader],
[http://www.zap.org.au/software/trader/]) [http://www.zap.org.au/software/trader/])
AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])

2
doc/trader.6
View File

@ -41,7 +41,7 @@
.if \n[.g] .mso www.tmac .if \n[.g] .mso www.tmac
.\" .\"
.\" ********************************************************************* .\" *********************************************************************
.TH TRADER 6 "2nd June, 2017" "Unix-like systems" .TH TRADER 6 "18th June, 2017" "Unix-like systems"
.SH NAME .SH NAME
trader \- a game of interstellar trading trader \- a game of interstellar trading
.\" ********************************************************************* .\" *********************************************************************

5
lib/getopt-pfx-core.h
View File

@ -47,6 +47,11 @@
# define opterr __GETOPT_ID (opterr) # define opterr __GETOPT_ID (opterr)
# define optind __GETOPT_ID (optind) # define optind __GETOPT_ID (optind)
# define optopt __GETOPT_ID (optopt) # define optopt __GETOPT_ID (optopt)
/* The system's getopt.h may have already included getopt-core.h to
declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that
getopt-core.h declares them with prefixes. */
# undef _GETOPT_CORE_H
#endif #endif
#include <getopt-core.h> #include <getopt-core.h>

5
lib/getopt-pfx-ext.h
View File

@ -45,6 +45,11 @@
# define getopt_long_only __GETOPT_ID (getopt_long_only) # define getopt_long_only __GETOPT_ID (getopt_long_only)
# define option __GETOPT_ID (option) # define option __GETOPT_ID (option)
# define _getopt_internal __GETOPT_ID (getopt_internal) # define _getopt_internal __GETOPT_ID (getopt_internal)
/* The system's getopt.h may have already included getopt-ext.h to
declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that
getopt-ext.h declares them with prefixes. */
# undef _GETOPT_EXT_H
#endif #endif
/* Standalone applications get correct prototypes for getopt_long and /* Standalone applications get correct prototypes for getopt_long and

3
lib/gettext.h
View File

@ -185,7 +185,8 @@ npgettext_aux (const char *domain,
#include <string.h> #include <string.h>
#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ #if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
/* || __STDC_VERSION__ >= 199901L */ ) /* || __STDC_VERSION__ == 199901L
|| (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ )
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
#else #else
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0

1
m4/.gitignore vendored
View File

@ -0,0 +1 @@
/gnulib-tool.m4

5
m4/sys_types_h.m4
View File

@ -1,4 +1,4 @@
# sys_types_h.m4 serial 7 # sys_types_h.m4 serial 8
dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -6,6 +6,9 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN_ONCE([gl_SYS_TYPES_H], AC_DEFUN_ONCE([gl_SYS_TYPES_H],
[ [
dnl Use sane struct stat types in OpenVMS 8.2 and later.
AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.])
AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
gl_NEXT_HEADERS([sys/types.h]) gl_NEXT_HEADERS([sys/types.h])

BIN
po/da.gmo
View File

Binary file not shown.

6
po/da.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:26+1000\n" "PO-Revision-Date: 2017-06-18 06:02+1000\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\n" "Language: da\n"

BIN
po/de.gmo
View File

Binary file not shown.

6
po/de.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:02+1000\n"
"Last-Translator: Philipp Thomas <pth@suse.de>\n" "Last-Translator: Philipp Thomas <pth@suse.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n" "Language: de\n"

BIN
po/en@quot.gmo
View File

Binary file not shown.

6
po/en@quot.po
View File

@ -27,10 +27,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:31+1000\n" "PO-Revision-Date: 2017-06-18 06:01+1000\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
"Language: en@quot\n" "Language: en@quot\n"

BIN
po/en_AU.gmo
View File

Binary file not shown.

6
po/en_AU.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:02+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n" "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (Australian) <(nothing)>\n" "Language-Team: English (Australian) <(nothing)>\n"
"Language: en_AU\n" "Language: en_AU\n"

BIN
po/en_CA.gmo
View File

Binary file not shown.

6
po/en_CA.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:02+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n" "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (Canadian) <(nothing)>\n" "Language-Team: English (Canadian) <(nothing)>\n"
"Language: en_CA\n" "Language: en_CA\n"

BIN
po/en_GB.gmo
View File

Binary file not shown.

6
po/en_GB.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n" "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (British) <(nothing)>\n" "Language-Team: English (British) <(nothing)>\n"
"Language: en_GB\n" "Language: en_GB\n"

BIN
po/en_US.gmo
View File

Binary file not shown.

6
po/en_US.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n" "Last-Translator: John Zaitseff <J.Zaitseff@zap.org.au>\n"
"Language-Team: English (US) <(nothing)>\n" "Language-Team: English (US) <(nothing)>\n"
"Language: en_US\n" "Language: en_US\n"

BIN
po/eo.gmo
View File

Binary file not shown.

6
po/eo.po
View File

@ -13,10 +13,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"Language: eo\n" "Language: eo\n"

BIN
po/fi.gmo
View File

Binary file not shown.

6
po/fi.po
View File

@ -13,10 +13,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n" "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
"Language: fi\n" "Language: fi\n"

BIN
po/fr.gmo
View File

Binary file not shown.

6
po/fr.po
View File

@ -19,10 +19,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n" "Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n" "Language: fr\n"

BIN
po/hr.gmo
View File

Binary file not shown.

6
po/hr.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n" "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n" "Language: hr\n"

BIN
po/hu.gmo
View File

Binary file not shown.

6
po/hu.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
"Language: hu\n" "Language: hu\n"

BIN
po/nb.gmo
View File

Binary file not shown.

6
po/nb.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n" "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n" "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n" "Language: nb\n"

BIN
po/ru.gmo
View File

Binary file not shown.

6
po/ru.po
View File

@ -15,10 +15,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n" "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
"Language-Team: Russian <gnu@mx.ru>\n" "Language-Team: Russian <gnu@mx.ru>\n"
"Language: ru\n" "Language: ru\n"

BIN
po/sr.gmo
View File

Binary file not shown.

6
po/sr.po
View File

@ -13,10 +13,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n" "Language-Team: Serbian <(nothing)>\n"
"Language: sr\n" "Language: sr\n"

BIN
po/sv.gmo
View File

Binary file not shown.

6
po/sv.po
View File

@ -12,10 +12,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: 2017-06-02 05:27+1000\n" "PO-Revision-Date: 2017-06-18 06:03+1000\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n" "Language: sv\n"

4
po/trader.pot
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: trader 7.10\n" "Project-Id-Version: trader 7.11\n"
"Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n"
"POT-Creation-Date: 2017-06-02 05:31+1000\n" "POT-Creation-Date: 2017-06-18 06:01+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

6
src/utils.c
View File

@ -873,10 +873,10 @@ ssize_t b64decode (const void *restrict in, size_t inlen,
n = 1; n = 1;
for (size_t i = 0; i < inlen && *u_in != '\0'; i++, u_in++) { for (size_t i = 0; i < inlen && *u_in != '\0'; i++, u_in++) {
char c = *u_in > UNSCRAMBLE_TABLE_SIZE ? int v = *u_in > UNSCRAMBLE_TABLE_SIZE ?
UNSCRAMBLE_INVALID : unscramble_table[*u_in]; UNSCRAMBLE_INVALID : unscramble_table[*u_in];
switch (c) { switch (v) {
case UNSCRAMBLE_INVALID: case UNSCRAMBLE_INVALID:
return -1; return -1;
@ -889,7 +889,7 @@ ssize_t b64decode (const void *restrict in, size_t inlen,
continue; continue;
default: default:
n = n << 6 | c; // c is 0 .. 63 n = n << 6 | v; // v is 0 .. 63
if (n & 0x1000000) { if (n & 0x1000000) {
// Convert 24-bit number into three output bytes // Convert 24-bit number into three output bytes