summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gevers <elbrus@debian.org>2014-01-03 19:16:12 +0100
committerPaul Gevers <elbrus@debian.org>2014-01-03 19:16:12 +0100
commite39fc39d6df4c1d66e433452c5c21f1dbb4c5feb (patch)
treebc9821b1609ba73bfdbf8be2fb03d875d5b7292e
parentc361d2ccf8d36b41b5b781e3ba4d1a084ec3f32f (diff)
Imported Upstream version 8.5.1
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac2
-rw-r--r--doc/COMPILE2
-rw-r--r--doc/COPYING2
-rw-r--r--doc/Changelog6
-rw-r--r--doc/Readme2
-rw-r--r--doc/daisy-player.html6
-rw-r--r--doc/daisy-player.txt2
-rw-r--r--man/daisy-player.14
-rw-r--r--po/af.gmobin6097 -> 6097 bytes
-rw-r--r--po/af.po46
-rw-r--r--po/daisy-player.pot44
-rw-r--r--po/de.gmobin5121 -> 5121 bytes
-rw-r--r--po/de.po46
-rw-r--r--po/en@boldquot.gmobin5920 -> 5920 bytes
-rw-r--r--po/en@boldquot.po52
-rw-r--r--po/en@quot.gmobin5876 -> 5876 bytes
-rw-r--r--po/en@quot.po52
-rw-r--r--po/es.gmobin6135 -> 6135 bytes
-rw-r--r--po/es.po46
-rw-r--r--po/fr.gmobin5153 -> 5153 bytes
-rw-r--r--po/fr.po46
-rw-r--r--po/hu.gmobin6252 -> 6252 bytes
-rw-r--r--po/hu.po46
-rw-r--r--po/nb.gmobin6027 -> 6027 bytes
-rw-r--r--po/nb.po46
-rw-r--r--po/nl.gmobin6059 -> 6059 bytes
-rw-r--r--po/nl.po46
-rw-r--r--po/pl.gmobin5991 -> 5990 bytes
-rw-r--r--po/pl.po46
-rw-r--r--src/audiocd.c2
-rw-r--r--src/daisy-player.c69
-rw-r--r--src/daisy.h2
-rw-r--r--src/daisy3.c2
-rw-r--r--src/paranoia.c2
35 files changed, 327 insertions, 314 deletions
diff --git a/configure b/configure
index 5a34171..fbf8675 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.5.
+# Generated by GNU Autoconf 2.69 for daisy-player 8.5.1.
#
# Report bugs to <jos@jlemmens.nl>.
#
@@ -568,7 +568,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
#
# Initializations.
#
-ac_default_prefix=/usr/local
+ac_default_prefix=/usr # /local
ac_clean_files=
ac_config_libobj_dir=.
LIBOBJS=
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='daisy-player'
PACKAGE_TARNAME='daisy-player'
-PACKAGE_VERSION='8.4.5'
-PACKAGE_STRING='daisy-player 8.4.5'
+PACKAGE_VERSION='8.5.1'
+PACKAGE_STRING='daisy-player 8.5.1'
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.5 to adapt to many kinds of systems.
+\`configure' configures daisy-player 8.5.1 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.5:";;
+ short | recursive ) echo "Configuration of daisy-player 8.5.1:";;
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.5
+daisy-player configure 8.5.1
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.5, which was
+It was created by daisy-player $as_me 8.5.1, 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.5'
+ VERSION='8.5.1'
cat >>confdefs.h <<_ACEOF
@@ -8224,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.5, which was
+This file was extended by daisy-player $as_me 8.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8290,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.5
+daisy-player config.status 8.5.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index d16bb35..71db25c 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.5], [jos@jlemmens.nl])
+AC_INIT([daisy-player], [8.5.1], [jos@jlemmens.nl])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/COMPILE b/doc/COMPILE
index a88472c..e8a6f84 100644
--- a/doc/COMPILE
+++ b/doc/COMPILE
@@ -8,7 +8,7 @@ To compile daisy-player, be sure the following extra packages are installed:
libcdio-paranoia-dev
libmagic-dev
-Give the following commands:
+Give the following commands:
$ ./configure
$ make
diff --git a/doc/COPYING b/doc/COPYING
index 4e530d1..0a254b0 100644
--- a/doc/COPYING
+++ b/doc/COPYING
@@ -1,4 +1,4 @@
-Copyright: (C)2003-2013 J. Lemmens
+Copyright: (C)2003-2014 J. Lemmens
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/doc/Changelog b/doc/Changelog
index d246042..8776f49 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -163,3 +163,9 @@ Samuel Thibault <sthibault@debian.org>
independently of the used language.
8.4.4 Updated hungarian translation
8.4.5 new polish translation
+8.5 Better support for volumes with multiple daisy-books (discinfo.html)
+8.5.1 Start daisy-player with a volume with multiple daisy-books.
+ (discinfo.html). After quiting daisy-player the terminal is locked.
+ This occured when daisy-player was started from a bash shell.
+ When started from a tcsh shell there was no problem.
+ Solved.
diff --git a/doc/Readme b/doc/Readme
index bc6d945..f4ca45e 100644
--- a/doc/Readme
+++ b/doc/Readme
@@ -1,5 +1,5 @@
Daisy-player - A parser to play Daisy CD's with Linux
-(C)2003-2013 J. Lemmens
+(C)2003-2014 J. Lemmens
DESCRIPTION
Daisy-player reads a DAISY-CD and plays its audio-files.
diff --git a/doc/daisy-player.html b/doc/daisy-player.html
index d595c19..3797ad0 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: 12 December 2013<BR><A HREF="#index">Index</A>
+Section: Linux Reference Manual (1)<BR>Updated: 01 January 2014<BR><A HREF="#index">Index</A>
<A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR>
<A NAME="lbAB">&nbsp;</A>
@@ -214,7 +214,7 @@ Jos Lemmens &lt;<A HREF="mailto:jos@jlemmens.nl">jos@jlemmens.nl</A>&gt;
<A NAME="lbAL">&nbsp;</A>
<H2>COPYRIGHT</H2>
-Copyright (C)2003-2013 Jos Lemmens &lt;<A HREF="mailto:jos@jlemmens.nl">jos@jlemmens.nl</A>&gt;
+Copyright (C)2003-2014 Jos Lemmens &lt;<A HREF="mailto:jos@jlemmens.nl">jos@jlemmens.nl</A>&gt;
<P>
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program (see the file COPYING); if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -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: 10:01:23 GMT, December 12, 2013
+Time: 12:21:50 GMT, January 01, 2014
</BODY>
</HTML>
diff --git a/doc/daisy-player.txt b/doc/daisy-player.txt
index 3b5b45b..6fa2d11 100644
--- a/doc/daisy-player.txt
+++ b/doc/daisy-player.txt
@@ -66,6 +66,6 @@ cddbget(1), unar(1)
AUTHOR
Jos Lemmens <jos@jlemmens.nl>
COPYRIGHT
-Copyright (C)2003-2013 Jos Lemmens <jos@jlemmens.nl>
+Copyright (C)2003-2014 Jos Lemmens <jos@jlemmens.nl>
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program (see the file COPYING); if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
diff --git a/man/daisy-player.1 b/man/daisy-player.1
index 3fbd59c..f4b3b60 100644
--- a/man/daisy-player.1
+++ b/man/daisy-player.1
@@ -1,5 +1,5 @@
.\"Text automatically generated by txt2man
-.TH daisy-player 1 "12 December 2013" "man" "Linux Reference Manual"
+.TH daisy-player 1 "01 January 2014" "man" "Linux Reference Manual"
.SH NAME
\fBdaisy-player \fP- player for DAISY Digital Talking Books or Audio-CD's
\fB
@@ -178,6 +178,6 @@ This file contains the name of the desired audio device and the desired playing
.SH AUTHOR
Jos Lemmens <jos@jlemmens.nl>
.SH COPYRIGHT
-Copyright (C)2003-2013 Jos Lemmens <jos@jlemmens.nl>
+Copyright (C)2003-2014 Jos Lemmens <jos@jlemmens.nl>
.PP
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program (see the file COPYING); if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
diff --git a/po/af.gmo b/po/af.gmo
index 5135155..c644bcc 100644
--- a/po/af.gmo
+++ b/po/af.gmo
Binary files differ
diff --git a/po/af.po b/po/af.po
index 9733bd8..74523d0 100644
--- a/po/af.po
+++ b/po/af.po
@@ -1,6 +1,6 @@
# message catalog file for daisy-player - afrikaans version
#
-# Copyright (C) 2003-2013 J. Lemmens
+# Copyright (C) 2003-2014 J. Lemmens
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -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-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\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"
@@ -33,7 +33,7 @@ msgstr ""
# 33
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -255,13 +255,13 @@ msgstr ""
"Kan nie /proc/mounts lees nie."
# 13
-#: src/daisy-player.c:1887 src/daisy-player.c:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - weergawe %s\n"
# 39
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -270,13 +270,13 @@ msgstr ""
"\n"
"Gebruiksaanwysings: %s [directory met 'n Daisy-struktuur] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c cdrom_toestel] [-d ALSA_klank_toestel] [-n | -y]\n"
# 34
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -285,11 +285,11 @@ msgstr ""
"Kan nie /proc/mounts lees nie."
# 6
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
@@ -298,12 +298,12 @@ msgstr ""
"\n"
"Daisy-player het die \"udisks\" program nodig.\n"
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr "Installeer dit asseblief en probeer weer.\n"
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
@@ -312,11 +312,11 @@ msgstr ""
"\n"
"Daisy-player het die \"madplay\" program nodig.\n"
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr "Besig om vir 'n DAISY CD te soek..."
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
@@ -325,7 +325,7 @@ msgstr ""
"\n"
"Daisy-player het die \"unar\" program nodig.\n"
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -335,12 +335,12 @@ msgstr ""
"Geen DAISY CD of audio CD is gekry nie\n"
# 36
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "Daar is nie 'n daisy-cd in die CD speler nie."
# 35
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -348,7 +348,7 @@ msgstr ""
"\n"
"Kan nie die udisks bevel gebruik nie."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
@@ -356,24 +356,24 @@ msgstr ""
"\n"
"Audio CD gekry"
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr "besig om tietels vanaf freedb.freedb.org te kry..."
# 19
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "Directory %s bestaan nie\n"
# 12
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - weergawe %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - weergawe %s - (C)2014 J. Lemmens"
# 22
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "Druk 'h' vir hulp "
diff --git a/po/daisy-player.pot b/po/daisy-player.pot
index 9f33b54..45371dc 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.5\n"
+"Project-Id-Version: daisy-player 8.5.1\n"
"Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\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"
@@ -19,7 +19,7 @@ msgstr ""
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -192,101 +192,101 @@ msgstr ""
msgid "Cannot read /proc/asound/cards"
msgstr ""
-#: src/daisy-player.c:1887 src/daisy-player.c:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr ""
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
"Usage: %s [directory_with_a_Daisy-structure] "
msgstr ""
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr ""
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
msgstr ""
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
msgid "A parser to play Daisy CD's with Linux\n"
msgstr ""
-#: src/daisy-player.c:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"udisks\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr ""
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"madplay\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr ""
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"unar\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
"No DAISY-CD or Audio-cd found\n"
msgstr ""
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr ""
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
msgstr ""
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
msgstr ""
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr ""
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr ""
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
msgstr ""
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr ""
diff --git a/po/de.gmo b/po/de.gmo
index a5ff899..bb2b718 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differ
diff --git a/po/de.po b/po/de.po
index 0e3b7fa..a87e6fe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
# message catalog file for daisy-player - german version
#
-# Copyright (C) 2003-2013 J. Lemmens
+# Copyright (C) 2003-2014 J. Lemmens
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -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-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\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"
@@ -33,7 +33,7 @@ msgstr ""
# 33
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -255,13 +255,13 @@ msgid "Cannot read /proc/asound/cards"
msgstr "Kann /proc/mounts nicht lesen"
# 13
-#: src/daisy-player.c:1887 src/daisy-player.c:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - Version %s\n"
# 39
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -270,13 +270,13 @@ msgstr ""
"\n"
"Aufruf: %s [Verzeichnis mit einer Daisy-Struktur] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c cdrom_device] [-d ALSA Soundkarte] [-n | -y]\n"
# 34
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -285,41 +285,41 @@ msgstr ""
"Kann /proc/mounts nicht lesen."
# 6
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"udisks\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr ""
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"madplay\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr ""
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"unar\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -327,12 +327,12 @@ msgid ""
msgstr ""
# 36
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "Keine Daisy-CD im Laufwerk."
# 35
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -340,30 +340,30 @@ msgstr ""
"\n"
"Kann udisks Befehl nicht verwenden."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
msgstr ""
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr ""
# 19
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "Kein solches Verzeichnis: %s\n"
# 12
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - Version %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - Version %s - (C)2014 J. Lemmens"
# 22
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "'h' für Hilfe drücken"
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index 4fcb701..1f5a60b 100644
--- a/po/en@boldquot.gmo
+++ b/po/en@boldquot.gmo
Binary files differ
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 0eb0701..a47d9a8 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -1,7 +1,7 @@
# English translations for daisy-player package.
-# Copyright (C) 2013 Jos Lemmens <jos@jlemmens.nl>
+# Copyright (C) 2014 Jos Lemmens <jos@jlemmens.nl>
# This file is distributed under the same license as the daisy-player package.
-# Automatically generated, 2013.
+# Automatically generated, 2014.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: daisy-player 8.4.5\n"
+"Project-Id-Version: daisy-player 8.5.1\n"
"Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-12-11 18:42+0100\n"
-"PO-Revision-Date: 2013-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\n"
+"PO-Revision-Date: 2014-01-01 13:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en@boldquot\n"
@@ -44,7 +44,7 @@ msgstr ""
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -227,12 +227,12 @@ 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:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - Version %s\n"
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -241,12 +241,12 @@ msgstr ""
"\n"
"Usage: %s [directory_with_a_Daisy-structure] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -254,11 +254,11 @@ msgstr ""
"\n"
"Cannot read /proc/mounts."
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
@@ -267,12 +267,12 @@ msgstr ""
"\n"
"Daisy-player needs the “udisks” programme.\n"
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr "Please install it and try again.\n"
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
@@ -281,11 +281,11 @@ msgstr ""
"\n"
"Daisy-player needs the “madplay” programme.\n"
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr "Scanning for a Daisy CD..."
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
@@ -294,7 +294,7 @@ msgstr ""
"\n"
"Daisy-player needs the “unar” programme.\n"
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -303,11 +303,11 @@ msgstr ""
"\n"
"No DAISY-CD or Audio-cd found\n"
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "No Daisy CD in drive."
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -315,7 +315,7 @@ msgstr ""
"\n"
"Cannot use udisks command."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
@@ -323,21 +323,21 @@ msgstr ""
"\n"
"Found an Audio-CD. "
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr "Get titles from freedb.freedb.org..."
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "No such directory: %s\n"
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - Version %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - Version %s - (C)2014 J. Lemmens"
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "Press ‘h’ for help "
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 926759e..0a8264a 100644
--- a/po/en@quot.gmo
+++ b/po/en@quot.gmo
Binary files differ
diff --git a/po/en@quot.po b/po/en@quot.po
index b78c4f9..0c9fc8a 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -1,7 +1,7 @@
# English translations for daisy-player package.
-# Copyright (C) 2013 Jos Lemmens <jos@jlemmens.nl>
+# Copyright (C) 2014 Jos Lemmens <jos@jlemmens.nl>
# This file is distributed under the same license as the daisy-player package.
-# Automatically generated, 2013.
+# Automatically generated, 2014.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: daisy-player 8.4.5\n"
+"Project-Id-Version: daisy-player 8.5.1\n"
"Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n"
-"POT-Creation-Date: 2013-12-11 18:42+0100\n"
-"PO-Revision-Date: 2013-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\n"
+"PO-Revision-Date: 2014-01-01 13:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en@quot\n"
@@ -41,7 +41,7 @@ msgstr ""
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -224,12 +224,12 @@ 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:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - Version %s\n"
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -238,12 +238,12 @@ msgstr ""
"\n"
"Usage: %s [directory_with_a_Daisy-structure] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -251,11 +251,11 @@ msgstr ""
"\n"
"Cannot read /proc/mounts."
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
@@ -264,12 +264,12 @@ msgstr ""
"\n"
"Daisy-player needs the “udisks” programme.\n"
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr "Please install it and try again.\n"
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
@@ -278,11 +278,11 @@ msgstr ""
"\n"
"Daisy-player needs the “madplay” programme.\n"
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr "Scanning for a Daisy CD..."
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
@@ -291,7 +291,7 @@ msgstr ""
"\n"
"Daisy-player needs the “unar” programme.\n"
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -300,11 +300,11 @@ msgstr ""
"\n"
"No DAISY-CD or Audio-cd found\n"
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "No Daisy CD in drive."
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -312,7 +312,7 @@ msgstr ""
"\n"
"Cannot use udisks command."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
@@ -320,21 +320,21 @@ msgstr ""
"\n"
"Found an Audio-CD. "
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr "Get titles from freedb.freedb.org..."
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "No such directory: %s\n"
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - Version %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - Version %s - (C)2014 J. Lemmens"
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "Press ‘h’ for help "
diff --git a/po/es.gmo b/po/es.gmo
index 13e27d0..2d406ff 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differ
diff --git a/po/es.po b/po/es.po
index a3ff57e..0c36c77 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
# message catalog file for daisy-player - Spanish version
#
-# Copyright (C) 2003-2013 J. Lemmens
+# Copyright (C) 2003-2014 J. Lemmens
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -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-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\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"
@@ -32,7 +32,7 @@ msgstr ""
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -215,12 +215,12 @@ 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:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - Versión %s\n"
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -229,12 +229,12 @@ msgstr ""
"\n"
"Uso: %s [manual_con_una_Daisy-estructura] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c cdrom_dispositivo] [-d ALSA_sonido_dispositivo] [-n | -y] \n"
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -242,11 +242,11 @@ msgstr ""
"\n"
"No poder leer /proc/mounts."
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
@@ -255,12 +255,12 @@ msgstr ""
"\n"
"Daisy-player necesita la \"udisks\" programa.\n"
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr "Por favor instalar y probar otra vez.\n"
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
@@ -269,11 +269,11 @@ msgstr ""
"\n"
"Daisy-player necesita la \"madplay\" programa.\n"
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr "Explorar para un Daisy CD..."
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
@@ -282,7 +282,7 @@ msgstr ""
"\n"
"Daisy-player necesita la \"unar\" programa.\n"
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -291,11 +291,11 @@ msgstr ""
"\n"
"No encontrada DAISY-CD o Audio-cd\n"
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "No hay Daisy-CD en el unidad."
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -303,7 +303,7 @@ msgstr ""
"\n"
"No poder usar \"udisks\" orden."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
@@ -311,21 +311,21 @@ msgstr ""
"\n"
"Encontrada un Audio-CD. "
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr "Coger títulos de freedb.freedb.org..."
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "No tal directorio: %s\n"
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - Versión %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - Versión %s - (C)2014 J. Lemmens"
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "Hacer clic 'h' para ayudar "
diff --git a/po/fr.gmo b/po/fr.gmo
index bb02685..c608591 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fr.po b/po/fr.po
index c2da9a1..daec36e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
# message catalog file for daisy-player - french version
#
-# Copyright (C) 2003-2013 J. Lemmens
+# Copyright (C) 2003-2014 J. Lemmens
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -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-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\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"
@@ -33,7 +33,7 @@ msgstr ""
# 33
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -254,13 +254,13 @@ msgid "Cannot read /proc/asound/cards"
msgstr "Ne sait pas lire /proc/mounts."
# 13
-#: src/daisy-player.c:1887 src/daisy-player.c:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - Version %s\n"
# 39
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -269,13 +269,13 @@ msgstr ""
"\n"
"Utilisation: %s [-l langue] [répertoire avec structure Daisy] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr ""
# 34
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -284,41 +284,41 @@ msgstr ""
"Ne sait pas lire /proc/mounts."
# 6
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"udisks\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr ""
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"madplay\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr ""
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
"Daisy-player needs the \"unar\" programme.\n"
msgstr ""
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -326,12 +326,12 @@ msgid ""
msgstr ""
# 36
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "Pas de cd daisy dans le lecteur."
# 35
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -339,30 +339,30 @@ msgstr ""
"\n"
"Ne sait utiliser la commande udisks."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
msgstr ""
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr ""
# 19
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "Le répertoire n'existe pas %s\n"
# 12
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - Version %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - Version %s - (C)2014 J. Lemmens"
# 22
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "Appuyez sur 'h' pour obtenir de l'aide "
diff --git a/po/hu.gmo b/po/hu.gmo
index 548d45c..11f1b27 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
Binary files differ
diff --git a/po/hu.po b/po/hu.po
index e42db17..963d05a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,6 @@
# message catalog file for daisy-player - Hungarian version
#
-# Copyright (C) 2003-2013 J. Lemmens
+# Copyright (C) 2003-2014 J. Lemmens
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -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-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\n"
"PO-Revision-Date: 2013-12-09 11:06+0200\n"
"Last-Translator: Hammer Attila <hammera@pickup.hu>\n"
"Language-Team: Hammer Attila <hammera@pickup.hu>\n"
@@ -32,7 +32,7 @@ msgstr ""
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -217,12 +217,12 @@ 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:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - %s verzió\n"
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -231,12 +231,12 @@ msgstr ""
"\n"
"Használat: %s [Daisy szerkezetet tartalmazó könyvtár] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c CD-rom eszköz] [-d ALSA hangeszköz] [-n|-y]\n"
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -244,13 +244,13 @@ msgstr ""
"\n"
"A /proc csatolások nem olvashatók."
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, 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:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr "Telepítse a megadott csomagot, majd próbálja meg újra.\n"
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, 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:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr "DAISY CD keresése..."
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, 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:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -295,11 +295,11 @@ msgstr ""
"\n"
"Nem található DAISY CD vagy audio CD a meghajtóban.\n"
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "A meghajtóban nincs Daisy lemez."
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -307,7 +307,7 @@ msgstr ""
"\n"
"Az udisks parancs nem használható."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
@@ -315,21 +315,21 @@ msgstr ""
"\n"
"Az audio CD megtalálva. "
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr "A számcímek lekérése a freedb.freedb.org kiszolgálóról..."
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "Nincs ilyen könyvtár: %s\n"
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - %s verzió - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - %s verzió - (C)2014 J. Lemmens"
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "A segítségért nyomja meg a H billentyűt. "
diff --git a/po/nb.gmo b/po/nb.gmo
index 0914483..2c7bd03 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
Binary files differ
diff --git a/po/nb.po b/po/nb.po
index a723249..c448dc0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,6 +1,6 @@
# message catalog file for daisy-player - Norwegian version
#
-# Copyright (C) 2003-2013 J. Lemmens
+# Copyright (C) 2003-2014 J. Lemmens
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -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-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\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"
@@ -32,7 +32,7 @@ msgstr ""
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -214,12 +214,12 @@ 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:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - Versjon %s\n"
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -228,12 +228,12 @@ msgstr ""
"\n"
"Forbruk: %s [mappe_med_Daisy-struktur] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c cdrom_apparat] [-d ALSA_lyd_apparat] [-n | -y]\n"
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -241,11 +241,11 @@ msgstr ""
"\n"
"Kan ikke lese /proc/mounts."
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
@@ -254,12 +254,12 @@ msgstr ""
"\n"
"Daisy-player trenger \"udisks\" programmet.\n"
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr "Vennligst installer og prøv igjen.\n"
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
@@ -268,11 +268,11 @@ msgstr ""
"\n"
"Daisy-player trenger \"madplay\" programmet.\n"
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr "Søker etter en Daisy CD..."
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
@@ -281,7 +281,7 @@ msgstr ""
"\n"
"Daisy-player trenger \"unar\" programmet.\n"
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -290,11 +290,11 @@ msgstr ""
"\n"
"Ingen DAISY-CD eller Lyd-cd funnet\n"
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "Ingen Daisy-cd i spillern."
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -302,7 +302,7 @@ msgstr ""
"\n"
"Kan ikke bruke udisks kommando."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
@@ -310,21 +310,21 @@ msgstr ""
"\n"
"Funnet en Lyd-CD. "
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr "Henter titler fra freedb.freedb.org..."
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "Ikke en slik mappe: %s\n"
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - Versjon %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - Versjon %s - (C)2014 J. Lemmens"
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "Trykk 'h' for hjelp "
diff --git a/po/nl.gmo b/po/nl.gmo
index 9846818..dd76841 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
Binary files differ
diff --git a/po/nl.po b/po/nl.po
index b268db3..eb4245f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
# message catalog file for daisy-player - duch version
#
-# Copyright (C) 2003-2013 J. Lemmens
+# Copyright (C) 2003-2014 J. Lemmens
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -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-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\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"
@@ -33,7 +33,7 @@ msgstr ""
# 33
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -253,13 +253,13 @@ msgid "Cannot read /proc/asound/cards"
msgstr "Kan /proc/asound/cards niet lezen."
# 13
-#: src/daisy-player.c:1887 src/daisy-player.c:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - Versie %s\n"
# 39
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -268,13 +268,13 @@ msgstr ""
"\n"
"Gebruik: %s [map met een Daisy-structuur] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c cdrom_apparaat] [-d ALSA_geluids_apparaat] [-n | -j]\n"
# 34
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -283,11 +283,11 @@ msgstr ""
"Kan /proc/mounts niet lezen."
# 6
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
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:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
@@ -296,12 +296,12 @@ msgstr ""
"\n"
"Daisy-player heeft het \"udisks\" programma nodig.\n"
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, 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:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
@@ -310,11 +310,11 @@ msgstr ""
"\n"
"Daisy-player heeft het \"madplay\" programma nodig.\n"
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr "Zoeken naar een Daisy CD..."
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
@@ -323,7 +323,7 @@ msgstr ""
"\n"
"Daisy-player heeft het \"unar\" programma nodig.\n"
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -333,12 +333,12 @@ msgstr ""
"Geen DAISY-CD of Audio-cd gevonden\n"
# 36
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "Geen daisy-cd in speler."
# 35
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -346,7 +346,7 @@ msgstr ""
"\n"
"Kan geen gebruik maken van het udisks commando."
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
@@ -354,24 +354,24 @@ msgstr ""
"\n"
"Een Audio-CD gevonden. "
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr "Haal de titels op bij freedb.freedb.org..."
# 19
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "Map %s bestaat niet\n"
# 12
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - Versie %s - (C)2013 J. Lemmens"
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - Versie %s - (C)2014 J. Lemmens"
# 22
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "Druk op'h' voor hulp "
diff --git a/po/pl.gmo b/po/pl.gmo
index 2528304..447291b 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/pl.po b/po/pl.po
index ffdfaac..59172d1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,6 @@
# message catalog file for daisy-player - Polish version
#
-# Copyright (C) 2003-2013 J. Lemmens
+# Copyright (C) 2003-2014 J. Lemmens
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -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-12-11 18:42+0100\n"
+"POT-Creation-Date: 2014-01-01 13:20+0100\n"
"PO-Revision-Date: 2013-01-29 15:06+0200\n"
"Last-Translator: Patryk Doering <http://www.rekinet.pl>\n"
"Language-Team: Patryk Doering <http://www.rekinet.pl>Language: pl\n"
@@ -32,7 +32,7 @@ msgstr ""
#: src/daisy-player.c:266 src/daisy-player.c:292 src/daisy-player.c:360
#: src/daisy-player.c:513 src/daisy-player.c:1233 src/daisy-player.c:1291
-#: src/daisy-player.c:1939 src/daisy-player.c:1964 src/daisy-player.c:2348
+#: src/daisy-player.c:1943 src/daisy-player.c:1968 src/daisy-player.c:2355
#: src/daisy3.c:343 src/daisy3.c:394 src/daisy3.c:437 src/daisy3.c:504
#: src/daisy3.c:544 src/daisy3.c:563 src/daisy3.c:637 src/daisy3.c:706
#: src/daisy3.c:846
@@ -213,12 +213,12 @@ msgstr "Idź do czasu (mm:ss): "
msgid "Cannot read /proc/asound/cards"
msgstr "Nie można odczytać /proc/asound/cards "
-#: src/daisy-player.c:1887 src/daisy-player.c:2067
+#: src/daisy-player.c:1891 src/daisy-player.c:2075
#, c-format
msgid "Daisy-player - Version %s\n"
msgstr "Daisy-player - Wersja %s \n"
-#: src/daisy-player.c:1889
+#: src/daisy-player.c:1893
#, c-format
msgid ""
"\n"
@@ -227,12 +227,12 @@ msgstr ""
"\n"
"Użycie: %s [directory_with_a_Daisy-structure] "
-#: src/daisy-player.c:1891
+#: src/daisy-player.c:1895
#, c-format
msgid "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"
msgstr "[-c cdrom_device] [-d ALSA_sound_device] [-n | -y] \n"
-#: src/daisy-player.c:1906
+#: src/daisy-player.c:1910
msgid ""
"\n"
"Cannot read /proc/mounts."
@@ -240,13 +240,13 @@ msgstr ""
"\n"
"Nie można odczytać /proc/mounts. "
-#: src/daisy-player.c:2068
+#: src/daisy-player.c:2076
msgid "A parser to play Daisy CD's with Linux\n"
msgstr ""
"Parser odtwarza z Daisy CD's i Linuksem\n"
"\n"
-#: src/daisy-player.c:2073
+#: src/daisy-player.c:2081
#, c-format
msgid ""
"\n"
@@ -255,12 +255,12 @@ msgstr ""
"\n"
"Daisy-player potrzebuje program \"udisks\".\n"
-#: src/daisy-player.c:2074 src/daisy-player.c:2083 src/daisy-player.c:2141
+#: src/daisy-player.c:2082 src/daisy-player.c:2091 src/daisy-player.c:2149
#, c-format
msgid "Please install it and try again.\n"
msgstr "Proszę zainstalować go i spróbuj ponownie. \n"
-#: src/daisy-player.c:2082
+#: src/daisy-player.c:2090
#, c-format
msgid ""
"\n"
@@ -269,11 +269,11 @@ msgstr ""
"\n"
"Daisy-player potrzebuje program \"madplay\" .\n"
-#: src/daisy-player.c:2091
+#: src/daisy-player.c:2099
msgid "Scanning for a Daisy CD..."
msgstr "Skanowanie Daisy CD... "
-#: src/daisy-player.c:2140
+#: src/daisy-player.c:2148
#, c-format
msgid ""
"\n"
@@ -282,7 +282,7 @@ msgstr ""
"\n"
"Daisy-player potrzebuje program \"unar\".\n"
-#: src/daisy-player.c:2181 src/daisy3.c:793
+#: src/daisy-player.c:2189 src/daisy3.c:793
#, c-format
msgid ""
"\n"
@@ -291,11 +291,11 @@ msgstr ""
"\n"
"To nie jest Daisy-CD ani Audio-CD. \n"
-#: src/daisy-player.c:2225 src/daisy-player.c:2311
+#: src/daisy-player.c:2232 src/daisy-player.c:2318
msgid "No Daisy CD in drive."
msgstr "W napędzie nie ma Daisy-CD. "
-#: src/daisy-player.c:2277
+#: src/daisy-player.c:2284
msgid ""
"\n"
"Cannot use udisks command."
@@ -303,7 +303,7 @@ msgstr ""
"\n"
"Nie można użyć polecenia udisks. "
-#: src/daisy-player.c:2291
+#: src/daisy-player.c:2298
msgid ""
"\n"
"Found an Audio-CD. "
@@ -311,21 +311,21 @@ msgstr ""
"\n"
"Znaleziono Audio-CD. "
-#: src/daisy-player.c:2293
+#: src/daisy-player.c:2300
msgid "Get titles from freedb.freedb.org..."
msgstr "Pobierz tytuły z freedb.freedb.org... "
-#: src/daisy-player.c:2329
+#: src/daisy-player.c:2336
#, c-format
msgid "No such directory: %s\n"
msgstr "Nie ma takiego katalogu: %s \n"
-#: src/daisy-player.c:2390
+#: src/daisy-player.c:2397
#, c-format
-msgid "Daisy-player - Version %s - (C)2013 J. Lemmens"
-msgstr "Daisy-player - Wersja %s - (C) 2013 J. Lemmens "
+msgid "Daisy-player - Version %s - (C)2014 J. Lemmens"
+msgstr "Daisy-player - Wersja %s - (C)2014 J. Lemmens "
-#: src/daisy-player.c:2401
+#: src/daisy-player.c:2408
msgid "Press 'h' for help "
msgstr "Naciśnij 'h' jeśli potrzebujesz pomocy "
diff --git a/src/audiocd.c b/src/audiocd.c
index bf87d04..47e9a47 100644
--- a/src/audiocd.c
+++ b/src/audiocd.c
@@ -1,6 +1,6 @@
/* audiocd.c - handle Audio-CD's
- * Copyright (C) 2013 J. Lemmens
+ * Copyright (C)2014 J. Lemmens
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/daisy-player.c b/src/daisy-player.c
index 359ae99..677bd07 100644
--- a/src/daisy-player.c
+++ b/src/daisy-player.c
@@ -1,6 +1,6 @@
/* daisy-player - A parser to play Daisy cd's.
*
- * Copyright (C) 2003-2013 J. Lemmens
+ * Copyright (C)2003-2014 J. Lemmens
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -19,7 +19,7 @@
#include "src/daisy.h"
-#define DAISY_PLAYER_VERSION "8.4.5"
+#define DAISY_PLAYER_VERSION "8.5.1"
int discinfo = 0, displaying = 0, phrase_nr, tts_no;
int playing, just_this_item, current_playorder = 1, audiocd;
@@ -1414,7 +1414,7 @@ void select_next_output_device ()
} // for
} // select_next_output_device
-void browse ()
+void browse (char *wd, char *prog_name)
{
int old_screen;
char str[MAX_STR];
@@ -1445,35 +1445,38 @@ void browse ()
player_pid = -2;
if (discinfo)
{
- snprintf (str, MAX_STR - 1, "%s %s -d %s", prog_name,
- daisy[current].label, sound_dev);
+ snprintf (str, MAX_STR - 1,
+ "cd \"%s\"; \"%s\" \"%s\"/\"%s\" -d %s",
+ wd, prog_name, daisy_mp, daisy[current].daisy_mp,
+ sound_dev);
switch (system (str))
{
default:
break;
} // switch
- snprintf (str, MAX_STR - 1, "%s . -d %s\n", prog_name, sound_dev);
+
+ snprintf (str, MAX_STR - 1,
+ "cd \"%s\"; \"%s\" \"%s\" -d %s\n", wd, prog_name,
+ daisy_mp, sound_dev);
switch (system (str))
{
default:
break;
} // switch
+ quit_daisy_player ();
_exit (0);
- }
- else
+ } // if
+ if (audiocd == 1)
{
- if (audiocd == 1)
- {
- player_pid = play_track (cd_dev, sound_dev, "alsa",
- daisy[current].first_lsn, speed);
- seconds = time (NULL);
- sector_ptr = 0;
- } // if
- if (audiocd == 0)
- {
- open_smil_file (daisy[current].smil_file,
- daisy[current].anchor);
- } // if
+ player_pid = play_track (cd_dev, sound_dev, "alsa",
+ daisy[current].first_lsn, speed);
+ seconds = time (NULL);
+ sector_ptr = 0;
+ } // if
+ if (audiocd == 0)
+ {
+ open_smil_file (daisy[current].smil_file,
+ daisy[current].anchor);
} // if
start_time = 0;
break;
@@ -1553,8 +1556,9 @@ void browse ()
int flag = 0;
if (playing < 0)
- flag = 1;
- pause_resume ();
+ flag = 1;
+ if (! discinfo)
+ pause_resume ();
player_pid = -2;
help ();
if (flag)
@@ -1885,7 +1889,7 @@ void browse ()
void usage (char *argv)
{
printf (gettext ("Daisy-player - Version %s\n"), DAISY_PLAYER_VERSION);
- puts ("(C)2003-2013 J. Lemmens");
+ puts ("(C)2003-2014 J. Lemmens");
printf (gettext ("\nUsage: %s [directory_with_a_Daisy-structure] "),
basename (argv));
printf (gettext ("[-c cdrom_device] [-d ALSA_sound_device] [-n | -y]\n"));
@@ -1955,13 +1959,13 @@ void handle_discinfo (char *discinfo_html)
} // if (strcasecmp (tag, "title") == 0)
if (strcasecmp (tag, "a") == 0)
{
- strncpy (daisy[current].daisy_mp, my_attribute.href, MAX_STR - 1);
- xmlDocPtr doc = xmlRecoverFile (daisy[current].daisy_mp);
+ strncpy (daisy[current].filename, my_attribute.href, MAX_STR - 1);
+ xmlDocPtr doc = xmlRecoverFile (daisy[current].filename);
if (! (ncc = xmlReaderWalker (doc)))
{
endwin ();
beep ();
- printf (gettext ("\nCannot read %s\n"), daisy[current].daisy_mp);
+ printf (gettext ("\nCannot read %s\n"), daisy[current].filename);
fflush (stdout);
_exit (1);
} // if
@@ -1981,6 +1985,8 @@ void handle_discinfo (char *discinfo_html)
break;
} while (! *label);
strncpy (daisy[current].label, label, MAX_STR - 1);
+ strncpy (daisy[current].daisy_mp, dirname (daisy[current].filename),
+ MAX_STR - 1);
daisy[current].level = 1;
daisy[current].x = 0;
daisy[current].y = displaying;
@@ -1993,6 +1999,7 @@ void handle_discinfo (char *discinfo_html)
xmlFreeDoc (doc);
discinfo = 1;
total_items = current;
+ total_time = t;
h = t / 3600;
t -= h * 3600;
m = t / 60;
@@ -2006,7 +2013,7 @@ void handle_discinfo (char *discinfo_html)
int main (int argc, char *argv[])
{
int opt;
- char str[MAX_STR], DISCINFO_HTML[MAX_STR];
+ char str[MAX_STR], DISCINFO_HTML[MAX_STR], start_wd[MAX_STR];
LIBXML_TEST_VERSION // libxml2
@@ -2021,6 +2028,7 @@ int main (int argc, char *argv[])
setlocale (LC_ALL, "");
setlocale (LC_NUMERIC, "C");
textdomain (prog_name);
+ strncpy (start_wd, get_current_dir_name (), MAX_STR - 1);
opterr = 0;
while ((opt = getopt (argc, argv, "c:d:ny")) != -1)
{
@@ -2063,7 +2071,7 @@ int main (int argc, char *argv[])
} // if
fclose (stderr);
getmaxyx (screenwin, max_y, max_x);
- printw ("(C)2003-2013 J. Lemmens\n");
+ printw ("(C)2003-2014 J. Lemmens\n");
printw (gettext ("Daisy-player - Version %s\n"), DAISY_PLAYER_VERSION);
printw (gettext ("A parser to play Daisy CD's with Linux\n"));
if (system ("udisks -h > /dev/null") > 0)
@@ -2184,7 +2192,6 @@ int main (int argc, char *argv[])
usage (prog_name);
} // if
magic_close (myt);
-
}
else
// when no mount-point is given try to mount the cd
@@ -2387,7 +2394,7 @@ int main (int argc, char *argv[])
} // if audiocd == 0
wattron (titlewin, A_BOLD);
snprintf (str, MAX_STR - 1, gettext
- ("Daisy-player - Version %s - (C)2013 J. Lemmens"),
+ ("Daisy-player - Version %s - (C)2014 J. Lemmens"),
DAISY_PLAYER_VERSION);
mvwprintw (titlewin, 0, 0, str);
wrefresh (titlewin);
@@ -2413,6 +2420,6 @@ int main (int argc, char *argv[])
fflush (stdout);
_exit (0);
} // if
- browse ();
+ browse (start_wd, argv[0]);
return 0;
} // main
diff --git a/src/daisy.h b/src/daisy.h
index bd19118..0d940ef 100644
--- a/src/daisy.h
+++ b/src/daisy.h
@@ -1,5 +1,5 @@
/* header file for daisy-player and eBook-speaker
- * Copyright (C) 2013 J. Lemmens
+ * Copyright (C)2014 J. Lemmens
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/daisy3.c b/src/daisy3.c
index dd96a39..19a1e17 100644
--- a/src/daisy3.c
+++ b/src/daisy3.c
@@ -1,5 +1,5 @@
/* daisy3.c - functions to insert daisy3 info into a struct.
- * Copyright (C) 2013 J. Lemmens
+ * Copyright (C)2014 J. Lemmens
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/paranoia.c b/src/paranoia.c
index c06a397..0ad873a 100644
--- a/src/paranoia.c
+++ b/src/paranoia.c
@@ -1,6 +1,6 @@
/* paranoia.c
*
- * Copyright (C) 2013 J. Lemmens
+ * Copyright (C)2014 J. Lemmens
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the