From d73759b10e1d9382d302c422507fba0b2a53420a Mon Sep 17 00:00:00 2001 From: wbaumann Date: Sun, 15 Nov 2009 09:36:24 +0000 Subject: [PATCH] fix log message --- ChangeLog | 8 ++++++++ INSTALL | 8 ++++---- NEWS | 2 +- README | 4 ++-- configure.ac | 2 +- po/cs.po | 31 ++++++++++++++++--------------- po/davfs2.pot | 37 +++++++++++++++++++------------------ po/de.po | 33 +++++++++++++++++---------------- src/cache.c | 7 ++++--- 9 files changed, 72 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89a36fb..1dd8f4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ ChangeLog for davfs2 -------------------- +2009-11-15 Werner Baumann (werner.baumann@onlinehome.de) + * cache.c, dav_create: + Fix log message. + * Released version 1.4.5 + +2009-11-15 Werner Baumann (werner.baumann@onlinehome.de) + * Released version 1.4.4 + 2009-11-14 Werner Baumann (werner.baumann@onlinehome.de) * cache.c, dav_init_cache: Initialize fs_stat->files. diff --git a/INSTALL b/INSTALL index 8067024..1c7be1c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -2009-1-14 +2009-04-12 ---------- # Copyright (C) 2006, 2007, 2008, 2009 Werner Baumann @@ -7,7 +7,7 @@ # permitted in any medium without royalty. -DAVFS2 1.4.4 INSTALLATION +DAVFS2 1.3.2 INSTALLATION ========================= 1 UPDATING FROM PREVIOUS VERSION @@ -51,8 +51,8 @@ the files from the backup directory you may need some day. ---------------- davfs2 uses the neon libraries for communication with the server. -libneon (0.25, 0.26, 0.27, 0.28 or 0.29) must be installed. Your distribution -will most likely provide a package. +libneon (2.5, 2.6, 2.7 or 2.8) must be installed. Your distribution will most +likely provide a package. You will also need the neon header files. Distributions usually provide development packages for this. If your distribution don't come with libneon or it does not support TLS and diff --git a/NEWS b/NEWS index da7a449..177ddaf 100644 --- a/NEWS +++ b/NEWS @@ -4,7 +4,7 @@ # permitted in any medium without royalty. -What is new in davfs2 1.4.4 +What is new in davfs2 1.4.5 =========================== If option 'ask_auth 0' is set, davfs2 will no langer prompt the user diff --git a/README b/README index 6655e09..9354013 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -2009-04-12 +2009-11-15 ---------- # Copyright (C) 2006, 2007, 2008, 2009 Werner Baumann @@ -7,7 +7,7 @@ # permitted in any medium without royalty. -DAVFS2 1.4.0 README +DAVFS2 1.4.5 README =================== 1 INTRODUCTION diff --git a/configure.ac b/configure.ac index 878928f..24938ae 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_PREREQ(2.59) -AC_INIT(davfs2, 1.4.4, http://savannah.nongnu.org/projects/davfs2) +AC_INIT(davfs2, 1.4.5, http://savannah.nongnu.org/projects/davfs2) AC_CONFIG_SRCDIR([src/cache.c]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE diff --git a/po/cs.po b/po/cs.po index 7e17f9b..eaaebaf 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-11-14 13:26+0100\n" +"POT-Creation-Date: 2009-11-15 10:23+0100\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -62,68 +62,69 @@ msgid "can't create new index file for %s" msgstr "nemohu vytvořit nový indexový soubor pro %s" #: src/cache.c:939 +#, c-format msgid "" -"The server reports a file that should not exist.Maybe it is an error in the " -"servers LOCK impementation.You may try option 'use_locks 0' in davfs2.conf." +"File %s exists on the server but should not. Maybe it is an error in the " +"servers LOCK impementation. You may try option 'use_locks 0' in davfs2.conf." msgstr "" -#: src/cache.c:2562 src/cache.c:2596 +#: src/cache.c:2563 src/cache.c:2597 #, c-format msgid "can't create cache file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/cache.c:2611 +#: src/cache.c:2612 #, c-format msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2779 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/cache.c:2780 src/mount_davfs.c:595 src/mount_davfs.c:597 #: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 #: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 #: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" -#: src/cache.c:2790 +#: src/cache.c:2791 #, c-format msgid "can't open cache directory %s" msgstr "nemohu otevřít kešovací adresář %s" -#: src/cache.c:2805 +#: src/cache.c:2806 #, c-format msgid "can't create cache directory %s" msgstr "nemohu vytvořit kešovací adresář %s" -#: src/cache.c:2812 +#: src/cache.c:2813 #, c-format msgid "can't access cache directory %s" msgstr "nemohu přistoupit ke kešovacímu adresáři %s" -#: src/cache.c:2815 +#: src/cache.c:2816 #, c-format msgid "wrong owner of cache directory %s" msgstr "chybný vlastník kešovacího adresáře %s" -#: src/cache.c:2819 +#: src/cache.c:2820 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "pro kešovací adresář %s nastaveno chybné oprávnění" -#: src/cache.c:2849 +#: src/cache.c:2850 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2922 +#: src/cache.c:2923 #, c-format msgid "error parsing %s" msgstr "chyba při zpracování %s" -#: src/cache.c:2923 +#: src/cache.c:2924 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2968 +#: src/cache.c:2969 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" diff --git a/po/davfs2.pot b/po/davfs2.pot index 492c76f..cf1b4cc 100644 --- a/po/davfs2.pot +++ b/po/davfs2.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-11-14 13:26+0100\n" +"POT-Creation-Date: 2009-11-15 10:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,68 +57,69 @@ msgid "can't create new index file for %s" msgstr "" #: src/cache.c:939 +#, c-format msgid "" -"The server reports a file that should not exist.Maybe it is an error in the " -"servers LOCK impementation.You may try option 'use_locks 0' in davfs2.conf." +"File %s exists on the server but should not. Maybe it is an error in the " +"servers LOCK impementation. You may try option 'use_locks 0' in davfs2.conf." msgstr "" -#: src/cache.c:2562 src/cache.c:2596 +#: src/cache.c:2563 src/cache.c:2597 #, c-format msgid "can't create cache file %s" msgstr "" -#: src/cache.c:2611 +#: src/cache.c:2612 #, c-format msgid "error writing directory %s" msgstr "" -#: src/cache.c:2779 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/cache.c:2780 src/mount_davfs.c:595 src/mount_davfs.c:597 #: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 #: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 #: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "" -#: src/cache.c:2790 +#: src/cache.c:2791 #, c-format msgid "can't open cache directory %s" msgstr "" -#: src/cache.c:2805 +#: src/cache.c:2806 #, c-format msgid "can't create cache directory %s" msgstr "" -#: src/cache.c:2812 +#: src/cache.c:2813 #, c-format msgid "can't access cache directory %s" msgstr "" -#: src/cache.c:2815 +#: src/cache.c:2816 #, c-format msgid "wrong owner of cache directory %s" msgstr "" -#: src/cache.c:2819 +#: src/cache.c:2820 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "" -#: src/cache.c:2849 +#: src/cache.c:2850 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2922 -#, c-format -msgid "error parsing %s" -msgstr "" - #: src/cache.c:2923 #, c-format +msgid "error parsing %s" +msgstr "" + +#: src/cache.c:2924 +#, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2968 +#: src/cache.c:2969 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" diff --git a/po/de.po b/po/de.po index 7706b94..23a0b66 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: davfs2 1.3.3\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-11-14 13:26+0100\n" +"POT-Creation-Date: 2009-11-15 10:23+0100\n" "PO-Revision-Date: 2009-01-02 12:26+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -62,71 +62,72 @@ msgid "can't create new index file for %s" msgstr "kann keine neue Indexdatei für %s erzeugen" #: src/cache.c:939 +#, c-format msgid "" -"The server reports a file that should not exist.Maybe it is an error in the " -"servers LOCK impementation.You may try option 'use_locks 0' in davfs2.conf." +"File %s exists on the server but should not. Maybe it is an error in the " +"servers LOCK impementation. You may try option 'use_locks 0' in davfs2.conf." msgstr "" -"Der Server meldet eine Datei, die es nicht geben sollte. Vielleicht " +"Die Datei %s existiert auf dem Server, sollte es aber nicht. Vielleicht " "behandelt der Server LOCK-Requests fehlerhaft. Du kannst es mit der Option " "'use_locks 0' in davfs2.conf versuchen." -#: src/cache.c:2562 src/cache.c:2596 +#: src/cache.c:2563 src/cache.c:2597 #, c-format msgid "can't create cache file %s" msgstr "kann die Cachedatei %s nicht erzeugen" -#: src/cache.c:2611 +#: src/cache.c:2612 #, c-format msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2779 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/cache.c:2780 src/mount_davfs.c:595 src/mount_davfs.c:597 #: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 #: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 #: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" -#: src/cache.c:2790 +#: src/cache.c:2791 #, c-format msgid "can't open cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht öffnen" -#: src/cache.c:2805 +#: src/cache.c:2806 #, c-format msgid "can't create cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht erzeugen" -#: src/cache.c:2812 +#: src/cache.c:2813 #, c-format msgid "can't access cache directory %s" msgstr "Zugriff auf das Cachverzeichnis %s verweigert" -#: src/cache.c:2815 +#: src/cache.c:2816 #, c-format msgid "wrong owner of cache directory %s" msgstr "das Cacheverzeichnis %s hat den falschen Besitzer" -#: src/cache.c:2819 +#: src/cache.c:2820 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "das Cachverzeichnis %s hat die falschen Dateirechte" -#: src/cache.c:2849 +#: src/cache.c:2850 msgid "found orphaned file in cache:" msgstr "fand verwaiste Datei im Cache:" -#: src/cache.c:2922 +#: src/cache.c:2923 #, c-format msgid "error parsing %s" msgstr "Syntaxfehler in %s" -#: src/cache.c:2923 +#: src/cache.c:2924 #, c-format msgid " at line %i" msgstr " in Zeile %i" -#: src/cache.c:2968 +#: src/cache.c:2969 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" diff --git a/src/cache.c b/src/cache.c index ad2bb88..80dce6e 100644 --- a/src/cache.c +++ b/src/cache.c @@ -936,9 +936,10 @@ dav_create(dav_node **nodep, dav_node *parent, const char *name, uid_t uid, ret = dav_lock(path, &(*nodep)->lock_expire, &(*nodep)->remote_exists); if (ret == EEXIST) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR), - _("The server reports a file that should not exist." - "Maybe it is an error in the servers LOCK impementation." - "You may try option 'use_locks 0' in davfs2.conf.")); + _("File %s exists on the server but should not. " + "Maybe it is an error in the servers LOCK impementation. " + "You may try option 'use_locks 0' in davfs2.conf."), + (*nodep)->path); if (!ret) { (*nodep)->smtime = (*nodep)->mtime;