diff --git a/ChangeLog b/ChangeLog index 55b79a8..22fa2d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ ChangeLog for davfs2 -------------------- +2011-01-02 Werner Baumann (werner.baumann@onlinehome.de) + * configure.ac, davfs2.m4, webdav.c: + Add option --disable-iconv. + 2010-12-31 Werner Baumann (werner.baumann@onlinehome.de) * Add Gnulib module iconv_open. * Add gettext support for Gnulib diff --git a/INSTALL b/INSTALL index 7f55c8d..ff94630 100644 --- a/INSTALL +++ b/INSTALL @@ -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 (2.6, 2.7, 2.8 or 2.9) must be installed. Your distribution will most -likely provide a package. +libneon (0.25, 0.26, 0.27, 0.28 or 0.29) 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/config/INSTALL.davfs2 b/config/INSTALL.davfs2 index 7f55c8d..ff94630 100644 --- a/config/INSTALL.davfs2 +++ b/config/INSTALL.davfs2 @@ -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 (2.6, 2.7, 2.8 or 2.9) must be installed. Your distribution will most -likely provide a package. +libneon (0.25, 0.26, 0.27, 0.28 or 0.29) 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/config/davfs2.m4 b/config/davfs2.m4 index 7f08861..287e47e 100644 --- a/config/davfs2.m4 +++ b/config/davfs2.m4 @@ -22,7 +22,7 @@ # Looks for the binary 'neon-config'. If a directory is given with # --with-neon=, it looks in the bin-subdirectory of this, else it uses # AC_PATH_PROG to find 'neon-config'. -# If found, it sets variable NRON_CONFIG and calls NEON_USE_EXTERNAL. +# If found, it sets variable NEON_CONFIG and calls NEON_USE_EXTERNAL. # if not found, or if NEON_USE_EXTERNAL does not set neon_got_library # to yes, configration is stopped with an error message. @@ -145,6 +145,22 @@ AC_DEFUN([DAV_LFS],[ ]) +# Disable character conversion. + +AC_DEFUN([DAV_ICONV],[ + AC_ARG_ENABLE([iconv], + [ --disable-iconv disable character conversion], + [dav_iconv=$enableval], + [dav_iconv=yes]) + + if test "$dav_iconv" = "yes"; then + AC_DEFINE([DAV_USE_ICONV], [1], + [Define to enable charcter conversion]) + fi + +]) + + # Output summary AC_DEFUN([DAV_MESSAGE],[ @@ -164,7 +180,7 @@ Configuration for building davfs2 AC_PACKAGE_VERSION: Large File Support: ${dav_lfs} Neon Library: ${neon_library_message} ${ne_SSL_message} - National Language Support: ${dav_nls} + Native Language Support: ${dav_nls} EOF ]) diff --git a/configure.ac b/configure.ac index 865c1a5..a6836ff 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ AC_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_CC gl_EARLY +AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL AC_PROG_LN_S gl_INIT @@ -43,8 +44,10 @@ DAV_CHECK_NEON # Checks for header files. AC_HEADER_DIRENT +AC_HEADER_MAJOR AC_HEADER_STDC -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]) +AC_HEADER_TIME +AC_CHECK_HEADERS([fcntl.h iconv.h langinfo.h libintl.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 @@ -59,7 +62,6 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_TYPE_SSIZE_T AC_CHECK_MEMBERS([struct stat.st_blksize]) -AC_HEADER_TIME AC_STRUCT_TM AC_TYPE_UINT32_T AC_TYPE_UINT64_T @@ -72,19 +74,18 @@ AC_FUNC_CLOSEDIR_VOID AC_FUNC_ERROR_AT_LINE AC_FUNC_FORK AC_FUNC_GETMNTENT -AC_PROG_GCC_TRADITIONAL -AC_HEADER_MAJOR AC_FUNC_MALLOC AC_FUNC_SELECT_ARGTYPES AC_FUNC_STRFTIME AC_FUNC_STAT AC_FUNC_UTIME_NULL -AC_CHECK_FUNCS([endpwent ftruncate getmntent iconv 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 strtoull utime]) # Misc. DAV_DEFAULTS DAV_LFS -DAV_LINGUAS([de]) +DAV_LINGUAS([]) +DAV_ICONV AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU extensions]) AC_CONFIG_FILES([Makefile diff --git a/po/cs.po b/po/cs.po index e797266..35b95cd 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-12-31 21:11+0100\n" +"POT-Creation-Date: 2011-01-02 22:21+0100\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bitX-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n" -#: src/cache.c:658 +#: src/cache.c:660 msgid "" "connection timed out two times;\n" "trying one last time" @@ -24,12 +24,12 @@ msgstr "" "spojení vypršelo dvakrát;\n" "zkouším to ještě jednou a naposledy" -#: src/cache.c:663 +#: src/cache.c:665 #, c-format msgid "Last try succeeded.\n" msgstr "Poslední pokus byl úspěšný.\n" -#: src/cache.c:666 +#: src/cache.c:668 msgid "" "server temporarily unreachable;\n" "mounting anyway" @@ -37,7 +37,7 @@ msgstr "" "server je dočasně nedostupný;\n" "přesto připojuji" -#: src/cache.c:669 +#: src/cache.c:671 #, c-format msgid "" "Mounting failed.\n" @@ -46,217 +46,217 @@ msgstr "" "Připojení selhalo;\n" "%s" -#: src/cache.c:709 +#: src/cache.c:711 #, c-format msgid "can't replace %s with %s" msgstr "nemohu nahradit %s pomocí %s" -#: src/cache.c:713 +#: src/cache.c:715 #, c-format msgid "error writing new index file %s" msgstr "chyba při zápisu nového indexového souboru %s" -#: src/cache.c:717 +#: src/cache.c:719 #, c-format msgid "can't create new index file for %s" msgstr "nemohu vytvořit nový indexový soubor pro %s" -#: src/cache.c:939 +#: src/cache.c:941 #, c-format msgid "" "File %s exists on the server but should not. Maybe it is an error in the " "server's LOCK impementation. You may try option 'use_locks 0' in davfs2.conf." msgstr "" -#: src/cache.c:2563 src/cache.c:2597 +#: src/cache.c:2565 src/cache.c:2599 #, c-format msgid "can't create cache file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/cache.c:2612 +#: src/cache.c:2614 #, c-format msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2780 src/mount_davfs.c:590 src/mount_davfs.c:592 -#: src/mount_davfs.c:786 src/mount_davfs.c:788 src/mount_davfs.c:794 -#: src/mount_davfs.c:834 src/mount_davfs.c:836 src/mount_davfs.c:853 -#: src/mount_davfs.c:855 src/mount_davfs.c:1744 src/mount_davfs.c:1746 +#: src/cache.c:2782 src/mount_davfs.c:592 src/mount_davfs.c:594 +#: src/mount_davfs.c:788 src/mount_davfs.c:790 src/mount_davfs.c:796 +#: src/mount_davfs.c:836 src/mount_davfs.c:838 src/mount_davfs.c:855 +#: src/mount_davfs.c:857 src/mount_davfs.c:1746 src/mount_davfs.c:1748 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" -#: src/cache.c:2791 +#: src/cache.c:2793 #, c-format msgid "can't open cache directory %s" msgstr "nemohu otevřít kešovací adresář %s" -#: src/cache.c:2806 +#: src/cache.c:2808 #, c-format msgid "can't create cache directory %s" msgstr "nemohu vytvořit kešovací adresář %s" -#: src/cache.c:2813 +#: src/cache.c:2815 #, c-format msgid "can't access cache directory %s" msgstr "nemohu přistoupit ke kešovacímu adresáři %s" -#: src/cache.c:2816 +#: src/cache.c:2818 #, c-format msgid "wrong owner of cache directory %s" msgstr "chybný vlastník kešovacího adresáře %s" -#: src/cache.c:2820 +#: src/cache.c:2822 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "pro kešovací adresář %s nastaveno chybné oprávnění" -#: src/cache.c:2850 +#: src/cache.c:2852 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2923 +#: src/cache.c:2925 #, c-format msgid "error parsing %s" msgstr "chyba při zpracování %s" -#: src/cache.c:2924 +#: src/cache.c:2926 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2969 +#: src/cache.c:2971 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" "otevřené soubory přesahují limit velikosti vyrovnávací paměti o %llu MiB" -#: src/dav_coda.c:166 src/dav_fuse.c:166 +#: src/dav_coda.c:168 src/dav_fuse.c:168 msgid "can't allocate message buffer" msgstr "nemohu alokovat buffer pro zprávu" -#: src/kernel_interface.c:111 +#: src/kernel_interface.c:113 msgid "trying fuse kernel file system" msgstr "zkouším jaderný souborový systém fuse" -#: src/kernel_interface.c:119 +#: src/kernel_interface.c:121 msgid "fuse device opened successfully" msgstr "zařízení fuse otevřeno úspěšně" -#: src/kernel_interface.c:131 +#: src/kernel_interface.c:133 msgid "trying coda kernel file system" msgstr "zkouším jaderný souborový systém coda" -#: src/kernel_interface.c:137 +#: src/kernel_interface.c:139 msgid "coda device opened successfully" msgstr "zařízení coda otevřeno úspěšně" -#: src/kernel_interface.c:145 +#: src/kernel_interface.c:147 #, c-format msgid "unknown kernel file system %s" msgstr "neznámý jaderný souborový systém %s" -#: src/kernel_interface.c:194 +#: src/kernel_interface.c:196 msgid "no free coda device to mount" msgstr "pro připojení není volné žádné coda zařízení" -#: src/kernel_interface.c:203 +#: src/kernel_interface.c:205 #, c-format msgid "CODA_KERNEL_VERSION %u not supported" msgstr "CODA_KERNEL_VERSION %u není podporováno" -#: src/kernel_interface.c:243 +#: src/kernel_interface.c:245 msgid "can't open fuse device" msgstr "nemohu otevřít fuse zařízení" -#: src/kernel_interface.c:269 +#: src/kernel_interface.c:271 msgid "can't mount using fuse kernel file system" msgstr "nemohu připojit jaderný souborový systém fuse" -#: src/mount_davfs.c:238 +#: src/mount_davfs.c:240 msgid "program is not setuid root" msgstr "program není spuštěn jako setuid root" -#: src/mount_davfs.c:240 src/mount_davfs.c:442 src/mount_davfs.c:446 +#: src/mount_davfs.c:242 src/mount_davfs.c:444 src/mount_davfs.c:448 msgid "can't change effective user id" msgstr "nemohu změnit identifikátor efektivního uživatele" -#: src/mount_davfs.c:306 +#: src/mount_davfs.c:308 msgid "can't start daemon process" msgstr "nemohu spustit proces na pozadí" -#: src/mount_davfs.c:329 +#: src/mount_davfs.c:331 msgid "can't release root privileges" msgstr "nemohu uvolnit oprávnění uživatele root" -#: src/mount_davfs.c:349 +#: src/mount_davfs.c:351 msgid "failed to release tty properly" msgstr "" -#: src/mount_davfs.c:361 +#: src/mount_davfs.c:363 #, c-format msgid "can't write pid file %s" msgstr "nemohu zapsat pid souboru %s" -#: src/mount_davfs.c:379 +#: src/mount_davfs.c:381 #, c-format msgid "unmounting %s" msgstr "odpojuji %s" -#: src/mount_davfs.c:381 +#: src/mount_davfs.c:383 msgid "unmounting failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:430 src/mount_davfs.c:493 src/mount_davfs.c:576 -#: src/mount_davfs.c:858 +#: src/mount_davfs.c:432 src/mount_davfs.c:495 src/mount_davfs.c:578 +#: src/mount_davfs.c:860 #, c-format msgid "group %s does not exist" msgstr "skupina %s neexistuje" -#: src/mount_davfs.c:434 +#: src/mount_davfs.c:436 msgid "can't change group id" msgstr "nemohu změnit id skupiny" -#: src/mount_davfs.c:439 +#: src/mount_davfs.c:441 #, c-format msgid "user %s does not exist" msgstr "uživatel %s neexistuje" -#: src/mount_davfs.c:479 src/mount_davfs.c:561 src/mount_davfs.c:596 +#: src/mount_davfs.c:481 src/mount_davfs.c:563 src/mount_davfs.c:598 #, c-format msgid "can't create directory %s" msgstr "nemohu vytvořit adresář %s" -#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 -#: src/mount_davfs.c:605 src/mount_davfs.c:614 +#: src/mount_davfs.c:485 src/mount_davfs.c:567 src/mount_davfs.c:602 +#: src/mount_davfs.c:607 src/mount_davfs.c:616 #, c-format msgid "can't access directory %s" msgstr "nemohu přistupovat k adresáři %s" -#: src/mount_davfs.c:489 src/mount_davfs.c:571 +#: src/mount_davfs.c:491 src/mount_davfs.c:573 #, 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:498 src/mount_davfs.c:581 +#: src/mount_davfs.c:500 src/mount_davfs.c:583 #, c-format msgid "can't change group of directory %s" msgstr "nemohu změnit skupinu adresáře %s" -#: src/mount_davfs.c:609 src/mount_davfs.c:839 +#: src/mount_davfs.c:611 src/mount_davfs.c:841 msgid "can't read group data base" msgstr "nemohu přečíst údaje o skupinách" -#: src/mount_davfs.c:632 src/mount_davfs.c:680 +#: src/mount_davfs.c:634 src/mount_davfs.c:682 #, c-format msgid "can't open file %s" msgstr "nemohu otevřít soubor %s" -#: src/mount_davfs.c:637 +#: src/mount_davfs.c:639 #, c-format msgid "%s is already mounted on %s" msgstr "%s už je připojeno jako %s" -#: src/mount_davfs.c:660 +#: src/mount_davfs.c:662 #, c-format msgid "" "found PID file %s.\n" @@ -267,86 +267,86 @@ msgstr "" "Buď %s používá jiný proces, nebo\n" "jiné připojení skončilo neobvykle" -#: src/mount_davfs.c:691 +#: src/mount_davfs.c:693 #, c-format msgid "no entry for %s found in %s" msgstr "pro %s nebyla v %s nalezena žádná položka" -#: src/mount_davfs.c:698 +#: src/mount_davfs.c:700 #, c-format msgid "different URL in %s" msgstr "v %s je jiné URL" -#: src/mount_davfs.c:703 +#: src/mount_davfs.c:705 #, c-format msgid "different file system type in %s" msgstr "v %s je jiný souborový systém" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:716 #, c-format msgid "different config file in %s" msgstr "v %s je jiný konfigurační soubor" -#: src/mount_davfs.c:720 +#: src/mount_davfs.c:722 #, fuzzy, c-format msgid "different username in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:724 +#: src/mount_davfs.c:726 #, fuzzy, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "volba 'user' není v %s nastavena" -#: src/mount_davfs.c:727 +#: src/mount_davfs.c:729 #, c-format msgid "different mount options in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:730 +#: src/mount_davfs.c:732 #, c-format msgid "different uid in %s" msgstr "v %s je odlišné uid" -#: src/mount_davfs.c:732 +#: src/mount_davfs.c:734 #, c-format msgid "different gid in %s" msgstr "v %s je odlišné gid" -#: src/mount_davfs.c:734 +#: src/mount_davfs.c:736 #, c-format msgid "different dir_mode in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:736 +#: src/mount_davfs.c:738 #, c-format msgid "different file_mode in %s" msgstr "v %s je odlišný file_mode" -#: src/mount_davfs.c:763 +#: src/mount_davfs.c:765 #, 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:771 +#: src/mount_davfs.c:773 #, c-format msgid "can't get home directory for uid %i" msgstr "nemohu zjistit domovský adresář pro uid %i" -#: src/mount_davfs.c:773 +#: src/mount_davfs.c:775 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:778 +#: src/mount_davfs.c:780 #, c-format msgid "invalid mount point %s" msgstr "neplatný přípojný bod %s" -#: src/mount_davfs.c:781 +#: src/mount_davfs.c:783 #, c-format msgid "mount point %s does not exist" msgstr "přípojný bod %s neexistuje" -#: src/mount_davfs.c:799 +#: src/mount_davfs.c:801 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -355,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:827 +#: src/mount_davfs.c:829 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:845 +#: src/mount_davfs.c:847 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:865 +#: src/mount_davfs.c:867 #, 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:888 +#: src/mount_davfs.c:890 #, c-format msgid "can't mount %s on %s" msgstr "není možno připojit %s do %s" -#: src/mount_davfs.c:890 +#: src/mount_davfs.c:892 #, c-format msgid "kernel does not know file system %s" msgstr "kernel nezná souborový systém %s" -#: src/mount_davfs.c:892 +#: src/mount_davfs.c:894 msgid "mount point is busy" msgstr "přípojný bod je zaneprázdněn" -#: src/mount_davfs.c:968 src/umount_davfs.c:88 +#: src/mount_davfs.c:970 src/umount_davfs.c:90 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -393,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:984 src/umount_davfs.c:113 +#: src/mount_davfs.c:986 src/umount_davfs.c:115 msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:993 src/umount_davfs.c:119 +#: src/mount_davfs.c:995 src/umount_davfs.c:121 msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:1006 src/umount_davfs.c:121 +#: src/mount_davfs.c:1008 src/umount_davfs.c:123 msgid "too many arguments" msgstr "příliš mnoho argumentů" -#: src/mount_davfs.c:1012 +#: src/mount_davfs.c:1014 msgid "no mountpoint specified" msgstr "nebyl zadán žádný přípojný bod" -#: src/mount_davfs.c:1017 +#: src/mount_davfs.c:1019 msgid "no WebDAV-server specified" msgstr "nebyl zadán žádný WebDAV server" -#: src/mount_davfs.c:1020 +#: src/mount_davfs.c:1022 msgid "invalid URL" msgstr "neplatné URL" -#: src/mount_davfs.c:1039 +#: src/mount_davfs.c:1041 msgid "can't determine home directory" msgstr "nelze určit domovský adresář" -#: src/mount_davfs.c:1117 src/webdav.c:427 +#: src/mount_davfs.c:1119 src/webdav.c:429 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:1122 +#: src/mount_davfs.c:1124 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:1128 +#: src/mount_davfs.c:1130 #, 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:1178 src/mount_davfs.c:1191 src/mount_davfs.c:1193 -#: src/mount_davfs.c:1211 src/mount_davfs.c:1213 src/webdav.c:434 +#: src/mount_davfs.c:1180 src/mount_davfs.c:1193 src/mount_davfs.c:1195 +#: src/mount_davfs.c:1213 src/mount_davfs.c:1215 src/webdav.c:436 msgid "Password: " msgstr "Heslo: " -#: src/mount_davfs.c:1182 +#: src/mount_davfs.c:1184 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -451,11 +451,11 @@ msgstr "" "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1184 src/mount_davfs.c:1204 +#: src/mount_davfs.c:1186 src/mount_davfs.c:1206 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1188 +#: src/mount_davfs.c:1190 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -464,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:1202 +#: src/mount_davfs.c:1204 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -474,7 +474,7 @@ msgstr "" "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1208 +#: src/mount_davfs.c:1210 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -483,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:1263 +#: src/mount_davfs.c:1265 #, c-format msgid "pid %i, got signal %i" msgstr "pid %i dostal signál %i" -#: src/mount_davfs.c:1295 +#: src/mount_davfs.c:1297 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -496,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:1312 +#: src/mount_davfs.c:1314 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:1338 +#: src/mount_davfs.c:1340 #, 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:1341 +#: src/mount_davfs.c:1343 #, 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:1344 +#: src/mount_davfs.c:1346 #, 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:1610 +#: src/mount_davfs.c:1612 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1706 +#: src/mount_davfs.c:1708 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2152 src/mount_davfs.c:2375 src/mount_davfs.c:2387 +#: src/mount_davfs.c:2154 src/mount_davfs.c:2377 src/mount_davfs.c:2389 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:2173 src/mount_davfs.c:2213 src/mount_davfs.c:2302 -#: src/mount_davfs.c:2403 src/mount_davfs.c:2471 +#: src/mount_davfs.c:2175 src/mount_davfs.c:2215 src/mount_davfs.c:2304 +#: src/mount_davfs.c:2405 src/mount_davfs.c:2473 msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2283 src/mount_davfs.c:2296 +#: src/mount_davfs.c:2285 src/mount_davfs.c:2298 msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2379 +#: src/mount_davfs.c:2381 #, c-format msgid "file %s has wrong owner" msgstr "soubor %s má chybného vlastníka" -#: src/mount_davfs.c:2382 +#: src/mount_davfs.c:2384 #, c-format msgid "file %s has wrong permissions" msgstr "soubor %s má chybná oprávnění" -#: src/mount_davfs.c:2609 +#: src/mount_davfs.c:2611 #, c-format msgid "" "Usage:\n" @@ -564,7 +564,7 @@ msgstr "" " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2613 +#: src/mount_davfs.c:2615 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -573,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:2615 +#: src/mount_davfs.c:2617 #, c-format msgid "" " mount : or\n" @@ -584,7 +584,7 @@ msgstr "" " mount : připojí zdroj WebDAV tak, jak je zadáno\n" " v /etc/fstab.\n" -#: src/mount_davfs.c:2618 +#: src/mount_davfs.c:2620 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -601,7 +601,7 @@ msgstr "" " označuje seznam voleb oddělených čárkou.\n" "\n" -#: src/mount_davfs.c:2623 +#: src/mount_davfs.c:2625 #, c-format msgid "" "Recognised options:\n" @@ -620,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:2629 +#: src/mount_davfs.c:2631 #, c-format msgid "" " ro : mount read-only\n" @@ -635,7 +635,7 @@ msgstr "" " [no]suid : (ne)povolit účinnost suid a sgid bitů\n" " [no]_netdev : (není) třeba síťové spojení\n" -#: src/umount_davfs.c:94 +#: src/umount_davfs.c:96 #, c-format msgid "" "Usage:\n" @@ -648,7 +648,7 @@ msgstr "" " u%s -h,--help : vypsat tuto zprávu\n" "\n" -#: src/umount_davfs.c:98 +#: src/umount_davfs.c:100 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" @@ -657,7 +657,7 @@ msgstr "" "Pro odpojení zdroje WebDAV nevolejte přímo u%s, ale použijte\n" "místo toho `umount'.\n" -#: src/umount_davfs.c:101 +#: src/umount_davfs.c:103 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" @@ -666,11 +666,11 @@ msgstr "" " umount : odpojit zdroj WebDAV tak, jak je určeno\n" " v /etc/fstab.\n" -#: src/umount_davfs.c:127 +#: src/umount_davfs.c:129 msgid "can't determine mount point" msgstr "nemohu určit přípojný bod" -#: src/umount_davfs.c:147 +#: src/umount_davfs.c:149 #, c-format msgid "" "\n" @@ -683,7 +683,7 @@ msgstr "" " přesto se pokouším odpojit;\n" " čekejte prosím, až %s skončí" -#: src/umount_davfs.c:159 +#: src/umount_davfs.c:161 #, c-format msgid "" "\n" @@ -696,7 +696,7 @@ msgstr "" " přesto se pokouším odpojit;\n" " čekejte prosím, až %s skončí" -#: src/umount_davfs.c:175 +#: src/umount_davfs.c:177 #, c-format msgid "" "\n" @@ -709,35 +709,35 @@ msgstr "" " přesto se pokouším odpojit.\n" " pravděpodobně budete muset odstranit %s ručně" -#: src/umount_davfs.c:186 +#: src/umount_davfs.c:188 #, c-format msgid "%s: waiting while %s (pid %s) synchronizes the cache ." msgstr "%s: čekám, než si %s (pid %s) sesynchronizuje vyrovnávací paměť." -#: src/umount_davfs.c:199 +#: src/umount_davfs.c:201 #, c-format 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:352 +#: src/webdav.c:354 #, fuzzy msgid "socket library initialization failed" msgstr "selhala inicializace knihovny socketů" -#: src/webdav.c:365 +#: src/webdav.c:367 msgid "can't open stream to log neon-messages" msgstr "" -#: src/webdav.c:406 +#: src/webdav.c:408 msgid "neon library does not support TLS/SSL" msgstr "knihovna neon nepodporuje TLS/SSL" -#: src/webdav.c:414 +#: src/webdav.c:416 #, c-format msgid "can't read server certificate %s" msgstr "nemohu přečíst serverový cerifikát %s" -#: src/webdav.c:432 +#: src/webdav.c:434 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -746,78 +746,78 @@ msgstr "" "Zadejte prosím heslo pro dešifrování klientského\n" "certifikátu %s.\n" -#: src/webdav.c:446 +#: src/webdav.c:448 #, c-format msgid "can't decrypt client certificate %s" msgstr "nemohu dešifrovat klientský certifikát %s" -#: src/webdav.c:500 src/webdav.c:503 +#: src/webdav.c:502 src/webdav.c:505 msgid "mounting failed; the server does not support WebDAV" msgstr "připojení selhalo; server nepodporuje WebDAV" -#: src/webdav.c:511 +#: src/webdav.c:513 msgid "warning: the server does not support locks" msgstr "varování: server nepodporuje zámky" -#: src/webdav.c:1589 +#: src/webdav.c:1591 msgid "authentication failure:" msgstr "selhání autentizace:" -#: src/webdav.c:1627 +#: src/webdav.c:1629 #, c-format msgid "%i can't open cache file" msgstr "%i nemůže otevřít soubor vyrovnávací paměti" -#: src/webdav.c:1635 +#: src/webdav.c:1637 #, 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:1946 src/webdav.c:1949 +#: src/webdav.c:1948 src/webdav.c:1951 msgid "error processing server certificate" msgstr "chyba při zpracování certifikátu serveru" -#: src/webdav.c:1960 src/webdav.c:1994 +#: src/webdav.c:1962 src/webdav.c:1996 msgid "the server certificate is not yet valid" msgstr "certifikát serveru zatím není platný" -#: src/webdav.c:1962 src/webdav.c:1997 +#: src/webdav.c:1964 src/webdav.c:1999 msgid "the server certificate has expired" msgstr "platnost certifikátu serveru vypršela" -#: src/webdav.c:1964 src/webdav.c:2000 +#: src/webdav.c:1966 src/webdav.c:2002 msgid "the server certificate does not match the server name" msgstr "certifikát serveru nedopovídá jménu serveru" -#: src/webdav.c:1966 src/webdav.c:2003 +#: src/webdav.c:1968 src/webdav.c:2005 msgid "the server certificate is not trusted" msgstr "certifikát serveru je nedůvěryhodný" -#: src/webdav.c:1968 src/webdav.c:2006 +#: src/webdav.c:1970 src/webdav.c:2008 msgid "unknown certificate error" msgstr "neznámá chyba certifikátu" -#: src/webdav.c:1969 +#: src/webdav.c:1971 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1971 +#: src/webdav.c:1973 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1973 +#: src/webdav.c:1975 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1975 +#: src/webdav.c:1977 #, c-format msgid " fingerprint: %s" msgstr " otisk: %s" -#: src/webdav.c:1977 +#: src/webdav.c:1979 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -828,27 +828,27 @@ 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:1980 +#: src/webdav.c:1982 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Přijmout certifikát pro toto sezení? [y,N] " -#: src/webdav.c:2007 +#: src/webdav.c:2009 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:2008 +#: src/webdav.c:2010 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:2009 +#: src/webdav.c:2011 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:2012 +#: src/webdav.c:2014 msgid " accepted by user" msgstr " přijat uživatelem" diff --git a/po/davfs2.pot b/po/davfs2.pot index 513f371..44237d6 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-12-31 21:11+0100\n" +"POT-Creation-Date: 2011-01-02 22:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,240 +17,240 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/cache.c:658 +#: src/cache.c:660 msgid "" "connection timed out two times;\n" "trying one last time" msgstr "" -#: src/cache.c:663 +#: src/cache.c:665 #, c-format msgid "Last try succeeded.\n" msgstr "" -#: src/cache.c:666 +#: src/cache.c:668 msgid "" "server temporarily unreachable;\n" "mounting anyway" msgstr "" -#: src/cache.c:669 +#: src/cache.c:671 #, c-format msgid "" "Mounting failed.\n" "%s" msgstr "" -#: src/cache.c:709 +#: src/cache.c:711 #, c-format msgid "can't replace %s with %s" msgstr "" -#: src/cache.c:713 +#: src/cache.c:715 #, c-format msgid "error writing new index file %s" msgstr "" -#: src/cache.c:717 +#: src/cache.c:719 #, c-format msgid "can't create new index file for %s" msgstr "" -#: src/cache.c:939 +#: src/cache.c:941 #, c-format msgid "" "File %s exists on the server but should not. Maybe it is an error in the " "server's LOCK impementation. You may try option 'use_locks 0' in davfs2.conf." msgstr "" -#: src/cache.c:2563 src/cache.c:2597 +#: src/cache.c:2565 src/cache.c:2599 #, c-format msgid "can't create cache file %s" msgstr "" -#: src/cache.c:2612 +#: src/cache.c:2614 #, c-format msgid "error writing directory %s" msgstr "" -#: src/cache.c:2780 src/mount_davfs.c:590 src/mount_davfs.c:592 -#: src/mount_davfs.c:786 src/mount_davfs.c:788 src/mount_davfs.c:794 -#: src/mount_davfs.c:834 src/mount_davfs.c:836 src/mount_davfs.c:853 -#: src/mount_davfs.c:855 src/mount_davfs.c:1744 src/mount_davfs.c:1746 +#: src/cache.c:2782 src/mount_davfs.c:592 src/mount_davfs.c:594 +#: src/mount_davfs.c:788 src/mount_davfs.c:790 src/mount_davfs.c:796 +#: src/mount_davfs.c:836 src/mount_davfs.c:838 src/mount_davfs.c:855 +#: src/mount_davfs.c:857 src/mount_davfs.c:1746 src/mount_davfs.c:1748 msgid "can't read user data base" msgstr "" -#: src/cache.c:2791 +#: src/cache.c:2793 #, c-format msgid "can't open cache directory %s" msgstr "" -#: src/cache.c:2806 +#: src/cache.c:2808 #, c-format msgid "can't create cache directory %s" msgstr "" -#: src/cache.c:2813 +#: src/cache.c:2815 #, c-format msgid "can't access cache directory %s" msgstr "" -#: src/cache.c:2816 +#: src/cache.c:2818 #, c-format msgid "wrong owner of cache directory %s" msgstr "" -#: src/cache.c:2820 +#: src/cache.c:2822 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "" -#: src/cache.c:2850 +#: src/cache.c:2852 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2923 +#: src/cache.c:2925 #, c-format msgid "error parsing %s" msgstr "" -#: src/cache.c:2924 +#: src/cache.c:2926 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2969 +#: src/cache.c:2971 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" -#: src/dav_coda.c:166 src/dav_fuse.c:166 +#: src/dav_coda.c:168 src/dav_fuse.c:168 msgid "can't allocate message buffer" msgstr "" -#: src/kernel_interface.c:111 +#: src/kernel_interface.c:113 msgid "trying fuse kernel file system" msgstr "" -#: src/kernel_interface.c:119 +#: src/kernel_interface.c:121 msgid "fuse device opened successfully" msgstr "" -#: src/kernel_interface.c:131 +#: src/kernel_interface.c:133 msgid "trying coda kernel file system" msgstr "" -#: src/kernel_interface.c:137 +#: src/kernel_interface.c:139 msgid "coda device opened successfully" msgstr "" -#: src/kernel_interface.c:145 +#: src/kernel_interface.c:147 #, c-format msgid "unknown kernel file system %s" msgstr "" -#: src/kernel_interface.c:194 +#: src/kernel_interface.c:196 msgid "no free coda device to mount" msgstr "" -#: src/kernel_interface.c:203 +#: src/kernel_interface.c:205 #, c-format msgid "CODA_KERNEL_VERSION %u not supported" msgstr "" -#: src/kernel_interface.c:243 +#: src/kernel_interface.c:245 msgid "can't open fuse device" msgstr "" -#: src/kernel_interface.c:269 +#: src/kernel_interface.c:271 msgid "can't mount using fuse kernel file system" msgstr "" -#: src/mount_davfs.c:238 +#: src/mount_davfs.c:240 msgid "program is not setuid root" msgstr "" -#: src/mount_davfs.c:240 src/mount_davfs.c:442 src/mount_davfs.c:446 +#: src/mount_davfs.c:242 src/mount_davfs.c:444 src/mount_davfs.c:448 msgid "can't change effective user id" msgstr "" -#: src/mount_davfs.c:306 +#: src/mount_davfs.c:308 msgid "can't start daemon process" msgstr "" -#: src/mount_davfs.c:329 +#: src/mount_davfs.c:331 msgid "can't release root privileges" msgstr "" -#: src/mount_davfs.c:349 +#: src/mount_davfs.c:351 msgid "failed to release tty properly" msgstr "" -#: src/mount_davfs.c:361 +#: src/mount_davfs.c:363 #, c-format msgid "can't write pid file %s" msgstr "" -#: src/mount_davfs.c:379 +#: src/mount_davfs.c:381 #, c-format msgid "unmounting %s" msgstr "" -#: src/mount_davfs.c:381 +#: src/mount_davfs.c:383 msgid "unmounting failed" msgstr "" -#: src/mount_davfs.c:430 src/mount_davfs.c:493 src/mount_davfs.c:576 -#: src/mount_davfs.c:858 +#: src/mount_davfs.c:432 src/mount_davfs.c:495 src/mount_davfs.c:578 +#: src/mount_davfs.c:860 #, c-format msgid "group %s does not exist" msgstr "" -#: src/mount_davfs.c:434 +#: src/mount_davfs.c:436 msgid "can't change group id" msgstr "" -#: src/mount_davfs.c:439 +#: src/mount_davfs.c:441 #, c-format msgid "user %s does not exist" msgstr "" -#: src/mount_davfs.c:479 src/mount_davfs.c:561 src/mount_davfs.c:596 +#: src/mount_davfs.c:481 src/mount_davfs.c:563 src/mount_davfs.c:598 #, c-format msgid "can't create directory %s" msgstr "" -#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 -#: src/mount_davfs.c:605 src/mount_davfs.c:614 +#: src/mount_davfs.c:485 src/mount_davfs.c:567 src/mount_davfs.c:602 +#: src/mount_davfs.c:607 src/mount_davfs.c:616 #, c-format msgid "can't access directory %s" msgstr "" -#: src/mount_davfs.c:489 src/mount_davfs.c:571 +#: src/mount_davfs.c:491 src/mount_davfs.c:573 #, c-format msgid "can't change mode of directory %s" msgstr "" -#: src/mount_davfs.c:498 src/mount_davfs.c:581 +#: src/mount_davfs.c:500 src/mount_davfs.c:583 #, c-format msgid "can't change group of directory %s" msgstr "" -#: src/mount_davfs.c:609 src/mount_davfs.c:839 +#: src/mount_davfs.c:611 src/mount_davfs.c:841 msgid "can't read group data base" msgstr "" -#: src/mount_davfs.c:632 src/mount_davfs.c:680 +#: src/mount_davfs.c:634 src/mount_davfs.c:682 #, c-format msgid "can't open file %s" msgstr "" -#: src/mount_davfs.c:637 +#: src/mount_davfs.c:639 #, c-format msgid "%s is already mounted on %s" msgstr "" -#: src/mount_davfs.c:660 +#: src/mount_davfs.c:662 #, c-format msgid "" "found PID file %s.\n" @@ -258,272 +258,272 @@ msgid "" "or another mount process ended irregular" msgstr "" -#: src/mount_davfs.c:691 +#: src/mount_davfs.c:693 #, c-format msgid "no entry for %s found in %s" msgstr "" -#: src/mount_davfs.c:698 +#: src/mount_davfs.c:700 #, c-format msgid "different URL in %s" msgstr "" -#: src/mount_davfs.c:703 +#: src/mount_davfs.c:705 #, c-format msgid "different file system type in %s" msgstr "" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:716 #, c-format msgid "different config file in %s" msgstr "" -#: src/mount_davfs.c:720 +#: src/mount_davfs.c:722 #, c-format msgid "different username in %s" msgstr "" -#: src/mount_davfs.c:724 +#: src/mount_davfs.c:726 #, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "" -#: src/mount_davfs.c:727 +#: src/mount_davfs.c:729 #, c-format msgid "different mount options in %s" msgstr "" -#: src/mount_davfs.c:730 +#: src/mount_davfs.c:732 #, c-format msgid "different uid in %s" msgstr "" -#: src/mount_davfs.c:732 +#: src/mount_davfs.c:734 #, c-format msgid "different gid in %s" msgstr "" -#: src/mount_davfs.c:734 +#: src/mount_davfs.c:736 #, c-format msgid "different dir_mode in %s" msgstr "" -#: src/mount_davfs.c:736 +#: src/mount_davfs.c:738 #, c-format msgid "different file_mode in %s" msgstr "" -#: src/mount_davfs.c:763 +#: src/mount_davfs.c:765 #, c-format msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:771 +#: src/mount_davfs.c:773 #, c-format msgid "can't get home directory for uid %i" msgstr "" -#: src/mount_davfs.c:773 +#: src/mount_davfs.c:775 msgid "A relative mount point must lie within your home directory" msgstr "" -#: src/mount_davfs.c:778 +#: src/mount_davfs.c:780 #, c-format msgid "invalid mount point %s" msgstr "" -#: src/mount_davfs.c:781 +#: src/mount_davfs.c:783 #, c-format msgid "mount point %s does not exist" msgstr "" -#: src/mount_davfs.c:799 +#: src/mount_davfs.c:801 #, 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:827 +#: src/mount_davfs.c:829 msgid "you can't set file owner different from your uid" msgstr "" -#: src/mount_davfs.c:845 +#: src/mount_davfs.c:847 msgid "you must be member of the group of the file system" msgstr "" -#: src/mount_davfs.c:865 +#: src/mount_davfs.c:867 #, c-format msgid "user %s must be member of group %s" msgstr "" -#: src/mount_davfs.c:888 +#: src/mount_davfs.c:890 #, c-format msgid "can't mount %s on %s" msgstr "" -#: src/mount_davfs.c:890 +#: src/mount_davfs.c:892 #, c-format msgid "kernel does not know file system %s" msgstr "" -#: src/mount_davfs.c:892 +#: src/mount_davfs.c:894 msgid "mount point is busy" msgstr "" -#: src/mount_davfs.c:968 src/umount_davfs.c:88 +#: src/mount_davfs.c:970 src/umount_davfs.c:90 #, 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:984 src/umount_davfs.c:113 +#: src/mount_davfs.c:986 src/umount_davfs.c:115 msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:993 src/umount_davfs.c:119 +#: src/mount_davfs.c:995 src/umount_davfs.c:121 msgid "missing argument" msgstr "" -#: src/mount_davfs.c:1006 src/umount_davfs.c:121 +#: src/mount_davfs.c:1008 src/umount_davfs.c:123 msgid "too many arguments" msgstr "" -#: src/mount_davfs.c:1012 +#: src/mount_davfs.c:1014 msgid "no mountpoint specified" msgstr "" -#: src/mount_davfs.c:1017 +#: src/mount_davfs.c:1019 msgid "no WebDAV-server specified" msgstr "" -#: src/mount_davfs.c:1020 +#: src/mount_davfs.c:1022 msgid "invalid URL" msgstr "" -#: src/mount_davfs.c:1039 +#: src/mount_davfs.c:1041 msgid "can't determine home directory" msgstr "" -#: src/mount_davfs.c:1117 src/webdav.c:427 +#: src/mount_davfs.c:1119 src/webdav.c:429 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:1122 +#: src/mount_davfs.c:1124 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:1128 +#: src/mount_davfs.c:1130 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:1178 src/mount_davfs.c:1191 src/mount_davfs.c:1193 -#: src/mount_davfs.c:1211 src/mount_davfs.c:1213 src/webdav.c:434 +#: src/mount_davfs.c:1180 src/mount_davfs.c:1193 src/mount_davfs.c:1195 +#: src/mount_davfs.c:1213 src/mount_davfs.c:1215 src/webdav.c:436 msgid "Password: " msgstr "" -#: src/mount_davfs.c:1182 +#: src/mount_davfs.c:1184 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1184 src/mount_davfs.c:1204 +#: src/mount_davfs.c:1186 src/mount_davfs.c:1206 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1188 +#: src/mount_davfs.c:1190 #, 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:1202 +#: src/mount_davfs.c:1204 #, c-format msgid "" "Please enter the username to authenticate with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1208 +#: src/mount_davfs.c:1210 #, 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:1263 +#: src/mount_davfs.c:1265 #, c-format msgid "pid %i, got signal %i" msgstr "" -#: src/mount_davfs.c:1295 +#: src/mount_davfs.c:1297 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." msgstr "" -#: src/mount_davfs.c:1312 +#: src/mount_davfs.c:1314 msgid "" "Warning: can't write entry into mtab, but will mount the file system anyway" msgstr "" -#: src/mount_davfs.c:1338 +#: src/mount_davfs.c:1340 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "" -#: src/mount_davfs.c:1341 +#: src/mount_davfs.c:1343 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "" -#: src/mount_davfs.c:1344 +#: src/mount_davfs.c:1346 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "" -#: src/mount_davfs.c:1610 +#: src/mount_davfs.c:1612 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1706 +#: src/mount_davfs.c:1708 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2152 src/mount_davfs.c:2375 src/mount_davfs.c:2387 +#: src/mount_davfs.c:2154 src/mount_davfs.c:2377 src/mount_davfs.c:2389 #, c-format msgid "opening %s failed" msgstr "" -#: src/mount_davfs.c:2173 src/mount_davfs.c:2213 src/mount_davfs.c:2302 -#: src/mount_davfs.c:2403 src/mount_davfs.c:2471 +#: src/mount_davfs.c:2175 src/mount_davfs.c:2215 src/mount_davfs.c:2304 +#: src/mount_davfs.c:2405 src/mount_davfs.c:2473 msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2283 src/mount_davfs.c:2296 +#: src/mount_davfs.c:2285 src/mount_davfs.c:2298 msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2379 +#: src/mount_davfs.c:2381 #, c-format msgid "file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:2382 +#: src/mount_davfs.c:2384 #, c-format msgid "file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2609 +#: src/mount_davfs.c:2611 #, c-format msgid "" "Usage:\n" @@ -532,14 +532,14 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2613 +#: src/mount_davfs.c:2615 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2615 +#: src/mount_davfs.c:2617 #, c-format msgid "" " mount : or\n" @@ -547,7 +547,7 @@ msgid "" " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2618 +#: src/mount_davfs.c:2620 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -558,7 +558,7 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2623 +#: src/mount_davfs.c:2625 #, c-format msgid "" "Recognised options:\n" @@ -569,7 +569,7 @@ msgid "" " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2629 +#: src/mount_davfs.c:2631 #, c-format msgid "" " ro : mount read-only\n" @@ -579,7 +579,7 @@ msgid "" " [no]_netdev : (no) network connection needed\n" msgstr "" -#: src/umount_davfs.c:94 +#: src/umount_davfs.c:96 #, c-format msgid "" "Usage:\n" @@ -588,25 +588,25 @@ msgid "" "\n" msgstr "" -#: src/umount_davfs.c:98 +#: src/umount_davfs.c:100 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" "`umount' instead.\n" msgstr "" -#: src/umount_davfs.c:101 +#: src/umount_davfs.c:103 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" " /etc/fstab.\n" msgstr "" -#: src/umount_davfs.c:127 +#: src/umount_davfs.c:129 msgid "can't determine mount point" msgstr "" -#: src/umount_davfs.c:147 +#: src/umount_davfs.c:149 #, c-format msgid "" "\n" @@ -615,7 +615,7 @@ msgid "" " please wait for %s to terminate" msgstr "" -#: src/umount_davfs.c:159 +#: src/umount_davfs.c:161 #, c-format msgid "" "\n" @@ -624,7 +624,7 @@ msgid "" " please wait for %s to terminate" msgstr "" -#: src/umount_davfs.c:175 +#: src/umount_davfs.c:177 #, c-format msgid "" "\n" @@ -633,139 +633,139 @@ msgid "" " you propably have to remove %s manually" msgstr "" -#: src/umount_davfs.c:186 +#: src/umount_davfs.c:188 #, c-format msgid "%s: waiting while %s (pid %s) synchronizes the cache ." msgstr "" -#: src/umount_davfs.c:199 +#: src/umount_davfs.c:201 #, c-format msgid "an error occured while waiting; please wait for %s to terminate" msgstr "" -#: src/webdav.c:352 +#: src/webdav.c:354 msgid "socket library initialization failed" msgstr "" -#: src/webdav.c:365 +#: src/webdav.c:367 msgid "can't open stream to log neon-messages" msgstr "" -#: src/webdav.c:406 +#: src/webdav.c:408 msgid "neon library does not support TLS/SSL" msgstr "" -#: src/webdav.c:414 +#: src/webdav.c:416 #, c-format msgid "can't read server certificate %s" msgstr "" -#: src/webdav.c:432 +#: src/webdav.c:434 #, c-format msgid "" "Please enter the password to decrypt client\n" "certificate %s.\n" msgstr "" -#: src/webdav.c:446 +#: src/webdav.c:448 #, c-format msgid "can't decrypt client certificate %s" msgstr "" -#: src/webdav.c:500 src/webdav.c:503 +#: src/webdav.c:502 src/webdav.c:505 msgid "mounting failed; the server does not support WebDAV" msgstr "" -#: src/webdav.c:511 +#: src/webdav.c:513 msgid "warning: the server does not support locks" msgstr "" -#: src/webdav.c:1589 +#: src/webdav.c:1591 msgid "authentication failure:" msgstr "" -#: src/webdav.c:1627 +#: src/webdav.c:1629 #, c-format msgid "%i can't open cache file" msgstr "" -#: src/webdav.c:1635 +#: src/webdav.c:1637 #, c-format msgid "%i error writing to cache file" msgstr "" -#: src/webdav.c:1946 src/webdav.c:1949 +#: src/webdav.c:1948 src/webdav.c:1951 msgid "error processing server certificate" msgstr "" -#: src/webdav.c:1960 src/webdav.c:1994 +#: src/webdav.c:1962 src/webdav.c:1996 msgid "the server certificate is not yet valid" msgstr "" -#: src/webdav.c:1962 src/webdav.c:1997 +#: src/webdav.c:1964 src/webdav.c:1999 msgid "the server certificate has expired" msgstr "" -#: src/webdav.c:1964 src/webdav.c:2000 +#: src/webdav.c:1966 src/webdav.c:2002 msgid "the server certificate does not match the server name" msgstr "" -#: src/webdav.c:1966 src/webdav.c:2003 +#: src/webdav.c:1968 src/webdav.c:2005 msgid "the server certificate is not trusted" msgstr "" -#: src/webdav.c:1968 src/webdav.c:2006 +#: src/webdav.c:1970 src/webdav.c:2008 msgid "unknown certificate error" msgstr "" -#: src/webdav.c:1969 -#, c-format -msgid " issuer: %s" -msgstr "" - #: src/webdav.c:1971 #, c-format -msgid " subject: %s" +msgid " issuer: %s" msgstr "" #: src/webdav.c:1973 #, c-format -msgid " identity: %s" +msgid " subject: %s" msgstr "" #: src/webdav.c:1975 #, c-format -msgid " fingerprint: %s" +msgid " identity: %s" msgstr "" #: src/webdav.c:1977 #, c-format +msgid " fingerprint: %s" +msgstr "" + +#: src/webdav.c:1979 +#, c-format msgid "" "You only should accept this certificate, if you can\n" "verify the fingerprint! The server might be faked\n" "or there might be a man-in-the-middle-attack.\n" msgstr "" -#: src/webdav.c:1980 +#: src/webdav.c:1982 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "" -#: src/webdav.c:2007 +#: src/webdav.c:2009 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:2008 +#: src/webdav.c:2010 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:2009 +#: src/webdav.c:2011 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:2012 +#: src/webdav.c:2014 msgid " accepted by user" msgstr "" diff --git a/po/de.po b/po/de.po index 379d467..ec76780 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-12-31 21:11+0100\n" +"POT-Creation-Date: 2011-01-02 22:21+0100\n" "PO-Revision-Date: 2009-01-02 12:26+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/cache.c:658 +#: src/cache.c:660 msgid "" "connection timed out two times;\n" "trying one last time" @@ -24,12 +24,12 @@ msgstr "" "die Verbindung wurde zweimal wegen Zeitüberschreitung abgebrochen;\n" "ich versuche es zum letzten mal" -#: src/cache.c:663 +#: src/cache.c:665 #, c-format msgid "Last try succeeded.\n" msgstr "Der letzte Versuch war erfolgreich.\n" -#: src/cache.c:666 +#: src/cache.c:668 msgid "" "server temporarily unreachable;\n" "mounting anyway" @@ -37,7 +37,7 @@ msgstr "" "der Server ist zur Zeit nicht erreichbar;\n" "das Dateisystem wird trotzdem eingehängt" -#: src/cache.c:669 +#: src/cache.c:671 #, c-format msgid "" "Mounting failed.\n" @@ -46,22 +46,22 @@ msgstr "" "das Einhängen schlug fehl;\n" "%s" -#: src/cache.c:709 +#: src/cache.c:711 #, c-format msgid "can't replace %s with %s" msgstr "kann %s nicht durch %s ersetzen" -#: src/cache.c:713 +#: src/cache.c:715 #, c-format msgid "error writing new index file %s" msgstr "Fehler beim Schreiben der neuen Indexdatei %s" -#: src/cache.c:717 +#: src/cache.c:719 #, c-format msgid "can't create new index file for %s" msgstr "kann keine neue Indexdatei für %s erzeugen" -#: src/cache.c:939 +#: src/cache.c:941 #, c-format msgid "" "File %s exists on the server but should not. Maybe it is an error in the " @@ -71,197 +71,197 @@ msgstr "" "behandelt der Server LOCK-Requests fehlerhaft. Du kannst es mit der Option " "'use_locks 0' in davfs2.conf versuchen." -#: src/cache.c:2563 src/cache.c:2597 +#: src/cache.c:2565 src/cache.c:2599 #, c-format msgid "can't create cache file %s" msgstr "kann die Cachedatei %s nicht erzeugen" -#: src/cache.c:2612 +#: src/cache.c:2614 #, c-format msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2780 src/mount_davfs.c:590 src/mount_davfs.c:592 -#: src/mount_davfs.c:786 src/mount_davfs.c:788 src/mount_davfs.c:794 -#: src/mount_davfs.c:834 src/mount_davfs.c:836 src/mount_davfs.c:853 -#: src/mount_davfs.c:855 src/mount_davfs.c:1744 src/mount_davfs.c:1746 +#: src/cache.c:2782 src/mount_davfs.c:592 src/mount_davfs.c:594 +#: src/mount_davfs.c:788 src/mount_davfs.c:790 src/mount_davfs.c:796 +#: src/mount_davfs.c:836 src/mount_davfs.c:838 src/mount_davfs.c:855 +#: src/mount_davfs.c:857 src/mount_davfs.c:1746 src/mount_davfs.c:1748 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" -#: src/cache.c:2791 +#: src/cache.c:2793 #, c-format msgid "can't open cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht öffnen" -#: src/cache.c:2806 +#: src/cache.c:2808 #, c-format msgid "can't create cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht erzeugen" -#: src/cache.c:2813 +#: src/cache.c:2815 #, c-format msgid "can't access cache directory %s" msgstr "Zugriff auf das Cachverzeichnis %s verweigert" -#: src/cache.c:2816 +#: src/cache.c:2818 #, c-format msgid "wrong owner of cache directory %s" msgstr "das Cacheverzeichnis %s hat den falschen Besitzer" -#: src/cache.c:2820 +#: src/cache.c:2822 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "das Cachverzeichnis %s hat die falschen Dateirechte" -#: src/cache.c:2850 +#: src/cache.c:2852 msgid "found orphaned file in cache:" msgstr "fand verwaiste Datei im Cache:" -#: src/cache.c:2923 +#: src/cache.c:2925 #, c-format msgid "error parsing %s" msgstr "Syntaxfehler in %s" -#: src/cache.c:2924 +#: src/cache.c:2926 #, c-format msgid " at line %i" msgstr " in Zeile %i" -#: src/cache.c:2969 +#: src/cache.c:2971 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" "Die Größe der offenen Dateien überschreitet die maximale Größe des Cache um %" "llu MiBytes" -#: src/dav_coda.c:166 src/dav_fuse.c:166 +#: src/dav_coda.c:168 src/dav_fuse.c:168 msgid "can't allocate message buffer" msgstr "kein Speicher für den Nachrichtenpuffer verfügbar" -#: src/kernel_interface.c:111 +#: src/kernel_interface.c:113 msgid "trying fuse kernel file system" msgstr "ich versuche es mit dem Kernel-Dateisystem fuse" -#: src/kernel_interface.c:119 +#: src/kernel_interface.c:121 msgid "fuse device opened successfully" msgstr "fuse-Gerätedatei erfolgreich geöffnet" -#: src/kernel_interface.c:131 +#: src/kernel_interface.c:133 msgid "trying coda kernel file system" msgstr "ich versuche es mit dem Kernel-Dateisystem coda" -#: src/kernel_interface.c:137 +#: src/kernel_interface.c:139 msgid "coda device opened successfully" msgstr "coda-Gerätedatei erfolgreich geöffnet" -#: src/kernel_interface.c:145 +#: src/kernel_interface.c:147 #, c-format msgid "unknown kernel file system %s" msgstr "das Kernel-Dateisystem %s ist unbekannt" -#: src/kernel_interface.c:194 +#: src/kernel_interface.c:196 msgid "no free coda device to mount" msgstr "keine freie coda-Gerätedatei gefunden" -#: src/kernel_interface.c:203 +#: src/kernel_interface.c:205 #, c-format msgid "CODA_KERNEL_VERSION %u not supported" msgstr "CODA_KERNEL_VERSION %u wird nicht unterstützt" -#: src/kernel_interface.c:243 +#: src/kernel_interface.c:245 msgid "can't open fuse device" msgstr "kann die fuse-Gerätedatei nicht öffnen" -#: src/kernel_interface.c:269 +#: src/kernel_interface.c:271 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:238 +#: src/mount_davfs.c:240 msgid "program is not setuid root" msgstr "die Programmdatei hat das setuid-Bit nicht gesetzt" -#: src/mount_davfs.c:240 src/mount_davfs.c:442 src/mount_davfs.c:446 +#: src/mount_davfs.c:242 src/mount_davfs.c:444 src/mount_davfs.c:448 msgid "can't change effective user id" msgstr "kann die effektive Benutzer-ID nicht ändern" -#: src/mount_davfs.c:306 +#: src/mount_davfs.c:308 msgid "can't start daemon process" msgstr "kann den Hintergrundprozess nicht starten" -#: src/mount_davfs.c:329 +#: src/mount_davfs.c:331 msgid "can't release root privileges" msgstr "ich werde die root-Rechte nicht los" -#: src/mount_davfs.c:349 +#: src/mount_davfs.c:351 msgid "failed to release tty properly" msgstr "kann das Terminal nicht freigeben" -#: src/mount_davfs.c:361 +#: src/mount_davfs.c:363 #, c-format msgid "can't write pid file %s" msgstr "kann die PID-Datei %s nicht schreiben" -#: src/mount_davfs.c:379 +#: src/mount_davfs.c:381 #, c-format msgid "unmounting %s" msgstr "hänge %s aus" -#: src/mount_davfs.c:381 +#: src/mount_davfs.c:383 msgid "unmounting failed" msgstr "das Aushängen schlug fehl" -#: src/mount_davfs.c:430 src/mount_davfs.c:493 src/mount_davfs.c:576 -#: src/mount_davfs.c:858 +#: src/mount_davfs.c:432 src/mount_davfs.c:495 src/mount_davfs.c:578 +#: src/mount_davfs.c:860 #, c-format msgid "group %s does not exist" msgstr "die Gruppe %s existiert nicht" -#: src/mount_davfs.c:434 +#: src/mount_davfs.c:436 msgid "can't change group id" msgstr "kann die Gruppenkennung nicht ändern" -#: src/mount_davfs.c:439 +#: src/mount_davfs.c:441 #, c-format msgid "user %s does not exist" msgstr "der Benutzer %s existiert nicht" -#: src/mount_davfs.c:479 src/mount_davfs.c:561 src/mount_davfs.c:596 +#: src/mount_davfs.c:481 src/mount_davfs.c:563 src/mount_davfs.c:598 #, c-format msgid "can't create directory %s" msgstr "kann das Verzeichnis %s nicht erzeugen" -#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 -#: src/mount_davfs.c:605 src/mount_davfs.c:614 +#: src/mount_davfs.c:485 src/mount_davfs.c:567 src/mount_davfs.c:602 +#: src/mount_davfs.c:607 src/mount_davfs.c:616 #, c-format msgid "can't access directory %s" msgstr "Zugriff auf das Verzeichnis %s verweigert" -#: src/mount_davfs.c:489 src/mount_davfs.c:571 +#: src/mount_davfs.c:491 src/mount_davfs.c:573 #, c-format msgid "can't change mode of directory %s" msgstr "kann die Rechte des Verzeichnisses %s nicht ändern" -#: src/mount_davfs.c:498 src/mount_davfs.c:581 +#: src/mount_davfs.c:500 src/mount_davfs.c:583 #, c-format msgid "can't change group of directory %s" msgstr "kann die Gruppenkennung des Verneichnisses %s nicht ändern" -#: src/mount_davfs.c:609 src/mount_davfs.c:839 +#: src/mount_davfs.c:611 src/mount_davfs.c:841 msgid "can't read group data base" msgstr "kann die Gruppendatenbank nicht lesen" -#: src/mount_davfs.c:632 src/mount_davfs.c:680 +#: src/mount_davfs.c:634 src/mount_davfs.c:682 #, c-format msgid "can't open file %s" msgstr "kann die Datei %s nicht öffnen" -#: src/mount_davfs.c:637 +#: src/mount_davfs.c:639 #, c-format msgid "%s is already mounted on %s" msgstr "%s ist bereits auf %s eingehängt" -#: src/mount_davfs.c:660 +#: src/mount_davfs.c:662 #, c-format msgid "" "found PID file %s.\n" @@ -272,86 +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:691 +#: src/mount_davfs.c:693 #, c-format msgid "no entry for %s found in %s" msgstr "für %s ist kein Eintrag in %s" -#: src/mount_davfs.c:698 +#: src/mount_davfs.c:700 #, c-format msgid "different URL in %s" msgstr "in %s ist eine andere URL angegeben" -#: src/mount_davfs.c:703 +#: src/mount_davfs.c:705 #, c-format msgid "different file system type in %s" msgstr "in %s ist ein anderer Dateisystemtyp angegeben" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:716 #, c-format msgid "different config file in %s" msgstr "in %s ist eine andere Konfigurationsdatei angegeben" -#: src/mount_davfs.c:720 +#: src/mount_davfs.c:722 #, c-format msgid "different username in %s" msgstr "in %s ist ein anderer Benutzername angegeben" -#: src/mount_davfs.c:724 +#: src/mount_davfs.c:726 #, 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:727 +#: src/mount_davfs.c:729 #, c-format msgid "different mount options in %s" msgstr "in %s sind andere Mount-Optionen angegeben" -#: src/mount_davfs.c:730 +#: src/mount_davfs.c:732 #, c-format msgid "different uid in %s" msgstr "in %s ist eine andere uid angegeben" -#: src/mount_davfs.c:732 +#: src/mount_davfs.c:734 #, c-format msgid "different gid in %s" msgstr "in %s ist eine andere gid angegeben" -#: src/mount_davfs.c:734 +#: src/mount_davfs.c:736 #, c-format msgid "different dir_mode in %s" msgstr "in %s ist ein anderer dir_mode angegeben" -#: src/mount_davfs.c:736 +#: src/mount_davfs.c:738 #, c-format msgid "different file_mode in %s" msgstr "in %s ist ein anderer file_mode angegeben" -#: src/mount_davfs.c:763 +#: src/mount_davfs.c:765 #, 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:771 +#: src/mount_davfs.c:773 #, 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:773 +#: src/mount_davfs.c:775 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:778 +#: src/mount_davfs.c:780 #, c-format msgid "invalid mount point %s" msgstr "der Einhängepunkt %s ist nicht erlaubt" -#: src/mount_davfs.c:781 +#: src/mount_davfs.c:783 #, c-format msgid "mount point %s does not exist" msgstr "der Einhängepunkt %s existiert nicht" -#: src/mount_davfs.c:799 +#: src/mount_davfs.c:801 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -360,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:827 +#: src/mount_davfs.c:829 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:845 +#: src/mount_davfs.c:847 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:865 +#: src/mount_davfs.c:867 #, 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:888 +#: src/mount_davfs.c:890 #, c-format msgid "can't mount %s on %s" msgstr "kann %s nicht auf %s einhängen" -#: src/mount_davfs.c:890 +#: src/mount_davfs.c:892 #, c-format msgid "kernel does not know file system %s" msgstr "der Kernel kenn das Dateisystem %s nicht" -#: src/mount_davfs.c:892 +#: src/mount_davfs.c:894 msgid "mount point is busy" msgstr "das Einhängepunkt wird anderweitig benutzt" -#: src/mount_davfs.c:968 src/umount_davfs.c:88 +#: src/mount_davfs.c:970 src/umount_davfs.c:90 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -400,59 +400,59 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:984 src/umount_davfs.c:113 +#: src/mount_davfs.c:986 src/umount_davfs.c:115 msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:993 src/umount_davfs.c:119 +#: src/mount_davfs.c:995 src/umount_davfs.c:121 msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:1006 src/umount_davfs.c:121 +#: src/mount_davfs.c:1008 src/umount_davfs.c:123 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/mount_davfs.c:1012 +#: src/mount_davfs.c:1014 msgid "no mountpoint specified" msgstr "es wurde kein Einhängepunkt angegeben" -#: src/mount_davfs.c:1017 +#: src/mount_davfs.c:1019 msgid "no WebDAV-server specified" msgstr "es wurde kein WebDAV-Server angegeben" -#: src/mount_davfs.c:1020 +#: src/mount_davfs.c:1022 msgid "invalid URL" msgstr "die URL ist ungültig" -#: src/mount_davfs.c:1039 +#: src/mount_davfs.c:1041 msgid "can't determine home directory" msgstr "kann das Home-Verzeichnis nicht ermitteln" -#: src/mount_davfs.c:1117 src/webdav.c:427 +#: src/mount_davfs.c:1119 src/webdav.c:429 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:1122 +#: src/mount_davfs.c:1124 #, 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:1128 +#: src/mount_davfs.c:1130 #, 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:1178 src/mount_davfs.c:1191 src/mount_davfs.c:1193 -#: src/mount_davfs.c:1211 src/mount_davfs.c:1213 src/webdav.c:434 +#: src/mount_davfs.c:1180 src/mount_davfs.c:1193 src/mount_davfs.c:1195 +#: src/mount_davfs.c:1213 src/mount_davfs.c:1215 src/webdav.c:436 msgid "Password: " msgstr "Passwort:" -#: src/mount_davfs.c:1182 +#: src/mount_davfs.c:1184 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -461,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:1184 src/mount_davfs.c:1204 +#: src/mount_davfs.c:1186 src/mount_davfs.c:1206 msgid "Username:" msgstr "Benutzername:" -#: src/mount_davfs.c:1188 +#: src/mount_davfs.c:1190 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -474,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:1202 +#: src/mount_davfs.c:1204 #, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -483,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:1208 +#: src/mount_davfs.c:1210 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -492,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:1263 +#: src/mount_davfs.c:1265 #, c-format msgid "pid %i, got signal %i" msgstr "PID %i, erhielt Signal %i" -#: src/mount_davfs.c:1295 +#: src/mount_davfs.c:1297 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -505,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:1312 +#: src/mount_davfs.c:1314 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:1338 +#: src/mount_davfs.c:1340 #, 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:1341 +#: src/mount_davfs.c:1343 #, 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:1344 +#: src/mount_davfs.c:1346 #, 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:1610 +#: src/mount_davfs.c:1612 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1706 +#: src/mount_davfs.c:1708 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2152 src/mount_davfs.c:2375 src/mount_davfs.c:2387 +#: src/mount_davfs.c:2154 src/mount_davfs.c:2377 src/mount_davfs.c:2389 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: src/mount_davfs.c:2173 src/mount_davfs.c:2213 src/mount_davfs.c:2302 -#: src/mount_davfs.c:2403 src/mount_davfs.c:2471 +#: src/mount_davfs.c:2175 src/mount_davfs.c:2215 src/mount_davfs.c:2304 +#: src/mount_davfs.c:2405 src/mount_davfs.c:2473 msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2283 src/mount_davfs.c:2296 +#: src/mount_davfs.c:2285 src/mount_davfs.c:2298 msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2379 +#: src/mount_davfs.c:2381 #, c-format msgid "file %s has wrong owner" msgstr "die Datei %s hat den falschen Besitzer" -#: src/mount_davfs.c:2382 +#: src/mount_davfs.c:2384 #, c-format msgid "file %s has wrong permissions" msgstr "die Dateirechte für %s sind falsch" -#: src/mount_davfs.c:2609 +#: src/mount_davfs.c:2611 #, c-format msgid "" "Usage:\n" @@ -574,7 +574,7 @@ msgstr "" " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2613 +#: src/mount_davfs.c:2615 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -583,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:2615 +#: src/mount_davfs.c:2617 #, c-format msgid "" " mount : or\n" @@ -594,7 +594,7 @@ msgstr "" " mount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab ein.\n" -#: src/mount_davfs.c:2618 +#: src/mount_davfs.c:2620 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -611,7 +611,7 @@ msgstr "" " Kommas unterteilte Liste von Optionen.\n" "\n" -#: src/mount_davfs.c:2623 +#: src/mount_davfs.c:2625 #, c-format msgid "" "Recognised options:\n" @@ -628,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:2629 +#: src/mount_davfs.c:2631 #, c-format msgid "" " ro : mount read-only\n" @@ -643,7 +643,7 @@ msgstr "" " [no]suid : gesetzte suid- und sgid-Bits sind (nicht) wirksam\n" " [no]_nedev : benötigt (keine) Netzwerkverbindung\n" -#: src/umount_davfs.c:94 +#: src/umount_davfs.c:96 #, c-format msgid "" "Usage:\n" @@ -656,7 +656,7 @@ msgstr "" " u%s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/umount_davfs.c:98 +#: src/umount_davfs.c:100 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" @@ -665,7 +665,7 @@ msgstr "" "Um eine WebDAV-Resource auszuhängen, sollte u%s nicht direkt aufgerufen " "werden; stattdessen sollte „umount” benutzt werden.\n" -#: src/umount_davfs.c:101 +#: src/umount_davfs.c:103 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" @@ -674,11 +674,11 @@ msgstr "" " umount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab aus.\n" -#: src/umount_davfs.c:127 +#: src/umount_davfs.c:129 msgid "can't determine mount point" msgstr "kann den Einhängepunkt nicht ermitteln" -#: src/umount_davfs.c:147 +#: src/umount_davfs.c:149 #, c-format msgid "" "\n" @@ -691,7 +691,7 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " bitte warte bis der %s-Prozess endet" -#: src/umount_davfs.c:159 +#: src/umount_davfs.c:161 #, c-format msgid "" "\n" @@ -704,7 +704,7 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " bitte warte bis der %s-Prozess endet" -#: src/umount_davfs.c:175 +#: src/umount_davfs.c:177 #, c-format msgid "" "\n" @@ -717,37 +717,37 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " %s muss wahrscheinlich von Hand gelöscht werden" -#: src/umount_davfs.c:186 +#: src/umount_davfs.c:188 #, c-format msgid "%s: waiting while %s (pid %s) synchronizes the cache ." msgstr "" "%s: warte bis %s (PID %s) die Dateien im Cache\n" "gesichert hat ." -#: src/umount_davfs.c:199 +#: src/umount_davfs.c:201 #, c-format 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:352 +#: src/webdav.c:354 msgid "socket library initialization failed" msgstr "die socket-Bibliothek konnte nicht initialisiert werden" -#: src/webdav.c:365 +#: src/webdav.c:367 msgid "can't open stream to log neon-messages" msgstr "kann die Ausgabe für neon-Log-Meldungen nicht öffnen" -#: src/webdav.c:406 +#: src/webdav.c:408 msgid "neon library does not support TLS/SSL" msgstr "die Neon-Bibliothek uterstützt TLS/SSL nicht" -#: src/webdav.c:414 +#: src/webdav.c:416 #, c-format msgid "can't read server certificate %s" msgstr "kann das Server-Zertifikat %s nicht lesen" -#: src/webdav.c:432 +#: src/webdav.c:434 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -756,78 +756,78 @@ msgstr "" "Gib bitte das Passwort für die Entschlüsselung des\n" "Client-Zertifikats %s ein.\n" -#: src/webdav.c:446 +#: src/webdav.c:448 #, c-format msgid "can't decrypt client certificate %s" msgstr "kann das Zertifikat %s nicht entschlüsseln" -#: src/webdav.c:500 src/webdav.c:503 +#: src/webdav.c:502 src/webdav.c:505 msgid "mounting failed; the server does not support WebDAV" msgstr "das Einhängen schlug fehl; der Server unterstützt WebDAV nicht" -#: src/webdav.c:511 +#: src/webdav.c:513 msgid "warning: the server does not support locks" msgstr "Warnung: der Server kann Dateien nicht sperren" -#: src/webdav.c:1589 +#: src/webdav.c:1591 msgid "authentication failure:" msgstr "Authentifizierungsfehler" -#: src/webdav.c:1627 +#: src/webdav.c:1629 #, c-format msgid "%i can't open cache file" msgstr "%i kann die Cache-Datei nicht öffnen" -#: src/webdav.c:1635 +#: src/webdav.c:1637 #, c-format msgid "%i error writing to cache file" msgstr "%i Fehler beim Schreiben der Cache-Datei" -#: src/webdav.c:1946 src/webdav.c:1949 +#: src/webdav.c:1948 src/webdav.c:1951 msgid "error processing server certificate" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1960 src/webdav.c:1994 +#: src/webdav.c:1962 src/webdav.c:1996 msgid "the server certificate is not yet valid" msgstr "das Server-Zertifikat ist noch nicht gültig" -#: src/webdav.c:1962 src/webdav.c:1997 +#: src/webdav.c:1964 src/webdav.c:1999 msgid "the server certificate has expired" msgstr "das Server-Zertifikat ist nicht mehr gültig" -#: src/webdav.c:1964 src/webdav.c:2000 +#: src/webdav.c:1966 src/webdav.c:2002 msgid "the server certificate does not match the server name" msgstr "das Server-Zertifikat passt nicht zum Namen des Servers" -#: src/webdav.c:1966 src/webdav.c:2003 +#: src/webdav.c:1968 src/webdav.c:2005 msgid "the server certificate is not trusted" msgstr "wir trauen dem Zertifikat nicht" -#: src/webdav.c:1968 src/webdav.c:2006 +#: src/webdav.c:1970 src/webdav.c:2008 msgid "unknown certificate error" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1969 +#: src/webdav.c:1971 #, c-format msgid " issuer: %s" msgstr " Aussteller: %s" -#: src/webdav.c:1971 +#: src/webdav.c:1973 #, c-format msgid " subject: %s" msgstr " Inhaber: %s" -#: src/webdav.c:1973 +#: src/webdav.c:1975 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1975 +#: src/webdav.c:1977 #, c-format msgid " fingerprint: %s" msgstr " Fingerabdruck: %s" -#: src/webdav.c:1977 +#: src/webdav.c:1979 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -838,27 +838,27 @@ 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:1980 +#: src/webdav.c:1982 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Ich akzeptiere das Zertifikat für diese Sitzung [j,N]: " -#: src/webdav.c:2007 +#: src/webdav.c:2009 #, c-format msgid " issuer: %s" msgstr " Aussteller des Zertifikats: %s" -#: src/webdav.c:2008 +#: src/webdav.c:2010 #, c-format msgid " subject: %s" msgstr " Inhaber des Zertifikats: %s" -#: src/webdav.c:2009 +#: src/webdav.c:2011 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:2012 +#: src/webdav.c:2014 msgid " accepted by user" msgstr " durch den Benutzer akzeptiert" diff --git a/src/cache.c b/src/cache.c index b2b896f..f38b734 100644 --- a/src/cache.c +++ b/src/cache.c @@ -37,7 +37,9 @@ #ifdef HAVE_STDLIB_H #include #endif +#ifdef HAVE_STRING_H #include +#endif #ifdef HAVE_SYSLOG_H #include #endif diff --git a/src/dav_coda.c b/src/dav_coda.c index ec58c65..39a1a76 100644 --- a/src/dav_coda.c +++ b/src/dav_coda.c @@ -37,7 +37,9 @@ #include #endif #include +#ifdef HAVE_STRING_H #include +#endif #ifdef HAVE_SYSLOG_H #include #endif diff --git a/src/dav_fuse.c b/src/dav_fuse.c index e4d6e5b..41c7033 100644 --- a/src/dav_fuse.c +++ b/src/dav_fuse.c @@ -33,7 +33,9 @@ #ifdef HAVE_STDINT_H #include #endif +#ifdef HAVE_STRING_H #include +#endif #ifdef HAVE_SYSLOG_H #include #endif diff --git a/src/kernel_interface.c b/src/kernel_interface.c index 4404f6b..a47ea4e 100644 --- a/src/kernel_interface.c +++ b/src/kernel_interface.c @@ -37,7 +37,9 @@ #ifdef HAVE_STDLIB_H #include #endif +#ifdef HAVE_STRING_H #include +#endif #ifdef HAVE_SYSLOG_H #include #endif diff --git a/src/mount_davfs.c b/src/mount_davfs.c index ef867df..eb73717 100644 --- a/src/mount_davfs.c +++ b/src/mount_davfs.c @@ -46,7 +46,9 @@ #ifdef HAVE_STDLIB_H #include #endif +#ifdef HAVE_STRING_H #include +#endif #ifdef HAVE_SYSLOG_H #include #endif diff --git a/src/umount_davfs.c b/src/umount_davfs.c index 585912e..373d2cd 100644 --- a/src/umount_davfs.c +++ b/src/umount_davfs.c @@ -33,7 +33,9 @@ #ifdef HAVE_STDLIB_H #include #endif +#ifdef HAVE_STRING_H #include +#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/src/webdav.c b/src/webdav.c index 1202315..1ee0d45 100644 --- a/src/webdav.c +++ b/src/webdav.c @@ -41,7 +41,9 @@ #ifdef HAVE_STDLIB_H #include #endif +#ifdef HAVE_STRING_H #include +#endif #ifdef HAVE_SYSLOG_H #include #endif @@ -201,7 +203,7 @@ static int initialized; Needed by ssl_verify() which may be called at any time. */ static int have_terminal; -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H /* Handle to convert character encoding from utf-8 to LC_CTYPE. If NULL no conversion is done. */ static iconv_t from_utf_8; @@ -217,7 +219,7 @@ static iconv_t from_server_enc; /* Handle to convert from LC_CTYPE to character encoding of path names. If NULL no conversion is done. */ static iconv_t to_server_enc; -#endif /* HAVE_ICONV */ +#endif /* DAV_USE_ICONV && HAVE_ICONV_H */ /* A GNU custom stream, used to redirect neon debug messages to syslog. */ static FILE *log_stream; @@ -234,7 +236,7 @@ static char *cookie; /* Private function prototypes and inline functions */ /*==================================================*/ -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H static void convert(char **s, iconv_t conv); #endif @@ -321,7 +323,7 @@ dav_init_webdav(const dav_args *args) if (args->neon_debug & ~NE_DBG_HTTPPLAIN) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Initializing webdav"); -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H char *lc_charset = nl_langinfo(CODESET); if (lc_charset && strcasecmp(lc_charset, "UTF-8") != 0) { from_utf_8 = iconv_open(lc_charset, "UTF-8"); @@ -346,7 +348,7 @@ dav_init_webdav(const dav_args *args) to_server_enc = 0; } } -#endif /* HAVE_ICONV */ +#endif /* DAV_USE_ICONV && HAVE_ICONV_H */ if (ne_sock_init() != 0) error(EXIT_FAILURE, errno, _("socket library initialization failed")); @@ -549,7 +551,7 @@ char * dav_conv_from_utf_8(const char *s) { char *new = ne_strdup(s); -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H if (from_utf_8) convert(&new, from_utf_8); #endif @@ -561,7 +563,7 @@ char * dav_conv_to_utf_8(const char *s) { char *new = ne_strdup(s); -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H if (to_utf_8) convert(&new, to_utf_8); #endif @@ -573,7 +575,7 @@ char * dav_conv_from_server_enc(const char *s) { char *new = ne_strdup(s); -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H if (from_server_enc) convert(&new, from_server_enc); #endif @@ -585,7 +587,7 @@ char * dav_conv_to_server_enc(const char *s) { char *new = ne_strdup(s); -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H if (to_server_enc) convert(&new, to_server_enc); #endif @@ -1257,7 +1259,7 @@ dav_unlock(const char *path, time_t *expire) /* Private functions */ /*===================*/ -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H static void convert(char **s, iconv_t conv) { @@ -1278,7 +1280,7 @@ convert(char **s, iconv_t conv) free(buf); } -#endif /* HAVE_ICONV */ +#endif /* DAV_USE_ICONV && HAVE_ICONV_H */ /* Returns a file error code according to ret from the last WebDAV @@ -1793,7 +1795,7 @@ prop_result(void *userdata, const ne_uri *uri, const ne_prop_result_set *set) strlen(result->path) - strlen(ctx->path) - result->is_dir); replace_slashes(&result->name); -#ifdef HAVE_ICONV +#if defined DAV_USE_ICONV && defined HAVE_ICONV_H if (from_server_enc) convert(&result->name, from_server_enc); #endif