diff --git a/ChangeLog b/ChangeLog
index b744112..02137af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
 ChangeLog for davfs2
 --------------------
 
+2010-11-07 Werner Baumann (werner.baumann@onlinehome.de)
+    * webdav.c:
+      Make calls to iconv functions depend on HAVE_ICONV.
+    * webdav.c, log_writer:
+      Use format string in syslog.
+    * cache.c, create_cache_file, create_dir_cache_file:
+      Use format string in syslog.
+    * mount_davfs.c, check_dirs:
+      Check return value of system call and ignore it.
+    * kernel_interface.c, init_coda, init_fuse:
+      Check return value of system call.
+      Check return values of chown and chmod.
+
 2010-11-03 Werner Baumann (werner.baumann@onlinehome.de)
     * mount_davfs.c, check_mountpoint:
       Always canonicalize mount point.
diff --git a/Makefile.am b/Makefile.am
index 335b3c5..adfe9f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 EXTRA_DIST = bootstrap BUGS FAQ README.translators \
              config/COPYING.davfs2 config/INSTALL.davfs2
-SUBDIRS = po etc man src
+SUBDIRS = gl po etc man src
 ACLOCAL_AMFLAGS = -I config
 doc_DATA = AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README \
            README.translators THANKS TODO
diff --git a/bootstrap b/bootstrap
index ad5ee59..1f849ca 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,6 +8,7 @@
 
 set -ex
 autopoint --force
+gnulib-tool --update
 cd man; po4a po4a.conf; cd ..
 aclocal -I config
 autoheader
diff --git a/config/gnulib-cache.m4 b/config/gnulib-cache.m4
new file mode 100644
index 0000000..b0e3b12
--- /dev/null
+++ b/config/gnulib-cache.m4
@@ -0,0 +1,32 @@
+# Copyright (C) 2004-2007 Free Software Foundation, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the specification of how gnulib-tool is used.
+# It acts as a cache: It is written and read by gnulib-tool.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
+
+
+# Specification in the form of a command-line invocation:
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=config --doc-base=doc --aux-dir=config --no-libtool --macro-prefix=gl canonicalize rpmatch
+
+# Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_LOCAL_DIR([])
+gl_MODULES([canonicalize rpmatch])
+gl_AVOID([])
+gl_SOURCE_BASE([gl])
+gl_M4_BASE([config])
+gl_PO_BASE([])
+gl_DOC_BASE([doc])
+gl_TESTS_BASE([tests])
+gl_LIB([libgnu])
+gl_MAKEFILE_NAME([])
+gl_MACRO_PREFIX([gl])
+gl_PO_DOMAIN([])
diff --git a/configure.ac b/configure.ac
index 8b27fa9..bb14a6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,10 @@ AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.
 AC_PROG_CC
+gl_EARLY
 AC_PROG_INSTALL
 AC_PROG_LN_S
+gl_INIT
 
 # Checks for libraries.
 AM_GNU_GETTEXT_VERSION(0.14.4)
@@ -42,7 +44,7 @@ DAV_CHECK_NEON
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h libintl.h langinfo.h limits.h locale.h mntent.h stddef.h stdint.h stdlib.h string.h sys/mount.h sys/time.h syslog.h termios.h unistd.h utime.h])
+AC_CHECK_HEADERS([fcntl.h iconv.h libintl.h langinfo.h limits.h locale.h mntent.h stddef.h stdint.h stdlib.h string.h sys/mount.h sys/time.h syslog.h termios.h unistd.h utime.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -77,7 +79,7 @@ AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_STRFTIME
 AC_FUNC_STAT
 AC_FUNC_UTIME_NULL
-AC_CHECK_FUNCS([endpwent ftruncate getmntent memset mkdir nl_langinfo rpmatch select setlocale strcasecmp strchr strdup strerror strpbrk strrchr strstr strtol utime])
+AC_CHECK_FUNCS([endpwent ftruncate getmntent iconv memset mkdir nl_langinfo rpmatch select setlocale strcasecmp strchr strdup strerror strpbrk strrchr strstr strtol utime])
 
 # Misc.
 DAV_DEFAULTS
@@ -91,6 +93,7 @@ AC_CONFIG_FILES([Makefile
                  man/Makefile
                  man/de/Makefile
                  man/es/Makefile
-                 src/Makefile])
+                 src/Makefile
+                 gl/Makefile])
 AC_OUTPUT
 DAV_MESSAGE
diff --git a/etc/Makefile.am b/etc/Makefile.am
index cc6d62a..5a01282 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -25,8 +25,8 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 install-data-local: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
-	$(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf
-	$(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets
+	$(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf
+	$(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(DESTDIR)$(pkgsysconfdir)/secrets
 	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs
 	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private
 	chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private
diff --git a/po/cs.po b/po/cs.po
index 67c8996..3166c3e 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: 2010-04-30 21:41+0200\n"
+"POT-Creation-Date: 2010-11-08 11:57+0100\n"
 "PO-Revision-Date: 2007-05-03 19:50+0200\n"
 "Last-Translator: Vítězslav Kotrla <vitko@post.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -78,10 +78,10 @@ msgstr "nemohu vytvořit soubor vyrovnávací paměti %s"
 msgid "error writing directory %s"
 msgstr "chyba při zápisu adresáře %s"
 
-#: 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
+#: src/cache.c:2780 src/mount_davfs.c:589 src/mount_davfs.c:591
+#: src/mount_davfs.c:785 src/mount_davfs.c:787 src/mount_davfs.c:793
+#: src/mount_davfs.c:833 src/mount_davfs.c:835 src/mount_davfs.c:852
+#: src/mount_davfs.c:854 src/mount_davfs.c:1743 src/mount_davfs.c:1745
 msgid "can't read user data base"
 msgstr "nemohu přečíst údaje o uživatelích"
 
@@ -155,108 +155,108 @@ msgstr "zařízení coda otevřeno úspěšně"
 msgid "unknown kernel file system %s"
 msgstr "neznámý jaderný souborový systém %s"
 
-#: src/kernel_interface.c:192
+#: src/kernel_interface.c:194
 msgid "no free coda device to mount"
 msgstr "pro připojení není volné žádné coda zařízení"
 
-#: src/kernel_interface.c:201
+#: src/kernel_interface.c:203
 #, c-format
 msgid "CODA_KERNEL_VERSION %u not supported"
 msgstr "CODA_KERNEL_VERSION %u není podporováno"
 
-#: src/kernel_interface.c:240
+#: src/kernel_interface.c:243
 msgid "can't open fuse device"
 msgstr "nemohu otevřít fuse zařízení"
 
-#: src/kernel_interface.c:266
+#: src/kernel_interface.c:269
 msgid "can't mount using fuse kernel file system"
 msgstr "nemohu připojit jaderný souborový systém fuse"
 
-#: src/mount_davfs.c:243
+#: src/mount_davfs.c:237
 msgid "program is not setuid root"
 msgstr "program není spuštěn jako setuid root"
 
-#: src/mount_davfs.c:245 src/mount_davfs.c:447 src/mount_davfs.c:451
+#: src/mount_davfs.c:239 src/mount_davfs.c:441 src/mount_davfs.c:445
 msgid "can't change effective user id"
 msgstr "nemohu změnit identifikátor efektivního uživatele"
 
-#: src/mount_davfs.c:311
+#: src/mount_davfs.c:305
 msgid "can't start daemon process"
 msgstr "nemohu spustit proces na pozadí"
 
-#: src/mount_davfs.c:334
+#: src/mount_davfs.c:328
 msgid "can't release root privileges"
 msgstr "nemohu uvolnit oprávnění uživatele root"
 
-#: src/mount_davfs.c:354
+#: src/mount_davfs.c:348
 msgid "failed to release tty properly"
 msgstr ""
 
-#: src/mount_davfs.c:366
+#: src/mount_davfs.c:360
 #, c-format
 msgid "can't write pid file %s"
 msgstr "nemohu zapsat pid souboru %s"
 
-#: src/mount_davfs.c:384
+#: src/mount_davfs.c:378
 #, c-format
 msgid "unmounting %s"
 msgstr "odpojuji %s"
 
-#: src/mount_davfs.c:386
+#: src/mount_davfs.c:380
 msgid "unmounting failed"
 msgstr "odpojení selhalo"
 
-#: src/mount_davfs.c:435 src/mount_davfs.c:498 src/mount_davfs.c:581
-#: src/mount_davfs.c:855
+#: src/mount_davfs.c:429 src/mount_davfs.c:492 src/mount_davfs.c:575
+#: src/mount_davfs.c:857
 #, c-format
 msgid "group %s does not exist"
 msgstr "skupina %s neexistuje"
 
-#: src/mount_davfs.c:439
+#: src/mount_davfs.c:433
 msgid "can't change group id"
 msgstr "nemohu změnit id skupiny"
 
-#: src/mount_davfs.c:444
+#: src/mount_davfs.c:438
 #, c-format
 msgid "user %s does not exist"
 msgstr "uživatel %s neexistuje"
 
-#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601
+#: src/mount_davfs.c:478 src/mount_davfs.c:560 src/mount_davfs.c:595
 #, c-format
 msgid "can't create directory %s"
 msgstr "nemohu vytvořit adresář %s"
 
-#: src/mount_davfs.c:488 src/mount_davfs.c:570 src/mount_davfs.c:605
-#: src/mount_davfs.c:610 src/mount_davfs.c:619
+#: src/mount_davfs.c:482 src/mount_davfs.c:564 src/mount_davfs.c:599
+#: src/mount_davfs.c:604 src/mount_davfs.c:613
 #, c-format
 msgid "can't access directory %s"
 msgstr "nemohu přistupovat k adresáři %s"
 
-#: src/mount_davfs.c:494 src/mount_davfs.c:576
+#: src/mount_davfs.c:488 src/mount_davfs.c:570
 #, c-format
 msgid "can't change mode of directory %s"
 msgstr "nemohu změnit oprávnění (mode) adresáře %s"
 
-#: src/mount_davfs.c:503 src/mount_davfs.c:586
+#: src/mount_davfs.c:497 src/mount_davfs.c:580
 #, c-format
 msgid "can't change group of directory %s"
 msgstr "nemohu změnit skupinu adresáře %s"
 
-#: src/mount_davfs.c:614 src/mount_davfs.c:836
+#: src/mount_davfs.c:608 src/mount_davfs.c:838
 msgid "can't read group data base"
 msgstr "nemohu přečíst údaje o skupinách"
 
-#: src/mount_davfs.c:637
+#: src/mount_davfs.c:631 src/mount_davfs.c:679
 #, c-format
 msgid "can't open file %s"
 msgstr "nemohu otevřít soubor %s"
 
-#: src/mount_davfs.c:642
+#: src/mount_davfs.c:636
 #, c-format
 msgid "%s is already mounted on %s"
 msgstr "%s už je připojeno jako %s"
 
-#: src/mount_davfs.c:665
+#: src/mount_davfs.c:659
 #, c-format
 msgid ""
 "found PID file %s.\n"
@@ -267,96 +267,86 @@ msgstr ""
 "Buď %s používá jiný proces, nebo\n"
 "jiné připojení skončilo neobvykle"
 
-#: src/mount_davfs.c:686
+#: src/mount_davfs.c:690
 #, c-format
 msgid "no entry for %s found in %s"
 msgstr "pro %s nebyla v %s nalezena žádná položka"
 
-#: src/mount_davfs.c:692
+#: src/mount_davfs.c:697
 #, c-format
 msgid "different URL in %s"
 msgstr "v %s je jiné URL"
 
-#: src/mount_davfs.c:700
+#: src/mount_davfs.c:702
 #, c-format
 msgid "different file system type in %s"
 msgstr "v %s je jiný souborový systém"
 
-#: src/mount_davfs.c:705
+#: src/mount_davfs.c:713
 #, c-format
 msgid "different config file in %s"
 msgstr "v %s je jiný konfigurační soubor"
 
-#: src/mount_davfs.c:711
+#: src/mount_davfs.c:719
 #, fuzzy, c-format
 msgid "different username in %s"
 msgstr "v %s je odlišný dir_mode"
 
-#: src/mount_davfs.c:715
+#: src/mount_davfs.c:723
 #, fuzzy, c-format
 msgid "neither option `user' nor option `users' set in %s"
 msgstr "volba 'user' není v %s nastavena"
 
-#: src/mount_davfs.c:718
-#, fuzzy, c-format
-msgid "different option `user' in %s"
-msgstr "v %s jsou jiné parametry připojení"
-
-#: src/mount_davfs.c:720
-#, fuzzy, c-format
-msgid "different option `users' in %s"
-msgstr "v %s jsou jiné parametry připojení"
-
-#: src/mount_davfs.c:723
+#: src/mount_davfs.c:726
 #, c-format
 msgid "different mount options in %s"
 msgstr "v %s jsou jiné parametry připojení"
 
-#: src/mount_davfs.c:726
+#: src/mount_davfs.c:729
 #, c-format
 msgid "different uid in %s"
 msgstr "v %s je odlišné uid"
 
-#: src/mount_davfs.c:728
+#: src/mount_davfs.c:731
 #, c-format
 msgid "different gid in %s"
 msgstr "v %s je odlišné gid"
 
-#: src/mount_davfs.c:730
+#: src/mount_davfs.c:733
 #, c-format
 msgid "different dir_mode in %s"
 msgstr "v %s je odlišný dir_mode"
 
-#: src/mount_davfs.c:732
+#: src/mount_davfs.c:735
 #, c-format
 msgid "different file_mode in %s"
 msgstr "v %s je odlišný file_mode"
 
-#: src/mount_davfs.c:760
+#: src/mount_davfs.c:762
 #, c-format
 msgid "can't evaluate path of mount point %s"
 msgstr "nemohu vyhodnotit cestu k přípojnému bodu %s"
 
-#: src/mount_davfs.c:765
+#: src/mount_davfs.c:770
 #, c-format
 msgid "can't get home directory for uid %i"
 msgstr "nemohu zjistit domovský adresář pro uid %i"
 
-#: src/mount_davfs.c:767
+#: src/mount_davfs.c:772
 msgid "A relative mount point must lie within your home directory"
 msgstr "Relativní přípojný bod musí ležet ve vašem domovském adresáři"
 
-#: src/mount_davfs.c:775
+#: src/mount_davfs.c:777
 #, c-format
 msgid "invalid mount point %s"
 msgstr "neplatný přípojný bod %s"
 
-#: src/mount_davfs.c:778
+#: src/mount_davfs.c:780
 #, c-format
 msgid "mount point %s does not exist"
 msgstr "přípojný bod %s neexistuje"
 
-#: src/mount_davfs.c:796
+#: src/mount_davfs.c:798
 #, c-format
 msgid ""
 "%s is the home directory of user %s.\n"
@@ -365,34 +355,34 @@ msgstr ""
 "%s je domovský adresář uživatele %s.\n"
 "Do domovského adresáře jiného uživatele nemůžete nic připojovat"
 
-#: src/mount_davfs.c:824
+#: src/mount_davfs.c:826
 msgid "you can't set file owner different from your uid"
 msgstr "nemůžete nastavit jiného vlastníka souboru než je vaše uid"
 
-#: src/mount_davfs.c:842
+#: src/mount_davfs.c:844
 msgid "you must be member of the group of the file system"
 msgstr "musíte být členem skupiny souborového systému"
 
-#: src/mount_davfs.c:862
+#: src/mount_davfs.c:864
 #, c-format
 msgid "user %s must be member of group %s"
 msgstr "uživatel %s musí být členem skupiny %s"
 
-#: src/mount_davfs.c:885
+#: src/mount_davfs.c:887
 #, c-format
 msgid "can't mount %s on %s"
 msgstr "není možno připojit %s do %s"
 
-#: src/mount_davfs.c:887
+#: src/mount_davfs.c:889
 #, c-format
 msgid "kernel does not know file system %s"
 msgstr "kernel nezná souborový systém %s"
 
-#: src/mount_davfs.c:889
+#: src/mount_davfs.c:891
 msgid "mount point is busy"
 msgstr "přípojný bod je zaneprázdněn"
 
-#: src/mount_davfs.c:951 src/umount_davfs.c:88
+#: src/mount_davfs.c:967 src/umount_davfs.c:88
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -403,55 +393,55 @@ msgstr ""
 "Program je poskytován BEZ JAKÉKOLIV záruky, včetně záruky PRODEJNOSTI či "
 "VHODNOSTI K URČITÉMU ÚČELU.\n"
 
-#: src/mount_davfs.c:967 src/umount_davfs.c:113
+#: src/mount_davfs.c:983 src/umount_davfs.c:113
 msgid "unknown error parsing arguments"
 msgstr "neznámá chyba při zpracování argumentů"
 
-#: src/mount_davfs.c:976 src/umount_davfs.c:119
+#: src/mount_davfs.c:992 src/umount_davfs.c:119
 msgid "missing argument"
 msgstr "chybějící argument"
 
-#: src/mount_davfs.c:989 src/umount_davfs.c:121
+#: src/mount_davfs.c:1005 src/umount_davfs.c:121
 msgid "too many arguments"
 msgstr "příliš mnoho argumentů"
 
-#: src/mount_davfs.c:995
+#: src/mount_davfs.c:1011
 msgid "no mountpoint specified"
 msgstr "nebyl zadán žádný přípojný bod"
 
-#: src/mount_davfs.c:1000
+#: src/mount_davfs.c:1016
 msgid "no WebDAV-server specified"
 msgstr "nebyl zadán žádný WebDAV server"
 
-#: src/mount_davfs.c:1003
+#: src/mount_davfs.c:1019
 msgid "invalid URL"
 msgstr "neplatné URL"
 
-#: src/mount_davfs.c:1022
+#: src/mount_davfs.c:1038
 msgid "can't determine home directory"
 msgstr "nelze určit domovský adresář"
 
-#: src/mount_davfs.c:1100 src/webdav.c:419
+#: src/mount_davfs.c:1116 src/webdav.c:427
 #, c-format
 msgid "can't read client certificate %s"
 msgstr "nelze přečíst klientský certifikát %s"
 
-#: src/mount_davfs.c:1105
+#: src/mount_davfs.c:1121
 #, c-format
 msgid "client certificate file %s has wrong owner"
 msgstr "klientský certifikát %s má chybného vlastníka"
 
-#: src/mount_davfs.c:1111
+#: src/mount_davfs.c:1127
 #, c-format
 msgid "client certificate file %s has wrong permissions"
 msgstr "soubor s klientským certifikátem %s má chybná oprávnění"
 
-#: src/mount_davfs.c:1161 src/mount_davfs.c:1174 src/mount_davfs.c:1176
-#: src/mount_davfs.c:1194 src/mount_davfs.c:1196 src/webdav.c:426
+#: src/mount_davfs.c:1177 src/mount_davfs.c:1190 src/mount_davfs.c:1192
+#: src/mount_davfs.c:1210 src/mount_davfs.c:1212 src/webdav.c:434
 msgid "Password: "
 msgstr "Heslo: "
 
-#: src/mount_davfs.c:1165
+#: src/mount_davfs.c:1181
 #, fuzzy, c-format
 msgid ""
 "Please enter the username to authenticate with proxy\n"
@@ -461,11 +451,11 @@ msgstr ""
 "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n"
 "Uživatelské jméno: "
 
-#: src/mount_davfs.c:1167 src/mount_davfs.c:1187
+#: src/mount_davfs.c:1183 src/mount_davfs.c:1203
 msgid "Username:"
 msgstr ""
 
-#: src/mount_davfs.c:1171
+#: src/mount_davfs.c:1187
 #, c-format
 msgid ""
 "Please enter the password to authenticate user %s with proxy\n"
@@ -474,7 +464,7 @@ msgstr ""
 "Zadejte prosím heslo pro autentizaci uživatele %s na proxy\n"
 "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n"
 
-#: src/mount_davfs.c:1185
+#: src/mount_davfs.c:1201
 #, fuzzy, c-format
 msgid ""
 "Please enter the username to authenticate with server\n"
@@ -484,7 +474,7 @@ msgstr ""
 "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n"
 "Uživatelské jméno: "
 
-#: src/mount_davfs.c:1191
+#: src/mount_davfs.c:1207
 #, c-format
 msgid ""
 "Please enter the password to authenticate user %s with server\n"
@@ -493,12 +483,12 @@ msgstr ""
 "Zadejte prosím heslo uživatele %s pro autentizaci na serveru\n"
 "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n"
 
-#: src/mount_davfs.c:1246
+#: src/mount_davfs.c:1262
 #, c-format
 msgid "pid %i, got signal %i"
 msgstr "pid %i dostal signál %i"
 
-#: src/mount_davfs.c:1278
+#: src/mount_davfs.c:1294
 msgid ""
 "Warning: can't read user data base. Mounting anyway, but there is no entry "
 "in mtab."
@@ -506,62 +496,62 @@ msgstr ""
 "Varování: nelze přečíst údaje o uživatelích. Přesto připojuji, v mtab ale "
 "nebude žádný záznam."
 
-#: src/mount_davfs.c:1295
+#: src/mount_davfs.c:1311
 msgid ""
 "Warning: can't write entry into mtab, but will mount the file system anyway"
 msgstr ""
 "Varování: nelze zapsat položku do mtab, přesto souborový systém připojím"
 
-#: src/mount_davfs.c:1321
+#: src/mount_davfs.c:1337
 #, c-format
 msgid "option %s has invalid argument;it must be a decimal number"
 msgstr "volba %s má neplatný argument; musí to být číslo v desítkové soustavě"
 
-#: src/mount_davfs.c:1324
+#: src/mount_davfs.c:1340
 #, c-format
 msgid "option %s has invalid argument;it must be an octal number"
 msgstr "volba %s má neplatný argument; musí to být číslo v osmičkové soustavě"
 
-#: src/mount_davfs.c:1327
+#: src/mount_davfs.c:1343
 #, c-format
 msgid "option %s has invalid argument;it must be a number"
 msgstr "volba %s má neplatný argument; musí to být číslo"
 
-#: src/mount_davfs.c:1591
+#: src/mount_davfs.c:1609
 #, c-format
 msgid "option %s requires argument"
 msgstr "volba %s vyžaduje argument"
 
-#: src/mount_davfs.c:1687
+#: src/mount_davfs.c:1705
 #, c-format
 msgid "Unknown option %s.\n"
 msgstr "Neznámá volba %s.\n"
 
-#: src/mount_davfs.c:2143 src/mount_davfs.c:2366 src/mount_davfs.c:2378
+#: src/mount_davfs.c:2151 src/mount_davfs.c:2374 src/mount_davfs.c:2386
 #, fuzzy, c-format
 msgid "opening %s failed"
 msgstr "odpojení selhalo"
 
-#: src/mount_davfs.c:2164 src/mount_davfs.c:2204 src/mount_davfs.c:2293
-#: src/mount_davfs.c:2394 src/mount_davfs.c:2462
+#: src/mount_davfs.c:2172 src/mount_davfs.c:2212 src/mount_davfs.c:2301
+#: src/mount_davfs.c:2402 src/mount_davfs.c:2470
 msgid "malformed line"
 msgstr "špatně zapsaný řádek"
 
-#: src/mount_davfs.c:2274 src/mount_davfs.c:2287
+#: src/mount_davfs.c:2282 src/mount_davfs.c:2295
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: src/mount_davfs.c:2370
+#: src/mount_davfs.c:2378
 #, c-format
 msgid "file %s has wrong owner"
 msgstr "soubor %s má chybného vlastníka"
 
-#: src/mount_davfs.c:2373
+#: src/mount_davfs.c:2381
 #, c-format
 msgid "file %s has wrong permissions"
 msgstr "soubor %s má chybná oprávnění"
 
-#: src/mount_davfs.c:2600
+#: src/mount_davfs.c:2608
 #, c-format
 msgid ""
 "Usage:\n"
@@ -574,7 +564,7 @@ msgstr ""
 "    %s -h,--help      : vytiskne tuto zprávu\n"
 "\n"
 
-#: src/mount_davfs.c:2604
+#: src/mount_davfs.c:2612
 #, c-format
 msgid ""
 "To mount a WebDAV-resource don't call %s directly, but use\n"
@@ -583,7 +573,7 @@ msgstr ""
 "Pro připojení zdroje WebDAV nevolejte přímo %s, ale\n"
 "použijte místo toho `mount'.\n"
 
-#: src/mount_davfs.c:2606
+#: src/mount_davfs.c:2614
 #, c-format
 msgid ""
 "    mount <mountpoint>  : or\n"
@@ -594,7 +584,7 @@ msgstr ""
 "    mount <url_serveru> : připojí zdroj WebDAV tak, jak je zadáno\n"
 "                          v /etc/fstab.\n"
 
-#: src/mount_davfs.c:2609
+#: src/mount_davfs.c:2617
 #, c-format
 msgid ""
 "    mount -t davfs <server-url> <mountpoint> [-o options]\n"
@@ -611,7 +601,7 @@ msgstr ""
 "                          označuje seznam voleb oddělených čárkou.\n"
 "\n"
 
-#: src/mount_davfs.c:2614
+#: src/mount_davfs.c:2622
 #, c-format
 msgid ""
 "Recognised options:\n"
@@ -630,7 +620,7 @@ msgstr ""
 "    file_mode=   : výchozí mode souboru (v osmičkové soustavě)\n"
 "    dir_mode=    : výchozí mode adresáře (v osmičkové soustavě)\n"
 
-#: src/mount_davfs.c:2620
+#: src/mount_davfs.c:2628
 #, c-format
 msgid ""
 "    ro           : mount read-only\n"
@@ -729,25 +719,25 @@ msgstr "%s: čekám, než si  %s (pid %s) sesynchronizuje vyrovnávací paměť.
 msgid "an error occured while waiting; please wait for %s to terminate"
 msgstr "při čekání došlo k chybě; čekejte prosím až %s skončí"
 
-#: src/webdav.c:344
+#: src/webdav.c:352
 #, fuzzy
 msgid "socket library initialization failed"
 msgstr "selhala inicializace knihovny socketů"
 
-#: src/webdav.c:357
+#: src/webdav.c:365
 msgid "can't open stream to log neon-messages"
 msgstr ""
 
-#: src/webdav.c:398
+#: src/webdav.c:406
 msgid "neon library does not support TLS/SSL"
 msgstr "knihovna neon nepodporuje TLS/SSL"
 
-#: src/webdav.c:406
+#: src/webdav.c:414
 #, c-format
 msgid "can't read server certificate %s"
 msgstr "nemohu přečíst serverový cerifikát %s"
 
-#: src/webdav.c:424
+#: src/webdav.c:432
 #, c-format
 msgid ""
 "Please enter the password to decrypt client\n"
@@ -756,78 +746,78 @@ msgstr ""
 "Zadejte prosím heslo pro dešifrování klientského\n"
 "certifikátu %s.\n"
 
-#: src/webdav.c:438
+#: src/webdav.c:446
 #, c-format
 msgid "can't decrypt client certificate %s"
 msgstr "nemohu dešifrovat klientský certifikát %s"
 
-#: src/webdav.c:492 src/webdav.c:495
+#: src/webdav.c:500 src/webdav.c:503
 msgid "mounting failed; the server does not support WebDAV"
 msgstr "připojení selhalo; server nepodporuje WebDAV"
 
-#: src/webdav.c:503
+#: src/webdav.c:511
 msgid "warning: the server does not support locks"
 msgstr "varování: server nepodporuje zámky"
 
-#: src/webdav.c:1571
+#: src/webdav.c:1589
 msgid "authentication failure:"
 msgstr "selhání autentizace:"
 
-#: src/webdav.c:1609
+#: src/webdav.c:1627
 #, c-format
 msgid "%i can't open cache file"
 msgstr "%i nemůže otevřít soubor vyrovnávací paměti"
 
-#: src/webdav.c:1617
+#: src/webdav.c:1635
 #, c-format
 msgid "%i error writing to cache file"
 msgstr "%i chyba při zápisu do souboru vyrovnávací paměti"
 
-#: src/webdav.c:1926 src/webdav.c:1929
+#: src/webdav.c:1946 src/webdav.c:1949
 msgid "error processing server certificate"
 msgstr "chyba při zpracování certifikátu serveru"
 
-#: src/webdav.c:1940 src/webdav.c:1974
+#: src/webdav.c:1960 src/webdav.c:1994
 msgid "the server certificate is not yet valid"
 msgstr "certifikát serveru zatím není platný"
 
-#: src/webdav.c:1942 src/webdav.c:1977
+#: src/webdav.c:1962 src/webdav.c:1997
 msgid "the server certificate has expired"
 msgstr "platnost certifikátu serveru vypršela"
 
-#: src/webdav.c:1944 src/webdav.c:1980
+#: src/webdav.c:1964 src/webdav.c:2000
 msgid "the server certificate does not match the server name"
 msgstr "certifikát serveru nedopovídá jménu serveru"
 
-#: src/webdav.c:1946 src/webdav.c:1983
+#: src/webdav.c:1966 src/webdav.c:2003
 msgid "the server certificate is not trusted"
 msgstr "certifikát serveru je nedůvěryhodný"
 
-#: src/webdav.c:1948 src/webdav.c:1986
+#: src/webdav.c:1968 src/webdav.c:2006
 msgid "unknown certificate error"
 msgstr "neznámá chyba certifikátu"
 
-#: src/webdav.c:1949
+#: src/webdav.c:1969
 #, c-format
 msgid "  issuer:      %s"
 msgstr "  vydavatel:      %s"
 
-#: src/webdav.c:1951
+#: src/webdav.c:1971
 #, c-format
 msgid "  subject:     %s"
 msgstr "  subjekt:     %s"
 
-#: src/webdav.c:1953
+#: src/webdav.c:1973
 #, c-format
 msgid "  identity:    %s"
 msgstr "  identita:    %s"
 
-#: src/webdav.c:1955
+#: src/webdav.c:1975
 #, c-format
 msgid "  fingerprint: %s"
 msgstr "  otisk: %s"
 
-#: src/webdav.c:1957
+#: src/webdav.c:1977
 #, c-format
 msgid ""
 "You only should accept this certificate, if you can\n"
@@ -838,29 +828,37 @@ msgstr ""
 "ověřit jeho otisk! Server může být podvržen nebo může\n"
 "dojít k útoku s prostředníkem (man-in-the-middle attack).\n"
 
-#: src/webdav.c:1960
+#: src/webdav.c:1980
 #, c-format
 msgid "Accept certificate for this session? [y,N] "
 msgstr "Přijmout certifikát pro toto sezení? [y,N] "
 
-#: src/webdav.c:1987
+#: src/webdav.c:2007
 #, c-format
 msgid "  issuer: %s"
 msgstr "  vydavatel: %s"
 
-#: src/webdav.c:1988
+#: src/webdav.c:2008
 #, c-format
 msgid "  subject: %s"
 msgstr "  subjekt: %s"
 
-#: src/webdav.c:1989
+#: src/webdav.c:2009
 #, c-format
 msgid "  identity: %s"
 msgstr "  identita: %s"
 
-#: src/webdav.c:1992
+#: src/webdav.c:2012
 msgid "  accepted by user"
 msgstr "  přijat uživatelem"
 
+#, fuzzy
+#~ msgid "different option `user' in %s"
+#~ msgstr "v %s jsou jiné parametry připojení"
+
+#, fuzzy
+#~ msgid "different option `users' in %s"
+#~ msgstr "v %s jsou jiné parametry připojení"
+
 #~ msgid "CODA_KERNEL_VERSION %u can not be used on 64 bit systems"
 #~ msgstr "CODA_KERNEL_VERSION %u není možno použít na 64bitových systémech"
diff --git a/po/davfs2.pot b/po/davfs2.pot
index 2ecaf19..4d8d10d 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: 2010-04-30 21:41+0200\n"
+"POT-Creation-Date: 2010-11-08 11:57+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"
@@ -73,10 +73,10 @@ msgstr ""
 msgid "error writing directory %s"
 msgstr ""
 
-#: 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
+#: src/cache.c:2780 src/mount_davfs.c:589 src/mount_davfs.c:591
+#: src/mount_davfs.c:785 src/mount_davfs.c:787 src/mount_davfs.c:793
+#: src/mount_davfs.c:833 src/mount_davfs.c:835 src/mount_davfs.c:852
+#: src/mount_davfs.c:854 src/mount_davfs.c:1743 src/mount_davfs.c:1745
 msgid "can't read user data base"
 msgstr ""
 
@@ -149,108 +149,108 @@ msgstr ""
 msgid "unknown kernel file system %s"
 msgstr ""
 
-#: src/kernel_interface.c:192
+#: src/kernel_interface.c:194
 msgid "no free coda device to mount"
 msgstr ""
 
-#: src/kernel_interface.c:201
+#: src/kernel_interface.c:203
 #, c-format
 msgid "CODA_KERNEL_VERSION %u not supported"
 msgstr ""
 
-#: src/kernel_interface.c:240
+#: src/kernel_interface.c:243
 msgid "can't open fuse device"
 msgstr ""
 
-#: src/kernel_interface.c:266
+#: src/kernel_interface.c:269
 msgid "can't mount using fuse kernel file system"
 msgstr ""
 
-#: src/mount_davfs.c:243
+#: src/mount_davfs.c:237
 msgid "program is not setuid root"
 msgstr ""
 
-#: src/mount_davfs.c:245 src/mount_davfs.c:447 src/mount_davfs.c:451
+#: src/mount_davfs.c:239 src/mount_davfs.c:441 src/mount_davfs.c:445
 msgid "can't change effective user id"
 msgstr ""
 
-#: src/mount_davfs.c:311
+#: src/mount_davfs.c:305
 msgid "can't start daemon process"
 msgstr ""
 
-#: src/mount_davfs.c:334
+#: src/mount_davfs.c:328
 msgid "can't release root privileges"
 msgstr ""
 
-#: src/mount_davfs.c:354
+#: src/mount_davfs.c:348
 msgid "failed to release tty properly"
 msgstr ""
 
-#: src/mount_davfs.c:366
+#: src/mount_davfs.c:360
 #, c-format
 msgid "can't write pid file %s"
 msgstr ""
 
-#: src/mount_davfs.c:384
+#: src/mount_davfs.c:378
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: src/mount_davfs.c:386
+#: src/mount_davfs.c:380
 msgid "unmounting failed"
 msgstr ""
 
-#: src/mount_davfs.c:435 src/mount_davfs.c:498 src/mount_davfs.c:581
-#: src/mount_davfs.c:855
+#: src/mount_davfs.c:429 src/mount_davfs.c:492 src/mount_davfs.c:575
+#: src/mount_davfs.c:857
 #, c-format
 msgid "group %s does not exist"
 msgstr ""
 
-#: src/mount_davfs.c:439
+#: src/mount_davfs.c:433
 msgid "can't change group id"
 msgstr ""
 
-#: src/mount_davfs.c:444
+#: src/mount_davfs.c:438
 #, c-format
 msgid "user %s does not exist"
 msgstr ""
 
-#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601
+#: src/mount_davfs.c:478 src/mount_davfs.c:560 src/mount_davfs.c:595
 #, c-format
 msgid "can't create directory %s"
 msgstr ""
 
-#: src/mount_davfs.c:488 src/mount_davfs.c:570 src/mount_davfs.c:605
-#: src/mount_davfs.c:610 src/mount_davfs.c:619
+#: src/mount_davfs.c:482 src/mount_davfs.c:564 src/mount_davfs.c:599
+#: src/mount_davfs.c:604 src/mount_davfs.c:613
 #, c-format
 msgid "can't access directory %s"
 msgstr ""
 
-#: src/mount_davfs.c:494 src/mount_davfs.c:576
+#: src/mount_davfs.c:488 src/mount_davfs.c:570
 #, c-format
 msgid "can't change mode of directory %s"
 msgstr ""
 
-#: src/mount_davfs.c:503 src/mount_davfs.c:586
+#: src/mount_davfs.c:497 src/mount_davfs.c:580
 #, c-format
 msgid "can't change group of directory %s"
 msgstr ""
 
-#: src/mount_davfs.c:614 src/mount_davfs.c:836
+#: src/mount_davfs.c:608 src/mount_davfs.c:838
 msgid "can't read group data base"
 msgstr ""
 
-#: src/mount_davfs.c:637
+#: src/mount_davfs.c:631 src/mount_davfs.c:679
 #, c-format
 msgid "can't open file %s"
 msgstr ""
 
-#: src/mount_davfs.c:642
+#: src/mount_davfs.c:636
 #, c-format
 msgid "%s is already mounted on %s"
 msgstr ""
 
-#: src/mount_davfs.c:665
+#: src/mount_davfs.c:659
 #, c-format
 msgid ""
 "found PID file %s.\n"
@@ -258,282 +258,272 @@ msgid ""
 "or another mount process ended irregular"
 msgstr ""
 
-#: src/mount_davfs.c:686
+#: src/mount_davfs.c:690
 #, c-format
 msgid "no entry for %s found in %s"
 msgstr ""
 
-#: src/mount_davfs.c:692
+#: src/mount_davfs.c:697
 #, c-format
 msgid "different URL in %s"
 msgstr ""
 
-#: src/mount_davfs.c:700
+#: src/mount_davfs.c:702
 #, c-format
 msgid "different file system type in %s"
 msgstr ""
 
-#: src/mount_davfs.c:705
+#: src/mount_davfs.c:713
 #, c-format
 msgid "different config file in %s"
 msgstr ""
 
-#: src/mount_davfs.c:711
+#: src/mount_davfs.c:719
 #, c-format
 msgid "different username in %s"
 msgstr ""
 
-#: src/mount_davfs.c:715
+#: src/mount_davfs.c:723
 #, c-format
 msgid "neither option `user' nor option `users' set in %s"
 msgstr ""
 
-#: src/mount_davfs.c:718
-#, c-format
-msgid "different option `user' in %s"
-msgstr ""
-
-#: src/mount_davfs.c:720
-#, c-format
-msgid "different option `users' in %s"
-msgstr ""
-
-#: src/mount_davfs.c:723
+#: src/mount_davfs.c:726
 #, c-format
 msgid "different mount options in %s"
 msgstr ""
 
-#: src/mount_davfs.c:726
+#: src/mount_davfs.c:729
 #, c-format
 msgid "different uid in %s"
 msgstr ""
 
-#: src/mount_davfs.c:728
+#: src/mount_davfs.c:731
 #, c-format
 msgid "different gid in %s"
 msgstr ""
 
-#: src/mount_davfs.c:730
+#: src/mount_davfs.c:733
 #, c-format
 msgid "different dir_mode in %s"
 msgstr ""
 
-#: src/mount_davfs.c:732
+#: src/mount_davfs.c:735
 #, c-format
 msgid "different file_mode in %s"
 msgstr ""
 
-#: src/mount_davfs.c:760
+#: src/mount_davfs.c:762
 #, c-format
 msgid "can't evaluate path of mount point %s"
 msgstr ""
 
-#: src/mount_davfs.c:765
+#: src/mount_davfs.c:770
 #, c-format
 msgid "can't get home directory for uid %i"
 msgstr ""
 
-#: src/mount_davfs.c:767
+#: src/mount_davfs.c:772
 msgid "A relative mount point must lie within your home directory"
 msgstr ""
 
-#: src/mount_davfs.c:775
+#: src/mount_davfs.c:777
 #, c-format
 msgid "invalid mount point %s"
 msgstr ""
 
-#: src/mount_davfs.c:778
+#: src/mount_davfs.c:780
 #, c-format
 msgid "mount point %s does not exist"
 msgstr ""
 
-#: src/mount_davfs.c:796
+#: src/mount_davfs.c:798
 #, c-format
 msgid ""
 "%s is the home directory of user %s.\n"
 "You can't mount into another users home directory"
 msgstr ""
 
-#: src/mount_davfs.c:824
+#: src/mount_davfs.c:826
 msgid "you can't set file owner different from your uid"
 msgstr ""
 
-#: src/mount_davfs.c:842
+#: src/mount_davfs.c:844
 msgid "you must be member of the group of the file system"
 msgstr ""
 
-#: src/mount_davfs.c:862
+#: src/mount_davfs.c:864
 #, c-format
 msgid "user %s must be member of group %s"
 msgstr ""
 
-#: src/mount_davfs.c:885
+#: src/mount_davfs.c:887
 #, c-format
 msgid "can't mount %s on %s"
 msgstr ""
 
-#: src/mount_davfs.c:887
+#: src/mount_davfs.c:889
 #, c-format
 msgid "kernel does not know file system %s"
 msgstr ""
 
-#: src/mount_davfs.c:889
+#: src/mount_davfs.c:891
 msgid "mount point is busy"
 msgstr ""
 
-#: src/mount_davfs.c:951 src/umount_davfs.c:88
+#: src/mount_davfs.c:967 src/umount_davfs.c:88
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/mount_davfs.c:967 src/umount_davfs.c:113
+#: src/mount_davfs.c:983 src/umount_davfs.c:113
 msgid "unknown error parsing arguments"
 msgstr ""
 
-#: src/mount_davfs.c:976 src/umount_davfs.c:119
+#: src/mount_davfs.c:992 src/umount_davfs.c:119
 msgid "missing argument"
 msgstr ""
 
-#: src/mount_davfs.c:989 src/umount_davfs.c:121
+#: src/mount_davfs.c:1005 src/umount_davfs.c:121
 msgid "too many arguments"
 msgstr ""
 
-#: src/mount_davfs.c:995
+#: src/mount_davfs.c:1011
 msgid "no mountpoint specified"
 msgstr ""
 
-#: src/mount_davfs.c:1000
+#: src/mount_davfs.c:1016
 msgid "no WebDAV-server specified"
 msgstr ""
 
-#: src/mount_davfs.c:1003
+#: src/mount_davfs.c:1019
 msgid "invalid URL"
 msgstr ""
 
-#: src/mount_davfs.c:1022
+#: src/mount_davfs.c:1038
 msgid "can't determine home directory"
 msgstr ""
 
-#: src/mount_davfs.c:1100 src/webdav.c:419
+#: src/mount_davfs.c:1116 src/webdav.c:427
 #, c-format
 msgid "can't read client certificate %s"
 msgstr ""
 
-#: src/mount_davfs.c:1105
+#: src/mount_davfs.c:1121
 #, c-format
 msgid "client certificate file %s has wrong owner"
 msgstr ""
 
-#: src/mount_davfs.c:1111
+#: src/mount_davfs.c:1127
 #, c-format
 msgid "client certificate file %s has wrong permissions"
 msgstr ""
 
-#: src/mount_davfs.c:1161 src/mount_davfs.c:1174 src/mount_davfs.c:1176
-#: src/mount_davfs.c:1194 src/mount_davfs.c:1196 src/webdav.c:426
+#: src/mount_davfs.c:1177 src/mount_davfs.c:1190 src/mount_davfs.c:1192
+#: src/mount_davfs.c:1210 src/mount_davfs.c:1212 src/webdav.c:434
 msgid "Password: "
 msgstr ""
 
-#: src/mount_davfs.c:1165
+#: src/mount_davfs.c:1181
 #, c-format
 msgid ""
 "Please enter the username to authenticate with proxy\n"
 "%s or hit enter for none.\n"
 msgstr ""
 
-#: src/mount_davfs.c:1167 src/mount_davfs.c:1187
+#: src/mount_davfs.c:1183 src/mount_davfs.c:1203
 msgid "Username:"
 msgstr ""
 
-#: src/mount_davfs.c:1171
+#: src/mount_davfs.c:1187
 #, c-format
 msgid ""
 "Please enter the password to authenticate user %s with proxy\n"
 "%s or hit enter for none.\n"
 msgstr ""
 
-#: src/mount_davfs.c:1185
+#: src/mount_davfs.c:1201
 #, c-format
 msgid ""
 "Please enter the username to authenticate with server\n"
 "%s or hit enter for none.\n"
 msgstr ""
 
-#: src/mount_davfs.c:1191
+#: src/mount_davfs.c:1207
 #, c-format
 msgid ""
 "Please enter the password to authenticate user %s with server\n"
 "%s or hit enter for none.\n"
 msgstr ""
 
-#: src/mount_davfs.c:1246
+#: src/mount_davfs.c:1262
 #, c-format
 msgid "pid %i, got signal %i"
 msgstr ""
 
-#: src/mount_davfs.c:1278
+#: src/mount_davfs.c:1294
 msgid ""
 "Warning: can't read user data base. Mounting anyway, but there is no entry "
 "in mtab."
 msgstr ""
 
-#: src/mount_davfs.c:1295
+#: src/mount_davfs.c:1311
 msgid ""
 "Warning: can't write entry into mtab, but will mount the file system anyway"
 msgstr ""
 
-#: src/mount_davfs.c:1321
+#: src/mount_davfs.c:1337
 #, c-format
 msgid "option %s has invalid argument;it must be a decimal number"
 msgstr ""
 
-#: src/mount_davfs.c:1324
+#: src/mount_davfs.c:1340
 #, c-format
 msgid "option %s has invalid argument;it must be an octal number"
 msgstr ""
 
-#: src/mount_davfs.c:1327
+#: src/mount_davfs.c:1343
 #, c-format
 msgid "option %s has invalid argument;it must be a number"
 msgstr ""
 
-#: src/mount_davfs.c:1591
+#: src/mount_davfs.c:1609
 #, c-format
 msgid "option %s requires argument"
 msgstr ""
 
-#: src/mount_davfs.c:1687
+#: src/mount_davfs.c:1705
 #, c-format
 msgid "Unknown option %s.\n"
 msgstr ""
 
-#: src/mount_davfs.c:2143 src/mount_davfs.c:2366 src/mount_davfs.c:2378
+#: src/mount_davfs.c:2151 src/mount_davfs.c:2374 src/mount_davfs.c:2386
 #, c-format
 msgid "opening %s failed"
 msgstr ""
 
-#: src/mount_davfs.c:2164 src/mount_davfs.c:2204 src/mount_davfs.c:2293
-#: src/mount_davfs.c:2394 src/mount_davfs.c:2462
+#: src/mount_davfs.c:2172 src/mount_davfs.c:2212 src/mount_davfs.c:2301
+#: src/mount_davfs.c:2402 src/mount_davfs.c:2470
 msgid "malformed line"
 msgstr ""
 
-#: src/mount_davfs.c:2274 src/mount_davfs.c:2287
+#: src/mount_davfs.c:2282 src/mount_davfs.c:2295
 msgid "unknown option"
 msgstr ""
 
-#: src/mount_davfs.c:2370
+#: src/mount_davfs.c:2378
 #, c-format
 msgid "file %s has wrong owner"
 msgstr ""
 
-#: src/mount_davfs.c:2373
+#: src/mount_davfs.c:2381
 #, c-format
 msgid "file %s has wrong permissions"
 msgstr ""
 
-#: src/mount_davfs.c:2600
+#: src/mount_davfs.c:2608
 #, c-format
 msgid ""
 "Usage:\n"
@@ -542,14 +532,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/mount_davfs.c:2604
+#: src/mount_davfs.c:2612
 #, c-format
 msgid ""
 "To mount a WebDAV-resource don't call %s directly, but use\n"
 "`mount' instead.\n"
 msgstr ""
 
-#: src/mount_davfs.c:2606
+#: src/mount_davfs.c:2614
 #, c-format
 msgid ""
 "    mount <mountpoint>  : or\n"
@@ -557,7 +547,7 @@ msgid ""
 "                          /etc/fstab.\n"
 msgstr ""
 
-#: src/mount_davfs.c:2609
+#: src/mount_davfs.c:2617
 #, c-format
 msgid ""
 "    mount -t davfs <server-url> <mountpoint> [-o options]\n"
@@ -568,7 +558,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/mount_davfs.c:2614
+#: src/mount_davfs.c:2622
 #, c-format
 msgid ""
 "Recognised options:\n"
@@ -579,7 +569,7 @@ msgid ""
 "    dir_mode=    : default directory mode (octal)\n"
 msgstr ""
 
-#: src/mount_davfs.c:2620
+#: src/mount_davfs.c:2628
 #, c-format
 msgid ""
 "    ro           : mount read-only\n"
@@ -653,102 +643,102 @@ msgstr ""
 msgid "an error occured while waiting; please wait for %s to terminate"
 msgstr ""
 
-#: src/webdav.c:344
+#: src/webdav.c:352
 msgid "socket library initialization failed"
 msgstr ""
 
-#: src/webdav.c:357
+#: src/webdav.c:365
 msgid "can't open stream to log neon-messages"
 msgstr ""
 
-#: src/webdav.c:398
+#: src/webdav.c:406
 msgid "neon library does not support TLS/SSL"
 msgstr ""
 
-#: src/webdav.c:406
+#: src/webdav.c:414
 #, c-format
 msgid "can't read server certificate %s"
 msgstr ""
 
-#: src/webdav.c:424
+#: src/webdav.c:432
 #, c-format
 msgid ""
 "Please enter the password to decrypt client\n"
 "certificate %s.\n"
 msgstr ""
 
-#: src/webdav.c:438
+#: src/webdav.c:446
 #, c-format
 msgid "can't decrypt client certificate %s"
 msgstr ""
 
-#: src/webdav.c:492 src/webdav.c:495
+#: src/webdav.c:500 src/webdav.c:503
 msgid "mounting failed; the server does not support WebDAV"
 msgstr ""
 
-#: src/webdav.c:503
+#: src/webdav.c:511
 msgid "warning: the server does not support locks"
 msgstr ""
 
-#: src/webdav.c:1571
+#: src/webdav.c:1589
 msgid "authentication failure:"
 msgstr ""
 
-#: src/webdav.c:1609
+#: src/webdav.c:1627
 #, c-format
 msgid "%i can't open cache file"
 msgstr ""
 
-#: src/webdav.c:1617
+#: src/webdav.c:1635
 #, c-format
 msgid "%i error writing to cache file"
 msgstr ""
 
-#: src/webdav.c:1926 src/webdav.c:1929
+#: src/webdav.c:1946 src/webdav.c:1949
 msgid "error processing server certificate"
 msgstr ""
 
-#: src/webdav.c:1940 src/webdav.c:1974
+#: src/webdav.c:1960 src/webdav.c:1994
 msgid "the server certificate is not yet valid"
 msgstr ""
 
-#: src/webdav.c:1942 src/webdav.c:1977
+#: src/webdav.c:1962 src/webdav.c:1997
 msgid "the server certificate has expired"
 msgstr ""
 
-#: src/webdav.c:1944 src/webdav.c:1980
+#: src/webdav.c:1964 src/webdav.c:2000
 msgid "the server certificate does not match the server name"
 msgstr ""
 
-#: src/webdav.c:1946 src/webdav.c:1983
+#: src/webdav.c:1966 src/webdav.c:2003
 msgid "the server certificate is not trusted"
 msgstr ""
 
-#: src/webdav.c:1948 src/webdav.c:1986
+#: src/webdav.c:1968 src/webdav.c:2006
 msgid "unknown certificate error"
 msgstr ""
 
-#: src/webdav.c:1949
+#: src/webdav.c:1969
 #, c-format
 msgid "  issuer:      %s"
 msgstr ""
 
-#: src/webdav.c:1951
+#: src/webdav.c:1971
 #, c-format
 msgid "  subject:     %s"
 msgstr ""
 
-#: src/webdav.c:1953
+#: src/webdav.c:1973
 #, c-format
 msgid "  identity:    %s"
 msgstr ""
 
-#: src/webdav.c:1955
+#: src/webdav.c:1975
 #, c-format
 msgid "  fingerprint: %s"
 msgstr ""
 
-#: src/webdav.c:1957
+#: src/webdav.c:1977
 #, c-format
 msgid ""
 "You only should accept this certificate, if you can\n"
@@ -756,26 +746,26 @@ msgid ""
 "or there might be a man-in-the-middle-attack.\n"
 msgstr ""
 
-#: src/webdav.c:1960
+#: src/webdav.c:1980
 #, c-format
 msgid "Accept certificate for this session? [y,N] "
 msgstr ""
 
-#: src/webdav.c:1987
+#: src/webdav.c:2007
 #, c-format
 msgid "  issuer: %s"
 msgstr ""
 
-#: src/webdav.c:1988
+#: src/webdav.c:2008
 #, c-format
 msgid "  subject: %s"
 msgstr ""
 
-#: src/webdav.c:1989
+#: src/webdav.c:2009
 #, c-format
 msgid "  identity: %s"
 msgstr ""
 
-#: src/webdav.c:1992
+#: src/webdav.c:2012
 msgid "  accepted by user"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 769b218..6c4e238 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: 2010-04-30 21:41+0200\n"
+"POT-Creation-Date: 2010-11-08 11:57+0100\n"
 "PO-Revision-Date: 2009-01-02 12:26+0100\n"
 "Last-Translator: Werner Baumann <werner.baumann@onlinehome.de>\n"
 "Language-Team: \n"
@@ -81,10 +81,10 @@ msgstr "kann die Cachedatei %s nicht erzeugen"
 msgid "error writing directory %s"
 msgstr "Fehler beim Schreiben des Verzeichnisses %s"
 
-#: 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
+#: src/cache.c:2780 src/mount_davfs.c:589 src/mount_davfs.c:591
+#: src/mount_davfs.c:785 src/mount_davfs.c:787 src/mount_davfs.c:793
+#: src/mount_davfs.c:833 src/mount_davfs.c:835 src/mount_davfs.c:852
+#: src/mount_davfs.c:854 src/mount_davfs.c:1743 src/mount_davfs.c:1745
 msgid "can't read user data base"
 msgstr "kann die Benutzerdatenbank nicht lesen"
 
@@ -159,109 +159,109 @@ msgstr "coda-Gerätedatei erfolgreich geöffnet"
 msgid "unknown kernel file system %s"
 msgstr "das Kernel-Dateisystem %s ist unbekannt"
 
-#: src/kernel_interface.c:192
+#: src/kernel_interface.c:194
 msgid "no free coda device to mount"
 msgstr "keine freie coda-Gerätedatei gefunden"
 
-#: src/kernel_interface.c:201
+#: src/kernel_interface.c:203
 #, c-format
 msgid "CODA_KERNEL_VERSION %u not supported"
 msgstr "CODA_KERNEL_VERSION %u wird nicht unterstützt"
 
-#: src/kernel_interface.c:240
+#: src/kernel_interface.c:243
 msgid "can't open fuse device"
 msgstr "kann die fuse-Gerätedatei nicht öffnen"
 
-#: src/kernel_interface.c:266
+#: src/kernel_interface.c:269
 msgid "can't mount using fuse kernel file system"
 msgstr ""
 "mit Kernel-Dateisystem fuse kann das Dateisystem nicht eingehängt werden"
 
-#: src/mount_davfs.c:243
+#: src/mount_davfs.c:237
 msgid "program is not setuid root"
 msgstr "die Programmdatei hat das setuid-Bit nicht gesetzt"
 
-#: src/mount_davfs.c:245 src/mount_davfs.c:447 src/mount_davfs.c:451
+#: src/mount_davfs.c:239 src/mount_davfs.c:441 src/mount_davfs.c:445
 msgid "can't change effective user id"
 msgstr "kann die effektive Benutzer-ID nicht ändern"
 
-#: src/mount_davfs.c:311
+#: src/mount_davfs.c:305
 msgid "can't start daemon process"
 msgstr "kann den Hintergrundprozess nicht starten"
 
-#: src/mount_davfs.c:334
+#: src/mount_davfs.c:328
 msgid "can't release root privileges"
 msgstr "ich werde die root-Rechte nicht los"
 
-#: src/mount_davfs.c:354
+#: src/mount_davfs.c:348
 msgid "failed to release tty properly"
 msgstr "kann das Terminal nicht freigeben"
 
-#: src/mount_davfs.c:366
+#: src/mount_davfs.c:360
 #, c-format
 msgid "can't write pid file %s"
 msgstr "kann die PID-Datei %s nicht schreiben"
 
-#: src/mount_davfs.c:384
+#: src/mount_davfs.c:378
 #, c-format
 msgid "unmounting %s"
 msgstr "hänge %s aus"
 
-#: src/mount_davfs.c:386
+#: src/mount_davfs.c:380
 msgid "unmounting failed"
 msgstr "das Aushängen schlug fehl"
 
-#: src/mount_davfs.c:435 src/mount_davfs.c:498 src/mount_davfs.c:581
-#: src/mount_davfs.c:855
+#: src/mount_davfs.c:429 src/mount_davfs.c:492 src/mount_davfs.c:575
+#: src/mount_davfs.c:857
 #, c-format
 msgid "group %s does not exist"
 msgstr "die Gruppe %s existiert nicht"
 
-#: src/mount_davfs.c:439
+#: src/mount_davfs.c:433
 msgid "can't change group id"
 msgstr "kann die Gruppenkennung nicht ändern"
 
-#: src/mount_davfs.c:444
+#: src/mount_davfs.c:438
 #, c-format
 msgid "user %s does not exist"
 msgstr "der Benutzer %s existiert nicht"
 
-#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601
+#: src/mount_davfs.c:478 src/mount_davfs.c:560 src/mount_davfs.c:595
 #, c-format
 msgid "can't create directory %s"
 msgstr "kann das Verzeichnis %s nicht erzeugen"
 
-#: src/mount_davfs.c:488 src/mount_davfs.c:570 src/mount_davfs.c:605
-#: src/mount_davfs.c:610 src/mount_davfs.c:619
+#: src/mount_davfs.c:482 src/mount_davfs.c:564 src/mount_davfs.c:599
+#: src/mount_davfs.c:604 src/mount_davfs.c:613
 #, c-format
 msgid "can't access directory %s"
 msgstr "Zugriff auf das Verzeichnis %s verweigert"
 
-#: src/mount_davfs.c:494 src/mount_davfs.c:576
+#: src/mount_davfs.c:488 src/mount_davfs.c:570
 #, c-format
 msgid "can't change mode of directory %s"
 msgstr "kann die Rechte des Verzeichnisses %s nicht ändern"
 
-#: src/mount_davfs.c:503 src/mount_davfs.c:586
+#: src/mount_davfs.c:497 src/mount_davfs.c:580
 #, c-format
 msgid "can't change group of directory %s"
 msgstr "kann die Gruppenkennung des Verneichnisses %s nicht ändern"
 
-#: src/mount_davfs.c:614 src/mount_davfs.c:836
+#: src/mount_davfs.c:608 src/mount_davfs.c:838
 msgid "can't read group data base"
 msgstr "kann die Gruppendatenbank nicht lesen"
 
-#: src/mount_davfs.c:637
+#: src/mount_davfs.c:631 src/mount_davfs.c:679
 #, c-format
 msgid "can't open file %s"
 msgstr "kann die Datei %s nicht öffnen"
 
-#: src/mount_davfs.c:642
+#: src/mount_davfs.c:636
 #, c-format
 msgid "%s is already mounted on %s"
 msgstr "%s ist bereits auf %s eingehängt"
 
-#: src/mount_davfs.c:665
+#: src/mount_davfs.c:659
 #, c-format
 msgid ""
 "found PID file %s.\n"
@@ -272,96 +272,86 @@ msgstr ""
 "Möglicherweise wird %s von einem anderen Prozess benutzt,\n"
 "oder ein anderer Mount-Prozess endete irregulär"
 
-#: src/mount_davfs.c:686
+#: src/mount_davfs.c:690
 #, c-format
 msgid "no entry for %s found in %s"
 msgstr "für %s ist kein Eintrag in %s"
 
-#: src/mount_davfs.c:692
+#: src/mount_davfs.c:697
 #, c-format
 msgid "different URL in %s"
 msgstr "in %s ist eine andere URL angegeben"
 
-#: src/mount_davfs.c:700
+#: src/mount_davfs.c:702
 #, c-format
 msgid "different file system type in %s"
 msgstr "in %s ist ein anderer Dateisystemtyp angegeben"
 
-#: src/mount_davfs.c:705
+#: src/mount_davfs.c:713
 #, c-format
 msgid "different config file in %s"
 msgstr "in %s ist eine andere Konfigurationsdatei angegeben"
 
-#: src/mount_davfs.c:711
+#: src/mount_davfs.c:719
 #, c-format
 msgid "different username in %s"
 msgstr "in %s ist ein anderer Benutzername angegeben"
 
-#: src/mount_davfs.c:715
+#: src/mount_davfs.c:723
 #, c-format
 msgid "neither option `user' nor option `users' set in %s"
 msgstr "in %s ist weder die Option „user” noch die Option „users” angegeben"
 
-#: src/mount_davfs.c:718
-#, c-format
-msgid "different option `user' in %s"
-msgstr "in %s ist die Option „user” anders gesetzt"
-
-#: src/mount_davfs.c:720
-#, c-format
-msgid "different option `users' in %s"
-msgstr "in %s ist die Option „users” anders gesetzt"
-
-#: src/mount_davfs.c:723
+#: src/mount_davfs.c:726
 #, c-format
 msgid "different mount options in %s"
 msgstr "in %s sind andere Mount-Optionen angegeben"
 
-#: src/mount_davfs.c:726
+#: src/mount_davfs.c:729
 #, c-format
 msgid "different uid in %s"
 msgstr "in %s ist eine andere uid angegeben"
 
-#: src/mount_davfs.c:728
+#: src/mount_davfs.c:731
 #, c-format
 msgid "different gid in %s"
 msgstr "in %s ist eine andere gid angegeben"
 
-#: src/mount_davfs.c:730
+#: src/mount_davfs.c:733
 #, c-format
 msgid "different dir_mode in %s"
 msgstr "in %s ist ein anderer dir_mode angegeben"
 
-#: src/mount_davfs.c:732
+#: src/mount_davfs.c:735
 #, c-format
 msgid "different file_mode in %s"
 msgstr "in %s ist ein anderer file_mode angegeben"
 
-#: src/mount_davfs.c:760
+#: src/mount_davfs.c:762
 #, c-format
 msgid "can't evaluate path of mount point %s"
 msgstr "kann den eindeutigen Pfad des Einhängepunktes %s nicht ermitteln"
 
-#: src/mount_davfs.c:765
+#: src/mount_davfs.c:770
 #, c-format
 msgid "can't get home directory for uid %i"
 msgstr "kann das Home-Verzeichnis für die Benutzer-ID %i nicht ermitteln"
 
-#: src/mount_davfs.c:767
+#: src/mount_davfs.c:772
 msgid "A relative mount point must lie within your home directory"
 msgstr "Ein relativer Einhängepunkt muss in deinem Home-Verzeichnis liegen"
 
-#: src/mount_davfs.c:775
+#: src/mount_davfs.c:777
 #, c-format
 msgid "invalid mount point %s"
 msgstr "der Einhängepunkt %s ist nicht erlaubt"
 
-#: src/mount_davfs.c:778
+#: src/mount_davfs.c:780
 #, c-format
 msgid "mount point %s does not exist"
 msgstr "der Einhängepunkt %s existiert nicht"
 
-#: src/mount_davfs.c:796
+#: src/mount_davfs.c:798
 #, c-format
 msgid ""
 "%s is the home directory of user %s.\n"
@@ -370,36 +360,36 @@ msgstr ""
 "%s ist das Home-Verzeichnis des Benutzers %s. Du kannst im Home-Verzeichnis "
 "eines anderen Benutzers kein Dateisystem einhängen"
 
-#: src/mount_davfs.c:824
+#: src/mount_davfs.c:826
 msgid "you can't set file owner different from your uid"
 msgstr ""
 "du kannst als Besitzer des Dateisystems keine fremde Benutzerkennung angeben"
 
-#: src/mount_davfs.c:842
+#: src/mount_davfs.c:844
 msgid "you must be member of the group of the file system"
 msgstr ""
 "du musst Mitglied in der Gruppe sein, zu der das Dateisystem gehören soll"
 
-#: src/mount_davfs.c:862
+#: src/mount_davfs.c:864
 #, c-format
 msgid "user %s must be member of group %s"
 msgstr "der Benutzer %s muss Mitglied der Gruppe %s sein"
 
-#: src/mount_davfs.c:885
+#: src/mount_davfs.c:887
 #, c-format
 msgid "can't mount %s on %s"
 msgstr "kann %s nicht auf %s einhängen"
 
-#: src/mount_davfs.c:887
+#: src/mount_davfs.c:889
 #, c-format
 msgid "kernel does not know file system %s"
 msgstr "der Kernel kenn das Dateisystem %s nicht"
 
-#: src/mount_davfs.c:889
+#: src/mount_davfs.c:891
 msgid "mount point is busy"
 msgstr "das Einhängepunkt wird anderweitig benutzt"
 
-#: src/mount_davfs.c:951 src/umount_davfs.c:88
+#: src/mount_davfs.c:967 src/umount_davfs.c:88
 #, c-format
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
@@ -410,59 +400,59 @@ msgstr ""
 "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE "
 "ZWECKE.\n"
 
-#: src/mount_davfs.c:967 src/umount_davfs.c:113
+#: src/mount_davfs.c:983 src/umount_davfs.c:113
 msgid "unknown error parsing arguments"
 msgstr "Fehler beim Analysieren der Befehlsargumente"
 
-#: src/mount_davfs.c:976 src/umount_davfs.c:119
+#: src/mount_davfs.c:992 src/umount_davfs.c:119
 msgid "missing argument"
 msgstr "zu wenig Argumente"
 
-#: src/mount_davfs.c:989 src/umount_davfs.c:121
+#: src/mount_davfs.c:1005 src/umount_davfs.c:121
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: src/mount_davfs.c:995
+#: src/mount_davfs.c:1011
 msgid "no mountpoint specified"
 msgstr "es wurde kein Einhängepunkt angegeben"
 
-#: src/mount_davfs.c:1000
+#: src/mount_davfs.c:1016
 msgid "no WebDAV-server specified"
 msgstr "es wurde kein WebDAV-Server angegeben"
 
-#: src/mount_davfs.c:1003
+#: src/mount_davfs.c:1019
 msgid "invalid URL"
 msgstr "die URL ist ungültig"
 
-#: src/mount_davfs.c:1022
+#: src/mount_davfs.c:1038
 msgid "can't determine home directory"
 msgstr "kann das Home-Verzeichnis nicht ermitteln"
 
-#: src/mount_davfs.c:1100 src/webdav.c:419
+#: src/mount_davfs.c:1116 src/webdav.c:427
 #, c-format
 msgid "can't read client certificate %s"
 msgstr "kann das Client-Zertifikat %s nicht lesen"
 
-#: src/mount_davfs.c:1105
+#: src/mount_davfs.c:1121
 #, c-format
 msgid "client certificate file %s has wrong owner"
 msgstr ""
 "die Datei %s\n"
 "des Client-Zertifikats hat den falschen Besitzer"
 
-#: src/mount_davfs.c:1111
+#: src/mount_davfs.c:1127
 #, c-format
 msgid "client certificate file %s has wrong permissions"
 msgstr ""
 "die Dateirechte für das Cient-Zertifikat\n"
 "%s sind falsch"
 
-#: src/mount_davfs.c:1161 src/mount_davfs.c:1174 src/mount_davfs.c:1176
-#: src/mount_davfs.c:1194 src/mount_davfs.c:1196 src/webdav.c:426
+#: src/mount_davfs.c:1177 src/mount_davfs.c:1190 src/mount_davfs.c:1192
+#: src/mount_davfs.c:1210 src/mount_davfs.c:1212 src/webdav.c:434
 msgid "Password: "
 msgstr "Passwort:"
 
-#: src/mount_davfs.c:1165
+#: src/mount_davfs.c:1181
 #, c-format
 msgid ""
 "Please enter the username to authenticate with proxy\n"
@@ -471,11 +461,11 @@ msgstr ""
 "Gib bitte den Benutzernamen für den Proxy %s an; wenn du keinen angeben "
 "willst, drücke Return.\n"
 
-#: src/mount_davfs.c:1167 src/mount_davfs.c:1187
+#: src/mount_davfs.c:1183 src/mount_davfs.c:1203
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: src/mount_davfs.c:1171
+#: src/mount_davfs.c:1187
 #, c-format
 msgid ""
 "Please enter the password to authenticate user %s with proxy\n"
@@ -484,7 +474,7 @@ msgstr ""
 "Gib bitte das Passwort von %s für den Proxy %s\n"
 "an; wenn du keines angeben willst, drücke Return.\n"
 
-#: src/mount_davfs.c:1185
+#: src/mount_davfs.c:1201
 #, c-format
 msgid ""
 "Please enter the username to authenticate with server\n"
@@ -493,7 +483,7 @@ msgstr ""
 "Gib bitte den Benutzernamen für den Server %s an; wenn du keinen angeben "
 "willst, drücke Return.\n"
 
-#: src/mount_davfs.c:1191
+#: src/mount_davfs.c:1207
 #, c-format
 msgid ""
 "Please enter the password to authenticate user %s with server\n"
@@ -502,12 +492,12 @@ msgstr ""
 "Gib bitte das Passwort von %s für den Server %s\n"
 "an; wenn du keines angeben willst, drücke Return.\n"
 
-#: src/mount_davfs.c:1246
+#: src/mount_davfs.c:1262
 #, c-format
 msgid "pid %i, got signal %i"
 msgstr "PID %i, erhielt Signal %i"
 
-#: src/mount_davfs.c:1278
+#: src/mount_davfs.c:1294
 msgid ""
 "Warning: can't read user data base. Mounting anyway, but there is no entry "
 "in mtab."
@@ -515,63 +505,63 @@ msgstr ""
 "Warnung: kann die Benutzerdatenbank nicht lesen. Ich hänge das Dateisystem "
 "trotzdem ein, aber der Eintrag in der mtab wird fehlen."
 
-#: src/mount_davfs.c:1295
+#: src/mount_davfs.c:1311
 msgid ""
 "Warning: can't write entry into mtab, but will mount the file system anyway"
 msgstr ""
 "Warnung: kann keinen Eintrag in die mtab schreiben, häne das Dateisystem "
 "trotzdem ein."
 
-#: src/mount_davfs.c:1321
+#: src/mount_davfs.c:1337
 #, c-format
 msgid "option %s has invalid argument;it must be a decimal number"
 msgstr "das Argument der Option %s ist ungültig; es muss eine Dezimalzahl sein"
 
-#: src/mount_davfs.c:1324
+#: src/mount_davfs.c:1340
 #, c-format
 msgid "option %s has invalid argument;it must be an octal number"
 msgstr "das Argument der Option %s ist ungültig; es muss eine Oktalzahl sein"
 
-#: src/mount_davfs.c:1327
+#: src/mount_davfs.c:1343
 #, c-format
 msgid "option %s has invalid argument;it must be a number"
 msgstr "das Argument der Option %s ist ungültig; es muss eine Zahl sein"
 
-#: src/mount_davfs.c:1591
+#: src/mount_davfs.c:1609
 #, c-format
 msgid "option %s requires argument"
 msgstr "die Option %s verlangt ein Argument"
 
-#: src/mount_davfs.c:1687
+#: src/mount_davfs.c:1705
 #, c-format
 msgid "Unknown option %s.\n"
 msgstr "unbekannte Option %s.\n"
 
-#: src/mount_davfs.c:2143 src/mount_davfs.c:2366 src/mount_davfs.c:2378
+#: src/mount_davfs.c:2151 src/mount_davfs.c:2374 src/mount_davfs.c:2386
 #, c-format
 msgid "opening %s failed"
 msgstr "konnte %s nicht öffnen"
 
-#: src/mount_davfs.c:2164 src/mount_davfs.c:2204 src/mount_davfs.c:2293
-#: src/mount_davfs.c:2394 src/mount_davfs.c:2462
+#: src/mount_davfs.c:2172 src/mount_davfs.c:2212 src/mount_davfs.c:2301
+#: src/mount_davfs.c:2402 src/mount_davfs.c:2470
 msgid "malformed line"
 msgstr "Syntaxfehler in der Zeile"
 
-#: src/mount_davfs.c:2274 src/mount_davfs.c:2287
+#: src/mount_davfs.c:2282 src/mount_davfs.c:2295
 msgid "unknown option"
 msgstr "unbekannte Option"
 
-#: src/mount_davfs.c:2370
+#: src/mount_davfs.c:2378
 #, c-format
 msgid "file %s has wrong owner"
 msgstr "die Datei %s hat den falschen Besitzer"
 
-#: src/mount_davfs.c:2373
+#: src/mount_davfs.c:2381
 #, c-format
 msgid "file %s has wrong permissions"
 msgstr "die Dateirechte für %s sind falsch"
 
-#: src/mount_davfs.c:2600
+#: src/mount_davfs.c:2608
 #, c-format
 msgid ""
 "Usage:\n"
@@ -584,7 +574,7 @@ msgstr ""
 "    %s -h, --help     : diese Hilfe anzeigen\n"
 "\n"
 
-#: src/mount_davfs.c:2604
+#: src/mount_davfs.c:2612
 #, c-format
 msgid ""
 "To mount a WebDAV-resource don't call %s directly, but use\n"
@@ -593,7 +583,7 @@ msgstr ""
 "Um eine WebDAV-Resource zu einzuhängen, sollte %s nicht direkt\n"
 "aufgerufen werden; stattdessen sollte „mount” benutzt werden.\n"
 
-#: src/mount_davfs.c:2606
+#: src/mount_davfs.c:2614
 #, c-format
 msgid ""
 "    mount <mountpoint>  : or\n"
@@ -604,7 +594,7 @@ msgstr ""
 "    mount <server-url>  : hänge die WebDAV-Resource entsprechend den\n"
 "                          Angaben in /etc/fstab ein.\n"
 
-#: src/mount_davfs.c:2609
+#: src/mount_davfs.c:2617
 #, c-format
 msgid ""
 "    mount -t davfs <server-url> <mountpoint> [-o options]\n"
@@ -621,7 +611,7 @@ msgstr ""
 "                          Kommas unterteilte Liste von Optionen.\n"
 "\n"
 
-#: src/mount_davfs.c:2614
+#: src/mount_davfs.c:2622
 #, c-format
 msgid ""
 "Recognised options:\n"
@@ -638,7 +628,7 @@ msgstr ""
 "    file_mode=   : Standard-Rechte für Dateien (oktal)\n"
 "    dir_mode=    : Standard-Rechte für Verzeichnisse (oktal)\n"
 
-#: src/mount_davfs.c:2620
+#: src/mount_davfs.c:2628
 #, c-format
 msgid ""
 "    ro           : mount read-only\n"
@@ -740,24 +730,24 @@ msgid "an error occured while waiting; please wait for %s to terminate"
 msgstr ""
 "während des Wartens trat ein Fehler auf; bitte warte bis der %s-Prozess endet"
 
-#: src/webdav.c:344
+#: src/webdav.c:352
 msgid "socket library initialization failed"
 msgstr "die socket-Bibliothek konnte nicht initialisiert werden"
 
-#: src/webdav.c:357
+#: src/webdav.c:365
 msgid "can't open stream to log neon-messages"
 msgstr "kann die Ausgabe für neon-Log-Meldungen nicht öffnen"
 
-#: src/webdav.c:398
+#: src/webdav.c:406
 msgid "neon library does not support TLS/SSL"
 msgstr "die Neon-Bibliothek uterstützt TLS/SSL nicht"
 
-#: src/webdav.c:406
+#: src/webdav.c:414
 #, c-format
 msgid "can't read server certificate %s"
 msgstr "kann das Server-Zertifikat %s nicht lesen"
 
-#: src/webdav.c:424
+#: src/webdav.c:432
 #, c-format
 msgid ""
 "Please enter the password to decrypt client\n"
@@ -766,78 +756,78 @@ msgstr ""
 "Gib bitte das Passwort für die Entschlüsselung des\n"
 "Client-Zertifikats %s ein.\n"
 
-#: src/webdav.c:438
+#: src/webdav.c:446
 #, c-format
 msgid "can't decrypt client certificate %s"
 msgstr "kann das Zertifikat %s nicht entschlüsseln"
 
-#: src/webdav.c:492 src/webdav.c:495
+#: src/webdav.c:500 src/webdav.c:503
 msgid "mounting failed; the server does not support WebDAV"
 msgstr "das Einhängen schlug fehl; der Server unterstützt WebDAV nicht"
 
-#: src/webdav.c:503
+#: src/webdav.c:511
 msgid "warning: the server does not support locks"
 msgstr "Warnung: der Server kann Dateien nicht sperren"
 
-#: src/webdav.c:1571
+#: src/webdav.c:1589
 msgid "authentication failure:"
 msgstr "Authentifizierungsfehler"
 
-#: src/webdav.c:1609
+#: src/webdav.c:1627
 #, c-format
 msgid "%i can't open cache file"
 msgstr "%i kann die Cache-Datei nicht öffnen"
 
-#: src/webdav.c:1617
+#: src/webdav.c:1635
 #, c-format
 msgid "%i error writing to cache file"
 msgstr "%i Fehler beim Schreiben der Cache-Datei"
 
-#: src/webdav.c:1926 src/webdav.c:1929
+#: src/webdav.c:1946 src/webdav.c:1949
 msgid "error processing server certificate"
 msgstr "Fehler beim Analysieren des Server-Zertifikats"
 
-#: src/webdav.c:1940 src/webdav.c:1974
+#: src/webdav.c:1960 src/webdav.c:1994
 msgid "the server certificate is not yet valid"
 msgstr "das Server-Zertifikat ist noch nicht gültig"
 
-#: src/webdav.c:1942 src/webdav.c:1977
+#: src/webdav.c:1962 src/webdav.c:1997
 msgid "the server certificate has expired"
 msgstr "das Server-Zertifikat ist nicht mehr gültig"
 
-#: src/webdav.c:1944 src/webdav.c:1980
+#: src/webdav.c:1964 src/webdav.c:2000
 msgid "the server certificate does not match the server name"
 msgstr "das Server-Zertifikat passt nicht zum Namen des Servers"
 
-#: src/webdav.c:1946 src/webdav.c:1983
+#: src/webdav.c:1966 src/webdav.c:2003
 msgid "the server certificate is not trusted"
 msgstr "wir trauen dem Zertifikat nicht"
 
-#: src/webdav.c:1948 src/webdav.c:1986
+#: src/webdav.c:1968 src/webdav.c:2006
 msgid "unknown certificate error"
 msgstr "Fehler beim Analysieren des Server-Zertifikats"
 
-#: src/webdav.c:1949
+#: src/webdav.c:1969
 #, c-format
 msgid "  issuer:      %s"
 msgstr "  Aussteller:    %s"
 
-#: src/webdav.c:1951
+#: src/webdav.c:1971
 #, c-format
 msgid "  subject:     %s"
 msgstr "  Inhaber:       %s"
 
-#: src/webdav.c:1953
+#: src/webdav.c:1973
 #, c-format
 msgid "  identity:    %s"
 msgstr "  Name:          %s"
 
-#: src/webdav.c:1955
+#: src/webdav.c:1975
 #, c-format
 msgid "  fingerprint: %s"
 msgstr "  Fingerabdruck: %s"
 
-#: src/webdav.c:1957
+#: src/webdav.c:1977
 #, c-format
 msgid ""
 "You only should accept this certificate, if you can\n"
@@ -848,26 +838,32 @@ msgstr ""
 "dass der Fingerabdruck stimmt. Der Server könnte gefälscht sein oder\n"
 "ein Angreifer könnte sich in die Verbindung zum Server eingeschaltet haben.\n"
 
-#: src/webdav.c:1960
+#: src/webdav.c:1980
 #, c-format
 msgid "Accept certificate for this session? [y,N] "
 msgstr "Ich akzeptiere das Zertifikat für diese Sitzung [j,N]: "
 
-#: src/webdav.c:1987
+#: src/webdav.c:2007
 #, c-format
 msgid "  issuer: %s"
 msgstr "  Aussteller des Zertifikats: %s"
 
-#: src/webdav.c:1988
+#: src/webdav.c:2008
 #, c-format
 msgid "  subject: %s"
 msgstr "  Inhaber des Zertifikats: %s"
 
-#: src/webdav.c:1989
+#: src/webdav.c:2009
 #, c-format
 msgid "  identity: %s"
 msgstr "  Name: %s"
 
-#: src/webdav.c:1992
+#: src/webdav.c:2012
 msgid "  accepted by user"
 msgstr "  durch den Benutzer akzeptiert"
+
+#~ msgid "different option `user' in %s"
+#~ msgstr "in %s ist die Option „user” anders gesetzt"
+
+#~ msgid "different option `users' in %s"
+#~ msgstr "in %s ist die Option „users” anders gesetzt"
diff --git a/src/Makefile.am b/src/Makefile.am
index 4afa561..389721a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,6 +32,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c \
         kernel_interface.h mount_davfs.h webdav.h
 umount_davfs_SOURCES = umount_davfs.c defaults.h
 
+AM_CPPFLAGS = -I$(top_srcdir)/gl
 AM_CFLAGS = -Wall
 DEFS = -DPROGRAM_NAME=\"mount.davfs\" \
        -DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \
@@ -46,6 +47,8 @@ DEFS = -DPROGRAM_NAME=\"mount.davfs\" \
        -DDAV_USER=\"$(dav_user)\" \
        -DDAV_GROUP=\"$(dav_group)\" @DEFS@
 LIBS = $(NEON_LIBS) @LIBS@
+mount_davfs_LDADD = $(LIBINTL)
+umount_davfs_LDADD = $(LIBINTL)
 
 install-exec-hook:
 	chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; \
diff --git a/src/mount_davfs.c b/src/mount_davfs.c
index 49486da..4da7e44 100644
--- a/src/mount_davfs.c
+++ b/src/mount_davfs.c
@@ -72,7 +72,7 @@
 #include <ne_utils.h>
 
 #include "defaults.h"
-#include "../gl/canonicalize.h"
+#include "canonicalize.h"
 #include "mount_davfs.h"
 #include "kernel_interface.h"
 #include "cache.h"