Imported Upstream version 8.4.3

26 files changed, 153 insertions, 128 deletions

diff --git a/config.h.in b/config.h.in
index d2bee46..0137e14 100644
--- a/config.h.in
+++ b/config.h.in
@@ -37,6 +37,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `isascii' function. */
+#undef HAVE_ISASCII
+
 /* Define to 1 if you have the `cdio' library (-lcdio). */
 #undef HAVE_LIBCDIO
 
diff --git a/configure b/configure
index 43f9679..1cc3fac 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 daisy-player 8.4.1.
+# Generated by GNU Autoconf 2.69 for daisy-player 8.4.3.
 #
 # Report bugs to <jos@jlemmens.nl>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='daisy-player'
 PACKAGE_TARNAME='daisy-player'
-PACKAGE_VERSION='8.4.1'
-PACKAGE_STRING='daisy-player 8.4.1'
+PACKAGE_VERSION='8.4.3'
+PACKAGE_STRING='daisy-player 8.4.3'
 PACKAGE_BUGREPORT='jos@jlemmens.nl'
 PACKAGE_URL=''
 
@@ -1304,7 +1304,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 daisy-player 8.4.1 to adapt to many kinds of systems.
+\`configure' configures daisy-player 8.4.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1374,7 +1374,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of daisy-player 8.4.1:";;
+     short | recursive ) echo "Configuration of daisy-player 8.4.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1474,7 +1474,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-daisy-player configure 8.4.1
+daisy-player configure 8.4.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2011,7 +2011,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 daisy-player $as_me 8.4.1, which was
+It was created by daisy-player $as_me 8.4.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2827,7 +2827,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='daisy-player'
- VERSION='8.4.1'
+ VERSION='8.4.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7684,6 +7684,17 @@ _ACEOF
 fi
 done
 
+for ac_func in isascii
+do :
+  ac_fn_c_check_func "$LINENO" "isascii" "ac_cv_func_isascii"
+if test "x$ac_cv_func_isascii" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ISASCII 1
+_ACEOF
+
+fi
+done
+
 
 ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile man/Makefile po/Makefile.in src/Makefile"
 
@@ -8213,7 +8224,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 daisy-player $as_me 8.4.1, which was
+This file was extended by daisy-player $as_me 8.4.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8279,7 +8290,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="\\
-daisy-player config.status 8.4.1
+daisy-player config.status 8.4.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 910a0a0..33a3d77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([daisy-player], [8.4.1], [jos@jlemmens.nl])
+AC_INIT([daisy-player], [8.4.3], [jos@jlemmens.nl])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
@@ -49,6 +49,7 @@ AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([atexit ftruncate mkdir select setlocale strcasecmp strchr strdup strerror strrchr strstr])
+AC_CHECK_FUNCS([isascii])
 
 AC_CONFIG_FILES([Makefile
                  doc/Makefile
diff --git a/doc/Changelog b/doc/Changelog
index 473ab23..e46e7ec 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -149,3 +149,13 @@ Samuel Thibault <sthibault@debian.org>
 	only ".zip" files.
 8.4.1   Added setlocale (LC_ALL, getenv ("LANGUAGE")); and
 	setlocale (LC_ALL, getenv ("LANG"));
+8.4.2	-   setlocale (LC_ALL, getenv ("LC_ALL"));
+	-   setlocale (LC_ALL, getenv ("LANGUAGE"));
+	-   setlocale (LC_ALL, getenv ("LANG"));
+	+   setlocale (LC_ALL, "");
+	In 84.1 two lines were accidentally deleted:
+
+	   str = (char *) malloc (MAX_STR);
+	   s = MAX_STR - 1;
+
+	are introduced again.
diff --git a/doc/daisy-player.html b/doc/daisy-player.html
index b4a431e..79ae55c 100644
--- a/doc/daisy-player.html
+++ b/doc/daisy-player.html
@@ -2,7 +2,7 @@
 <HTML><HEAD><TITLE>Man page of daisy-player</TITLE>
 </HEAD><BODY>
 <H1>daisy-player</H1>
-Section: Linux Reference Manual (1)<BR>Updated: 20 October 2013<BR><A HREF="#index">Index</A>
+Section: Linux Reference Manual (1)<BR>Updated: 23 October 2013<BR><A HREF="#index">Index</A>
 <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR>
 
 <A NAME="lbAB">&nbsp;</A>
@@ -239,6 +239,6 @@ This program is free software; you can redistribute it and/or modify it under th
 This document was created by
 <A HREF="/cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
-Time: 12:26:08 GMT, October 20, 2013
+Time: 09:22:42 GMT, October 23, 2013
 </BODY>
 </HTML>
diff --git a/man/daisy-player.1 b/man/daisy-player.1
index fdb128a..ed93442 100644
--- a/man/daisy-player.1
+++ b/man/daisy-player.1
@@ -1,5 +1,5 @@
 .\"Text automatically generated by txt2man
-.TH daisy-player 1 "20 October 2013" "man" "Linux Reference Manual"
+.TH daisy-player 1 "23 October 2013" "man" "Linux Reference Manual"
 .SH NAME
 \fBdaisy-player \fP- player for DAISY Digital Talking Books or Audio-CD's
 \fB
diff --git a/po/af.gmo b/po/af.gmo
index 72cb350..5d64543 100644
--- a/po/af.gmo
+++ b/po/af.gmo
diff --git a/po/af.po b/po/af.po
index 43a47e7..9625c6a 100644
--- a/po/af.po
+++ b/po/af.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
 "PO-Revision-Date: 2013-01-29 15:06+0200\n"
 "Last-Translator: Willem van der Walt <wvdwalt@csir.co.za>>\n"
 "Language-Team: Willem van der Walt <wvdwalt@csir.co.za>\n"
@@ -255,7 +255,7 @@ msgstr ""
 "Kan nie /proc/mounts lees nie."
 
 # 13
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - weergawe %s\n"
@@ -285,11 +285,11 @@ msgstr ""
 "Kan nie /proc/mounts lees nie."
 
 # 6
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr "'n program om Daisy CD's in Linux te speel\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
@@ -298,12 +298,12 @@ msgstr ""
 "\n"
 "Daisy-player het die \"udisks\" program nodig.\n"
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr "Installeer dit asseblief en probeer weer.\n"
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
@@ -312,11 +312,11 @@ msgstr ""
 "\n"
 "Daisy-player het die \"madplay\" program nodig.\n"
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr "Besig om vir 'n DAISY CD te soek..."
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
@@ -325,7 +325,7 @@ msgstr ""
 "\n"
 "Daisy-player het die \"unar\" program nodig.\n"
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -335,7 +335,7 @@ msgstr ""
 "Geen DAISY CD of audio CD is gekry nie\n"
 
 # 36
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "Daar is nie 'n daisy-cd in die CD speler nie."
 
diff --git a/po/daisy-player.pot b/po/daisy-player.pot
index a3a610d..593d75c 100644
--- a/po/daisy-player.pot
+++ b/po/daisy-player.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: daisy-player 8.4.1\n"
+"Project-Id-Version: daisy-player 8.4.3\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -192,7 +192,7 @@ msgstr ""
 msgid "Cannot read /proc/asound/cards"
 msgstr ""
 
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr ""
@@ -215,48 +215,48 @@ msgid ""
 "Cannot read /proc/mounts."
 msgstr ""
 
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr ""
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"udisks\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr ""
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"madplay\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr ""
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"unar\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
 "No DAISY-CD or Audio-cd found\n"
 msgstr ""
 
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr ""
 
diff --git a/po/de.gmo b/po/de.gmo
index aba7712..8867475 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index d343b07..6e774db 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
 "PO-Revision-Date: 2013-01-29 15:06+0200\n"
 "Last-Translator: Klaus Knopper <knopper@knopper.net>\n"
 "Language-Team: Klaus Knopper <knopper@knopper.net>\n"
@@ -255,7 +255,7 @@ msgid "Cannot read /proc/asound/cards"
 msgstr "Kann /proc/mounts nicht lesen"
 
 # 13
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - Version %s\n"
@@ -285,41 +285,41 @@ msgstr ""
 "Kann /proc/mounts nicht lesen."
 
 # 6
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr "Ein Programm, um Daisy CDs unter Linux abzuspielen\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"udisks\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr ""
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"madplay\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr ""
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"unar\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -327,7 +327,7 @@ msgid ""
 msgstr ""
 
 # 36
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "Keine Daisy-CD im Laufwerk."
 
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index 2a5828f..a33fcdc 100644
--- a/po/en@boldquot.gmo
+++ b/po/en@boldquot.gmo
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 7192431..382f4b0 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: daisy-player 8.4.1\n"
+"Project-Id-Version: daisy-player 8.4.3\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
-"PO-Revision-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
+"PO-Revision-Date: 2013-10-23 11:14+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@boldquot\n"
@@ -227,7 +227,7 @@ msgstr "Go to time (MM:SS): "
 msgid "Cannot read /proc/asound/cards"
 msgstr "Cannot read /proc/asound/cards"
 
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - Version %s\n"
@@ -254,11 +254,11 @@ msgstr ""
 "\n"
 "Cannot read /proc/mounts."
 
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr "A parser to play Daisy CD's with Linux\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
@@ -267,12 +267,12 @@ msgstr ""
 "\n"
 "Daisy-player needs the “udisks” programme.\n"
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr "Please install it and try again.\n"
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
@@ -281,11 +281,11 @@ msgstr ""
 "\n"
 "Daisy-player needs the “madplay” programme.\n"
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr "Scanning for a Daisy CD..."
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
@@ -294,7 +294,7 @@ msgstr ""
 "\n"
 "Daisy-player needs the “unar” programme.\n"
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -303,7 +303,7 @@ msgstr ""
 "\n"
 "No DAISY-CD or Audio-cd found\n"
 
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "No Daisy CD in drive."
 
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index b7c2590..3ba5a08 100644
--- a/po/en@quot.gmo
+++ b/po/en@quot.gmo
diff --git a/po/en@quot.po b/po/en@quot.po
index 58d3cd8..2eb96d9 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: daisy-player 8.4.1\n"
+"Project-Id-Version: daisy-player 8.4.3\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
-"PO-Revision-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
+"PO-Revision-Date: 2013-10-23 11:14+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@quot\n"
@@ -224,7 +224,7 @@ msgstr "Go to time (MM:SS): "
 msgid "Cannot read /proc/asound/cards"
 msgstr "Cannot read /proc/asound/cards"
 
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - Version %s\n"
@@ -251,11 +251,11 @@ msgstr ""
 "\n"
 "Cannot read /proc/mounts."
 
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr "A parser to play Daisy CD's with Linux\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
@@ -264,12 +264,12 @@ msgstr ""
 "\n"
 "Daisy-player needs the “udisks” programme.\n"
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr "Please install it and try again.\n"
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
@@ -278,11 +278,11 @@ msgstr ""
 "\n"
 "Daisy-player needs the “madplay” programme.\n"
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr "Scanning for a Daisy CD..."
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "Daisy-player needs the “unar” programme.\n"
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -300,7 +300,7 @@ msgstr ""
 "\n"
 "No DAISY-CD or Audio-cd found\n"
 
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "No Daisy CD in drive."
 
diff --git a/po/es.gmo b/po/es.gmo
index f8e5237..423e339 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index c51764e..0d1a715 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
 "PO-Revision-Date: 2013-01-29 15:06+0200\n"
 "Last-Translator: Hanna Tulleken <hannatulleken@gmail.com>\n"
 "Language-Team: Hanna Tulleken <hannatulleken@gmail.com>\n"
@@ -215,7 +215,7 @@ msgstr "Ir para tiempo (MM:SS): "
 msgid "Cannot read /proc/asound/cards"
 msgstr "No poder leer /proc/sólido/fichas"
 
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - Versión %s\n"
@@ -242,11 +242,11 @@ msgstr ""
 "\n"
 "No poder leer /proc/mounts."
 
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr "Un analizador para escuchar Daisy CD con Linux\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
@@ -255,12 +255,12 @@ msgstr ""
 "\n"
 "Daisy-player necesita la \"udisks\" programa.\n"
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr "Por favor instalar y probar otra vez.\n"
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
@@ -269,11 +269,11 @@ msgstr ""
 "\n"
 "Daisy-player necesita la \"madplay\" programa.\n"
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr "Explorar para un Daisy CD..."
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +282,7 @@ msgstr ""
 "\n"
 "Daisy-player necesita la \"unar\" programa.\n"
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "No encontrada DAISY-CD o Audio-cd\n"
 
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "No hay Daisy-CD en el unidad."
 
diff --git a/po/fr.gmo b/po/fr.gmo
index be41960..5a95133 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 641449d..0ea6b02 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
 "PO-Revision-Date: 2013-01-29 15:06+0200\n"
 "Last-Translator: Osvaldo La Rosa aka Aldo <aldo.nospam@scarlet.be>\n"
 "Language-Team: Osvaldo La Rosa aka Aldo <aldo.nospam@scarlet.be>\n"
@@ -254,7 +254,7 @@ msgid "Cannot read /proc/asound/cards"
 msgstr "Ne sait pas lire /proc/mounts."
 
 # 13
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - Version %s\n"
@@ -284,41 +284,41 @@ msgstr ""
 "Ne sait pas lire /proc/mounts."
 
 # 6
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr "Une application pour écouter des CD's Daisy sous Linux\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"udisks\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr ""
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"madplay\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr ""
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
 "Daisy-player needs the \"unar\" programme.\n"
 msgstr ""
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +326,7 @@ msgid ""
 msgstr ""
 
 # 36
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "Pas de cd daisy dans le lecteur."
 
diff --git a/po/hu.gmo b/po/hu.gmo
index 04d36b0..6f80160 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index 4ddc484..17c3852 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
 "PO-Revision-Date: 2013-01-29 15:06+0200\n"
 "Last-Translator: Hammer Attila <hammera@pickup.hu>\n"
 "Language-Team: Hammer Attila <hammera@pickup.hu>\n"
@@ -217,7 +217,7 @@ msgstr "Ugrás egy megadott időtartamra: "
 msgid "Cannot read /proc/asound/cards"
 msgstr "A /proc/asound/cards fájl nem olvasható."
 
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - %s verzió\n"
@@ -244,13 +244,13 @@ msgstr ""
 "\n"
 "A /proc csatolások nem olvashatók."
 
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr ""
 "Egy feldolgozó program, melynek segítségével Daisy könyveket játszhat le "
 "Linux alatt\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
@@ -259,12 +259,12 @@ msgstr ""
 "\n"
 "A Daisy-playernek szüksége van az udisks programra.\n"
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr "Telepítse fel a madplay csomagot, majd próbálja meg újra.\n"
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
@@ -273,11 +273,11 @@ msgstr ""
 "\n"
 "A Daisy-playernek szüksége van a Madplay programra.\n"
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr "DAISY CD keresése..."
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
@@ -286,7 +286,7 @@ msgstr ""
 "\n"
 "A Daisy-playernek szüksége van az unar programra.\n"
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +295,7 @@ msgstr ""
 "\n"
 "Nem található DAISY CD vagy audio CD a meghajtóban.\n"
 
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "A meghajtóban nincs Daisy lemez."
 
diff --git a/po/nb.gmo b/po/nb.gmo
index 71abaa2..d1a4367 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index a7b9a25..8ba1ecd 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
 "PO-Revision-Date: 2013-01-29 15:06+0200\n"
 "Last-Translator: Ellen <ellenrohaan@hotmail.com>\n"
 "Language-Team: Ellen <ellenrohaan@hotmail.com>\n"
@@ -214,7 +214,7 @@ msgstr "Gå til tidspunktet (MM:SS): "
 msgid "Cannot read /proc/asound/cards"
 msgstr "Kan ikke lese /proc/asound/cards"
 
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - Versjon %s\n"
@@ -241,11 +241,11 @@ msgstr ""
 "\n"
 "Kan ikke lese /proc/mounts."
 
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr "Et program for å spille Daisy CD's med Linux\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
@@ -254,12 +254,12 @@ msgstr ""
 "\n"
 "Daisy-player trenger \"udisks\" programmet.\n"
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr "Vennligst installer og prøv igjen.\n"
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
@@ -268,11 +268,11 @@ msgstr ""
 "\n"
 "Daisy-player trenger \"madplay\" programmet.\n"
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr "Søker etter en Daisy CD..."
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +281,7 @@ msgstr ""
 "\n"
 "Daisy-player trenger \"unar\" programmet.\n"
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -290,7 +290,7 @@ msgstr ""
 "\n"
 "Ingen DAISY-CD eller Lyd-cd funnet\n"
 
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "Ingen Daisy-cd i spillern."
 
diff --git a/po/nl.gmo b/po/nl.gmo
index acf9524..f630cb8 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 0c2e01c..fb47474 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.2\n"
 "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-10-20 14:35+0200\n"
+"POT-Creation-Date: 2013-10-23 11:14+0200\n"
 "PO-Revision-Date: 2013-01-29 15:06+0200\n"
 "Last-Translator: Jos Lemmens <jos@jlemmens.nl>\n"
 "Language-Team: Jos Lemmens <jos@jlemmens.nl>\n"
@@ -253,7 +253,7 @@ msgid "Cannot read /proc/asound/cards"
 msgstr "Kan /proc/asound/cards niet lezen."
 
 # 13
-#: src/daisy-player.c:1887 src/daisy-player.c:2069
+#: src/daisy-player.c:1887 src/daisy-player.c:2065
 #, c-format
 msgid "Daisy-player - Version %s\n"
 msgstr "Daisy-player - Versie %s\n"
@@ -283,11 +283,11 @@ msgstr ""
 "Kan /proc/mounts niet lezen."
 
 # 6
-#: src/daisy-player.c:2070
+#: src/daisy-player.c:2066
 msgid "A parser to play Daisy CD's with Linux\n"
 msgstr "Een programma om Daisy CD's af te spelen\n"
 
-#: src/daisy-player.c:2075
+#: src/daisy-player.c:2071
 #, c-format
 msgid ""
 "\n"
@@ -296,12 +296,12 @@ msgstr ""
 "\n"
 "Daisy-player heeft het \"udisks\" programma nodig.\n"
 
-#: src/daisy-player.c:2076 src/daisy-player.c:2085 src/daisy-player.c:2143
+#: src/daisy-player.c:2072 src/daisy-player.c:2081 src/daisy-player.c:2139
 #, c-format
 msgid "Please install it and try again.\n"
 msgstr "Installeer het a.u.b. en probeer het opnieuw.\n"
 
-#: src/daisy-player.c:2084
+#: src/daisy-player.c:2080
 #, c-format
 msgid ""
 "\n"
@@ -310,11 +310,11 @@ msgstr ""
 "\n"
 "Daisy-player heeft het \"madplay\" programma nodig.\n"
 
-#: src/daisy-player.c:2093
+#: src/daisy-player.c:2089
 msgid "Scanning for a Daisy CD..."
 msgstr "Zoeken naar een Daisy CD..."
 
-#: src/daisy-player.c:2142
+#: src/daisy-player.c:2138
 #, c-format
 msgid ""
 "\n"
@@ -323,7 +323,7 @@ msgstr ""
 "\n"
 "Daisy-player heeft het \"unar\" programma nodig.\n"
 
-#: src/daisy-player.c:2183 src/daisy3.c:793
+#: src/daisy-player.c:2179 src/daisy3.c:793
 #, c-format
 msgid ""
 "\n"
@@ -333,7 +333,7 @@ msgstr ""
 "Geen DAISY-CD of Audio-cd gevonden\n"
 
 # 36
-#: src/daisy-player.c:2228 src/daisy-player.c:2309
+#: src/daisy-player.c:2223 src/daisy-player.c:2309
 msgid "No Daisy CD in drive."
 msgstr "Geen daisy-cd in speler."
 
diff --git a/src/daisy-player.c b/src/daisy-player.c
index ea52d00..bd23853 100644
--- a/src/daisy-player.c
+++ b/src/daisy-player.c
@@ -19,7 +19,7 @@
 
 #include "src/daisy.h"
 
-#define DAISY_PLAYER_VERSION "8.4.1"
+#define DAISY_PLAYER_VERSION "8.4.3"
 
 int discinfo = 0, displaying = 0, phrase_nr, tts_no;
 int playing, just_this_item, current_playorder = 1, audiocd;
@@ -2015,12 +2015,8 @@ int main (int argc, char *argv[])
    strncpy (cd_dev, "/dev/sr0", 15);
    atexit (quit_daisy_player);
    read_rc ();
-   setlocale (LC_ALL, getenv ("LC_ALL"));
-   setlocale (LC_ALL, getenv ("LANGUAGE"));
-   setlocale (LC_ALL, getenv ("LANG"));
-   textdomain (prog_name);
-   snprintf (str, MAX_STR, "%s/", LOCALEDIR);
-   bindtextdomain (prog_name, str);
+   setlocale (LC_ALL, "");
+   setlocale (LC_NUMERIC, "C");
    textdomain (prog_name);
    opterr = 0;
    while ((opt = getopt (argc, argv, "c:d:ny")) != -1)
@@ -2192,8 +2188,7 @@ int main (int argc, char *argv[])
 // when no mount-point is given try to mount the cd
    {
       FILE *r;
-      char *str, cd[MAX_STR + 1];
-      size_t s;
+      char cd[MAX_STR + 1];
       double start;
       magic_t myt;
 
@@ -2254,6 +2249,11 @@ int main (int argc, char *argv[])
          r = fopen ("/run/udev/data/b11:0", "r");
          while (1)
          {
+            char *str;;
+            size_t s;
+
+            str = (char *) malloc (MAX_STR);
+            s = MAX_STR - 1;
             switch (getline (&str, &s, r))
             {
             default: