From 40442f819adef7065af3de19face7f910317037c Mon Sep 17 00:00:00 2001 From: wbaumann Date: Fri, 1 May 2009 07:12:48 +0000 Subject: [PATCH] if delay_upload == 0 save to server immediately --- ChangeLog | 5 ++ po/cs.po | 158 +++++++++++++++++++++++++------------------------- po/davfs2.pot | 158 +++++++++++++++++++++++++------------------------- po/de.po | 158 +++++++++++++++++++++++++------------------------- src/cache.c | 30 ++++++++++ 5 files changed, 272 insertions(+), 237 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1988fc7..ec639ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ ChangeLog for davfs2 -------------------- +2009-04-30 Werner Baumann (werner.baumann@onlinehome.de) + * cache.c, dav_close: + if delay_upload == 0 save to server immediately. + FIXME: manpage + 2009-04-29 Werner Baumann (werner.baumann@onlinehome.de) * mount_davfs.c, mount_davfs.h: Add mount-option "users". diff --git a/po/cs.po b/po/cs.po index 4d4bbb4..40fba40 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-04-29 20:18+0200\n" +"POT-Creation-Date: 2009-04-30 21:12+0200\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -61,63 +61,63 @@ msgstr "chyba při zápisu nového indexového souboru %s" msgid "can't create new index file for %s" msgstr "nemohu vytvořit nový indexový soubor pro %s" -#: src/cache.c:2473 src/cache.c:2507 +#: src/cache.c:2503 src/cache.c:2537 #, c-format msgid "can't create cache file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/cache.c:2522 +#: src/cache.c:2552 #, c-format msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2688 src/mount_davfs.c:591 src/mount_davfs.c:593 -#: src/mount_davfs.c:772 src/mount_davfs.c:774 src/mount_davfs.c:780 -#: src/mount_davfs.c:820 src/mount_davfs.c:822 src/mount_davfs.c:839 -#: src/mount_davfs.c:841 src/mount_davfs.c:1684 src/mount_davfs.c:1686 +#: src/cache.c:2718 src/mount_davfs.c:591 src/mount_davfs.c:593 +#: src/mount_davfs.c:770 src/mount_davfs.c:772 src/mount_davfs.c:778 +#: src/mount_davfs.c:818 src/mount_davfs.c:820 src/mount_davfs.c:837 +#: src/mount_davfs.c:839 src/mount_davfs.c:1682 src/mount_davfs.c:1684 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" -#: src/cache.c:2699 +#: src/cache.c:2729 #, c-format msgid "can't open cache directory %s" msgstr "nemohu otevřít kešovací adresář %s" -#: src/cache.c:2714 +#: src/cache.c:2744 #, c-format msgid "can't create cache directory %s" msgstr "nemohu vytvořit kešovací adresář %s" -#: src/cache.c:2721 +#: src/cache.c:2751 #, c-format msgid "can't access cache directory %s" msgstr "nemohu přistoupit ke kešovacímu adresáři %s" -#: src/cache.c:2724 +#: src/cache.c:2754 #, c-format msgid "wrong owner of cache directory %s" msgstr "chybný vlastník kešovacího adresáře %s" -#: src/cache.c:2728 +#: src/cache.c:2758 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "pro kešovací adresář %s nastaveno chybné oprávnění" -#: src/cache.c:2758 +#: src/cache.c:2788 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2829 +#: src/cache.c:2859 #, c-format msgid "error parsing %s" msgstr "chyba při zpracování %s" -#: src/cache.c:2830 +#: src/cache.c:2860 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2875 +#: src/cache.c:2905 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -200,7 +200,7 @@ msgid "unmounting failed" msgstr "odpojení selhalo" #: src/mount_davfs.c:431 src/mount_davfs.c:494 src/mount_davfs.c:577 -#: src/mount_davfs.c:844 +#: src/mount_davfs.c:842 #, c-format msgid "group %s does not exist" msgstr "skupina %s neexistuje" @@ -235,7 +235,7 @@ msgstr "nemohu změnit oprávnění (mode) adresáře %s" msgid "can't change group of directory %s" msgstr "nemohu změnit skupinu adresáře %s" -#: src/mount_davfs.c:610 src/mount_davfs.c:825 +#: src/mount_davfs.c:610 src/mount_davfs.c:823 msgid "can't read group data base" msgstr "nemohu přečíst údaje o skupinách" @@ -260,91 +260,91 @@ msgstr "" "Buď %s používá jiný proces, nebo\n" "jiné připojení skončilo neobvykle" -#: src/mount_davfs.c:684 +#: src/mount_davfs.c:682 #, c-format msgid "no entry for %s found in %s" msgstr "pro %s nebyla v %s nalezena žádná položka" -#: src/mount_davfs.c:690 +#: src/mount_davfs.c:688 #, c-format msgid "different URL in %s" msgstr "v %s je jiné URL" -#: src/mount_davfs.c:698 +#: src/mount_davfs.c:696 #, c-format msgid "different file system type in %s" msgstr "v %s je jiný souborový systém" -#: src/mount_davfs.c:701 +#: src/mount_davfs.c:699 #, c-format msgid "different config file in %s" msgstr "v %s je jiný konfigurační soubor" -#: src/mount_davfs.c:704 +#: src/mount_davfs.c:702 #, fuzzy, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "volba 'user' není v %s nastavena" -#: src/mount_davfs.c:707 +#: src/mount_davfs.c:705 #, fuzzy, c-format msgid "different option `user' in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:709 +#: src/mount_davfs.c:707 #, fuzzy, c-format msgid "different option `users' in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:712 +#: src/mount_davfs.c:710 #, c-format msgid "different mount options in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:715 +#: src/mount_davfs.c:713 #, c-format msgid "different uid in %s" msgstr "v %s je odlišné uid" -#: src/mount_davfs.c:717 +#: src/mount_davfs.c:715 #, c-format msgid "different gid in %s" msgstr "v %s je odlišné gid" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:717 #, c-format msgid "different dir_mode in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:721 +#: src/mount_davfs.c:719 #, c-format msgid "different file_mode in %s" msgstr "v %s je odlišný file_mode" -#: src/mount_davfs.c:749 +#: src/mount_davfs.c:747 #, 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:754 +#: src/mount_davfs.c:752 #, c-format msgid "can't get home directory for uid %i" msgstr "nemohu zjistit domovský adresář pro uid %i" -#: src/mount_davfs.c:756 +#: src/mount_davfs.c:754 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:764 +#: src/mount_davfs.c:762 #, c-format msgid "invalid mount point %s" msgstr "neplatný přípojný bod %s" -#: src/mount_davfs.c:767 +#: src/mount_davfs.c:765 #, c-format msgid "mount point %s does not exist" msgstr "přípojný bod %s neexistuje" -#: src/mount_davfs.c:785 +#: src/mount_davfs.c:783 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -353,34 +353,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:813 +#: src/mount_davfs.c:811 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:831 +#: src/mount_davfs.c:829 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:851 +#: src/mount_davfs.c:849 #, 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:874 +#: src/mount_davfs.c:872 #, c-format msgid "can't mount %s on %s" msgstr "není možno připojit %s do %s" -#: src/mount_davfs.c:876 +#: src/mount_davfs.c:874 #, c-format msgid "kernel does not know file system %s" msgstr "kernel nezná souborový systém %s" -#: src/mount_davfs.c:878 +#: src/mount_davfs.c:876 msgid "mount point is busy" msgstr "přípojný bod je zaneprázdněn" -#: src/mount_davfs.c:940 src/umount_davfs.c:88 +#: src/mount_davfs.c:938 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -391,50 +391,50 @@ 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:956 src/umount_davfs.c:113 +#: src/mount_davfs.c:954 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:965 src/umount_davfs.c:119 +#: src/mount_davfs.c:963 src/umount_davfs.c:119 msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:978 src/umount_davfs.c:121 +#: src/mount_davfs.c:976 src/umount_davfs.c:121 msgid "too many arguments" msgstr "příliš mnoho argumentů" -#: src/mount_davfs.c:984 +#: src/mount_davfs.c:982 msgid "no mountpoint specified" msgstr "nebyl zadán žádný přípojný bod" -#: src/mount_davfs.c:989 +#: src/mount_davfs.c:987 msgid "no WebDAV-server specified" msgstr "nebyl zadán žádný WebDAV server" -#: src/mount_davfs.c:992 +#: src/mount_davfs.c:990 msgid "invalid URL" msgstr "neplatné URL" -#: src/mount_davfs.c:1011 +#: src/mount_davfs.c:1009 msgid "can't determine home directory" msgstr "nelze určit domovský adresář" -#: src/mount_davfs.c:1089 src/webdav.c:387 +#: src/mount_davfs.c:1087 src/webdav.c:387 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:1094 +#: src/mount_davfs.c:1092 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:1100 +#: src/mount_davfs.c:1098 #, 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:1143 +#: src/mount_davfs.c:1141 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -444,11 +444,11 @@ msgstr "" "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1145 src/mount_davfs.c:1161 +#: src/mount_davfs.c:1143 src/mount_davfs.c:1159 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1149 +#: src/mount_davfs.c:1147 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -457,11 +457,11 @@ 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:1151 src/mount_davfs.c:1167 src/webdav.c:394 +#: src/mount_davfs.c:1149 src/mount_davfs.c:1165 src/webdav.c:394 msgid "Password: " msgstr "Heslo: " -#: src/mount_davfs.c:1159 +#: src/mount_davfs.c:1157 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -471,7 +471,7 @@ msgstr "" "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1165 +#: src/mount_davfs.c:1163 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -480,12 +480,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:1214 +#: src/mount_davfs.c:1212 #, c-format msgid "pid %i, got signal %i" msgstr "pid %i dostal signál %i" -#: src/mount_davfs.c:1246 +#: src/mount_davfs.c:1244 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -493,62 +493,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:1263 +#: src/mount_davfs.c:1261 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:1289 +#: src/mount_davfs.c:1287 #, 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:1292 +#: src/mount_davfs.c:1290 #, 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:1295 +#: src/mount_davfs.c:1293 #, 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:1555 +#: src/mount_davfs.c:1553 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1646 +#: src/mount_davfs.c:1644 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2100 src/mount_davfs.c:2321 src/mount_davfs.c:2333 +#: src/mount_davfs.c:2098 src/mount_davfs.c:2319 src/mount_davfs.c:2331 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:2121 src/mount_davfs.c:2161 src/mount_davfs.c:2248 -#: src/mount_davfs.c:2349 src/mount_davfs.c:2414 +#: src/mount_davfs.c:2119 src/mount_davfs.c:2159 src/mount_davfs.c:2246 +#: src/mount_davfs.c:2347 src/mount_davfs.c:2412 msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2229 src/mount_davfs.c:2242 +#: src/mount_davfs.c:2227 src/mount_davfs.c:2240 msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2325 +#: src/mount_davfs.c:2323 #, c-format msgid "file %s has wrong owner" msgstr "soubor %s má chybného vlastníka" -#: src/mount_davfs.c:2328 +#: src/mount_davfs.c:2326 #, c-format msgid "file %s has wrong permissions" msgstr "soubor %s má chybná oprávnění" -#: src/mount_davfs.c:2552 +#: src/mount_davfs.c:2550 #, c-format msgid "" "Usage:\n" @@ -561,7 +561,7 @@ msgstr "" " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2556 +#: src/mount_davfs.c:2554 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -570,7 +570,7 @@ msgstr "" "Pro připojení zdroje WebDAV nevolejte přímo %s, ale\n" "použijte místo toho `mount'.\n" -#: src/mount_davfs.c:2558 +#: src/mount_davfs.c:2556 #, c-format msgid "" " mount : or\n" @@ -581,7 +581,7 @@ msgstr "" " mount : připojí zdroj WebDAV tak, jak je zadáno\n" " v /etc/fstab.\n" -#: src/mount_davfs.c:2561 +#: src/mount_davfs.c:2559 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -598,7 +598,7 @@ msgstr "" " označuje seznam voleb oddělených čárkou.\n" "\n" -#: src/mount_davfs.c:2566 +#: src/mount_davfs.c:2564 #, c-format msgid "" "Recognised options:\n" @@ -617,7 +617,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:2572 +#: src/mount_davfs.c:2570 #, c-format msgid "" " ro : mount read-only\n" diff --git a/po/davfs2.pot b/po/davfs2.pot index 26e08a6..63e565c 100644 --- a/po/davfs2.pot +++ b/po/davfs2.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-04-29 20:18+0200\n" +"POT-Creation-Date: 2009-04-30 21:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,63 +56,63 @@ msgstr "" msgid "can't create new index file for %s" msgstr "" -#: src/cache.c:2473 src/cache.c:2507 +#: src/cache.c:2503 src/cache.c:2537 #, c-format msgid "can't create cache file %s" msgstr "" -#: src/cache.c:2522 +#: src/cache.c:2552 #, c-format msgid "error writing directory %s" msgstr "" -#: src/cache.c:2688 src/mount_davfs.c:591 src/mount_davfs.c:593 -#: src/mount_davfs.c:772 src/mount_davfs.c:774 src/mount_davfs.c:780 -#: src/mount_davfs.c:820 src/mount_davfs.c:822 src/mount_davfs.c:839 -#: src/mount_davfs.c:841 src/mount_davfs.c:1684 src/mount_davfs.c:1686 +#: src/cache.c:2718 src/mount_davfs.c:591 src/mount_davfs.c:593 +#: src/mount_davfs.c:770 src/mount_davfs.c:772 src/mount_davfs.c:778 +#: src/mount_davfs.c:818 src/mount_davfs.c:820 src/mount_davfs.c:837 +#: src/mount_davfs.c:839 src/mount_davfs.c:1682 src/mount_davfs.c:1684 msgid "can't read user data base" msgstr "" -#: src/cache.c:2699 +#: src/cache.c:2729 #, c-format msgid "can't open cache directory %s" msgstr "" -#: src/cache.c:2714 +#: src/cache.c:2744 #, c-format msgid "can't create cache directory %s" msgstr "" -#: src/cache.c:2721 +#: src/cache.c:2751 #, c-format msgid "can't access cache directory %s" msgstr "" -#: src/cache.c:2724 +#: src/cache.c:2754 #, c-format msgid "wrong owner of cache directory %s" msgstr "" -#: src/cache.c:2728 +#: src/cache.c:2758 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "" -#: src/cache.c:2758 +#: src/cache.c:2788 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2829 +#: src/cache.c:2859 #, c-format msgid "error parsing %s" msgstr "" -#: src/cache.c:2830 +#: src/cache.c:2860 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2875 +#: src/cache.c:2905 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -194,7 +194,7 @@ msgid "unmounting failed" msgstr "" #: src/mount_davfs.c:431 src/mount_davfs.c:494 src/mount_davfs.c:577 -#: src/mount_davfs.c:844 +#: src/mount_davfs.c:842 #, c-format msgid "group %s does not exist" msgstr "" @@ -229,7 +229,7 @@ msgstr "" msgid "can't change group of directory %s" msgstr "" -#: src/mount_davfs.c:610 src/mount_davfs.c:825 +#: src/mount_davfs.c:610 src/mount_davfs.c:823 msgid "can't read group data base" msgstr "" @@ -251,276 +251,276 @@ msgid "" "or another mount process ended irregular" msgstr "" -#: src/mount_davfs.c:684 +#: src/mount_davfs.c:682 #, c-format msgid "no entry for %s found in %s" msgstr "" -#: src/mount_davfs.c:690 +#: src/mount_davfs.c:688 #, c-format msgid "different URL in %s" msgstr "" -#: src/mount_davfs.c:698 +#: src/mount_davfs.c:696 #, c-format msgid "different file system type in %s" msgstr "" -#: src/mount_davfs.c:701 +#: src/mount_davfs.c:699 #, c-format msgid "different config file in %s" msgstr "" -#: src/mount_davfs.c:704 +#: src/mount_davfs.c:702 #, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "" -#: src/mount_davfs.c:707 +#: src/mount_davfs.c:705 #, c-format msgid "different option `user' in %s" msgstr "" -#: src/mount_davfs.c:709 +#: src/mount_davfs.c:707 #, c-format msgid "different option `users' in %s" msgstr "" -#: src/mount_davfs.c:712 +#: src/mount_davfs.c:710 #, c-format msgid "different mount options in %s" msgstr "" -#: src/mount_davfs.c:715 +#: src/mount_davfs.c:713 #, c-format msgid "different uid in %s" msgstr "" -#: src/mount_davfs.c:717 +#: src/mount_davfs.c:715 #, c-format msgid "different gid in %s" msgstr "" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:717 #, c-format msgid "different dir_mode in %s" msgstr "" -#: src/mount_davfs.c:721 +#: src/mount_davfs.c:719 #, c-format msgid "different file_mode in %s" msgstr "" -#: src/mount_davfs.c:749 +#: src/mount_davfs.c:747 #, c-format msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:754 +#: src/mount_davfs.c:752 #, c-format msgid "can't get home directory for uid %i" msgstr "" -#: src/mount_davfs.c:756 +#: src/mount_davfs.c:754 msgid "A relative mount point must lie within your home directory" msgstr "" -#: src/mount_davfs.c:764 +#: src/mount_davfs.c:762 #, c-format msgid "invalid mount point %s" msgstr "" -#: src/mount_davfs.c:767 +#: src/mount_davfs.c:765 #, c-format msgid "mount point %s does not exist" msgstr "" -#: src/mount_davfs.c:785 +#: src/mount_davfs.c:783 #, 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:813 +#: src/mount_davfs.c:811 msgid "you can't set file owner different from your uid" msgstr "" -#: src/mount_davfs.c:831 +#: src/mount_davfs.c:829 msgid "you must be member of the group of the file system" msgstr "" -#: src/mount_davfs.c:851 +#: src/mount_davfs.c:849 #, c-format msgid "user %s must be member of group %s" msgstr "" -#: src/mount_davfs.c:874 +#: src/mount_davfs.c:872 #, c-format msgid "can't mount %s on %s" msgstr "" -#: src/mount_davfs.c:876 +#: src/mount_davfs.c:874 #, c-format msgid "kernel does not know file system %s" msgstr "" -#: src/mount_davfs.c:878 +#: src/mount_davfs.c:876 msgid "mount point is busy" msgstr "" -#: src/mount_davfs.c:940 src/umount_davfs.c:88 +#: src/mount_davfs.c:938 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:956 src/umount_davfs.c:113 +#: src/mount_davfs.c:954 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:965 src/umount_davfs.c:119 +#: src/mount_davfs.c:963 src/umount_davfs.c:119 msgid "missing argument" msgstr "" -#: src/mount_davfs.c:978 src/umount_davfs.c:121 +#: src/mount_davfs.c:976 src/umount_davfs.c:121 msgid "too many arguments" msgstr "" -#: src/mount_davfs.c:984 +#: src/mount_davfs.c:982 msgid "no mountpoint specified" msgstr "" -#: src/mount_davfs.c:989 +#: src/mount_davfs.c:987 msgid "no WebDAV-server specified" msgstr "" -#: src/mount_davfs.c:992 +#: src/mount_davfs.c:990 msgid "invalid URL" msgstr "" -#: src/mount_davfs.c:1011 +#: src/mount_davfs.c:1009 msgid "can't determine home directory" msgstr "" -#: src/mount_davfs.c:1089 src/webdav.c:387 +#: src/mount_davfs.c:1087 src/webdav.c:387 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:1094 +#: src/mount_davfs.c:1092 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:1100 +#: src/mount_davfs.c:1098 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:1143 +#: src/mount_davfs.c:1141 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1145 src/mount_davfs.c:1161 +#: src/mount_davfs.c:1143 src/mount_davfs.c:1159 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1149 +#: src/mount_davfs.c:1147 #, 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:1151 src/mount_davfs.c:1167 src/webdav.c:394 +#: src/mount_davfs.c:1149 src/mount_davfs.c:1165 src/webdav.c:394 msgid "Password: " msgstr "" -#: src/mount_davfs.c:1159 +#: src/mount_davfs.c:1157 #, c-format msgid "" "Please enter the username to authenticate with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1165 +#: src/mount_davfs.c:1163 #, 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:1214 +#: src/mount_davfs.c:1212 #, c-format msgid "pid %i, got signal %i" msgstr "" -#: src/mount_davfs.c:1246 +#: src/mount_davfs.c:1244 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." msgstr "" -#: src/mount_davfs.c:1263 +#: src/mount_davfs.c:1261 msgid "" "Warning: can't write entry into mtab, but will mount the file system anyway" msgstr "" -#: src/mount_davfs.c:1289 +#: src/mount_davfs.c:1287 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "" -#: src/mount_davfs.c:1292 +#: src/mount_davfs.c:1290 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "" -#: src/mount_davfs.c:1295 +#: src/mount_davfs.c:1293 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "" -#: src/mount_davfs.c:1555 +#: src/mount_davfs.c:1553 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1646 +#: src/mount_davfs.c:1644 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2100 src/mount_davfs.c:2321 src/mount_davfs.c:2333 +#: src/mount_davfs.c:2098 src/mount_davfs.c:2319 src/mount_davfs.c:2331 #, c-format msgid "opening %s failed" msgstr "" -#: src/mount_davfs.c:2121 src/mount_davfs.c:2161 src/mount_davfs.c:2248 -#: src/mount_davfs.c:2349 src/mount_davfs.c:2414 +#: src/mount_davfs.c:2119 src/mount_davfs.c:2159 src/mount_davfs.c:2246 +#: src/mount_davfs.c:2347 src/mount_davfs.c:2412 msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2229 src/mount_davfs.c:2242 +#: src/mount_davfs.c:2227 src/mount_davfs.c:2240 msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2325 +#: src/mount_davfs.c:2323 #, c-format msgid "file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:2328 +#: src/mount_davfs.c:2326 #, c-format msgid "file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2552 +#: src/mount_davfs.c:2550 #, c-format msgid "" "Usage:\n" @@ -529,14 +529,14 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2556 +#: src/mount_davfs.c:2554 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2558 +#: src/mount_davfs.c:2556 #, c-format msgid "" " mount : or\n" @@ -544,7 +544,7 @@ msgid "" " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2561 +#: src/mount_davfs.c:2559 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -555,7 +555,7 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2566 +#: src/mount_davfs.c:2564 #, c-format msgid "" "Recognised options:\n" @@ -566,7 +566,7 @@ msgid "" " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2572 +#: src/mount_davfs.c:2570 #, c-format msgid "" " ro : mount read-only\n" diff --git a/po/de.po b/po/de.po index 616324e..9abf86a 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: davfs2 1.3.3\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-04-29 20:18+0200\n" +"POT-Creation-Date: 2009-04-30 21:12+0200\n" "PO-Revision-Date: 2009-01-02 12:26+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -61,63 +61,63 @@ msgstr "Fehler beim Schreiben der neuen Indexdatei %s" msgid "can't create new index file for %s" msgstr "kann keine neue Indexdatei für %s erzeugen" -#: src/cache.c:2473 src/cache.c:2507 +#: src/cache.c:2503 src/cache.c:2537 #, c-format msgid "can't create cache file %s" msgstr "kann die Cachedatei %s nicht erzeugen" -#: src/cache.c:2522 +#: src/cache.c:2552 #, c-format msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2688 src/mount_davfs.c:591 src/mount_davfs.c:593 -#: src/mount_davfs.c:772 src/mount_davfs.c:774 src/mount_davfs.c:780 -#: src/mount_davfs.c:820 src/mount_davfs.c:822 src/mount_davfs.c:839 -#: src/mount_davfs.c:841 src/mount_davfs.c:1684 src/mount_davfs.c:1686 +#: src/cache.c:2718 src/mount_davfs.c:591 src/mount_davfs.c:593 +#: src/mount_davfs.c:770 src/mount_davfs.c:772 src/mount_davfs.c:778 +#: src/mount_davfs.c:818 src/mount_davfs.c:820 src/mount_davfs.c:837 +#: src/mount_davfs.c:839 src/mount_davfs.c:1682 src/mount_davfs.c:1684 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" -#: src/cache.c:2699 +#: src/cache.c:2729 #, c-format msgid "can't open cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht öffnen" -#: src/cache.c:2714 +#: src/cache.c:2744 #, c-format msgid "can't create cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht erzeugen" -#: src/cache.c:2721 +#: src/cache.c:2751 #, c-format msgid "can't access cache directory %s" msgstr "Zugriff auf das Cachverzeichnis %s verweigert" -#: src/cache.c:2724 +#: src/cache.c:2754 #, c-format msgid "wrong owner of cache directory %s" msgstr "das Cacheverzeichnis %s hat den falschen Besitzer" -#: src/cache.c:2728 +#: src/cache.c:2758 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "das Cachverzeichnis %s hat die falschen Dateirechte" -#: src/cache.c:2758 +#: src/cache.c:2788 msgid "found orphaned file in cache:" msgstr "fand verwaiste Datei im Cache:" -#: src/cache.c:2829 +#: src/cache.c:2859 #, c-format msgid "error parsing %s" msgstr "Syntaxfehler in %s" -#: src/cache.c:2830 +#: src/cache.c:2860 #, c-format msgid " at line %i" msgstr " in Zeile %i" -#: src/cache.c:2875 +#: src/cache.c:2905 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -202,7 +202,7 @@ msgid "unmounting failed" msgstr "das Aushängen schlug fehl" #: src/mount_davfs.c:431 src/mount_davfs.c:494 src/mount_davfs.c:577 -#: src/mount_davfs.c:844 +#: src/mount_davfs.c:842 #, c-format msgid "group %s does not exist" msgstr "die Gruppe %s existiert nicht" @@ -237,7 +237,7 @@ msgstr "kann die Rechte des Verzeichnisses %s nicht ändern" msgid "can't change group of directory %s" msgstr "kann die Gruppenkennung des Verneichnisses %s nicht ändern" -#: src/mount_davfs.c:610 src/mount_davfs.c:825 +#: src/mount_davfs.c:610 src/mount_davfs.c:823 msgid "can't read group data base" msgstr "kann die Gruppendatenbank nicht lesen" @@ -262,91 +262,91 @@ msgstr "" "Möglicherweise wird %s von einem anderen Prozess benutzt,\n" "oder ein anderer Mount-Prozess endete irregulär" -#: src/mount_davfs.c:684 +#: src/mount_davfs.c:682 #, c-format msgid "no entry for %s found in %s" msgstr "für %s ist kein Eintrag in %s" -#: src/mount_davfs.c:690 +#: src/mount_davfs.c:688 #, c-format msgid "different URL in %s" msgstr "in %s ist eine andere URL angegeben" -#: src/mount_davfs.c:698 +#: src/mount_davfs.c:696 #, c-format msgid "different file system type in %s" msgstr "in %s ist ein anderer Dateisystemtyp angegeben" -#: src/mount_davfs.c:701 +#: src/mount_davfs.c:699 #, c-format msgid "different config file in %s" msgstr "in %s ist eine andere Konfigurationsdatei angegeben" -#: src/mount_davfs.c:704 +#: src/mount_davfs.c:702 #, 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:707 +#: src/mount_davfs.c:705 #, c-format msgid "different option `user' in %s" msgstr "in %s ist die Option „user” anders gesetzt" -#: src/mount_davfs.c:709 +#: src/mount_davfs.c:707 #, c-format msgid "different option `users' in %s" msgstr "in %s ist die Option „users” anders gesetzt" -#: src/mount_davfs.c:712 +#: src/mount_davfs.c:710 #, c-format msgid "different mount options in %s" msgstr "in %s sind andere Mount-Optionen angegeben" -#: src/mount_davfs.c:715 +#: src/mount_davfs.c:713 #, c-format msgid "different uid in %s" msgstr "in %s ist eine andere uid angegeben" -#: src/mount_davfs.c:717 +#: src/mount_davfs.c:715 #, c-format msgid "different gid in %s" msgstr "in %s ist eine andere gid angegeben" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:717 #, c-format msgid "different dir_mode in %s" msgstr "in %s ist ein anderer dir_mode angegeben" -#: src/mount_davfs.c:721 +#: src/mount_davfs.c:719 #, c-format msgid "different file_mode in %s" msgstr "in %s ist ein anderer file_mode angegeben" -#: src/mount_davfs.c:749 +#: src/mount_davfs.c:747 #, 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:754 +#: src/mount_davfs.c:752 #, 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:756 +#: src/mount_davfs.c:754 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:764 +#: src/mount_davfs.c:762 #, c-format msgid "invalid mount point %s" msgstr "der Einhängepunkt %s ist nicht erlaubt" -#: src/mount_davfs.c:767 +#: src/mount_davfs.c:765 #, c-format msgid "mount point %s does not exist" msgstr "der Einhängepunkt %s existiert nicht" -#: src/mount_davfs.c:785 +#: src/mount_davfs.c:783 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -355,36 +355,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:813 +#: src/mount_davfs.c:811 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:831 +#: src/mount_davfs.c:829 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:851 +#: src/mount_davfs.c:849 #, 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:874 +#: src/mount_davfs.c:872 #, c-format msgid "can't mount %s on %s" msgstr "kann %s nicht auf %s einhängen" -#: src/mount_davfs.c:876 +#: src/mount_davfs.c:874 #, c-format msgid "kernel does not know file system %s" msgstr "der Kernel kenn das Dateisystem %s nicht" -#: src/mount_davfs.c:878 +#: src/mount_davfs.c:876 msgid "mount point is busy" msgstr "das Einhängepunkt wird anderweitig benutzt" -#: src/mount_davfs.c:940 src/umount_davfs.c:88 +#: src/mount_davfs.c:938 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -395,54 +395,54 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:956 src/umount_davfs.c:113 +#: src/mount_davfs.c:954 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:965 src/umount_davfs.c:119 +#: src/mount_davfs.c:963 src/umount_davfs.c:119 msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:978 src/umount_davfs.c:121 +#: src/mount_davfs.c:976 src/umount_davfs.c:121 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/mount_davfs.c:984 +#: src/mount_davfs.c:982 msgid "no mountpoint specified" msgstr "es wurde kein Einhängepunkt angegeben" -#: src/mount_davfs.c:989 +#: src/mount_davfs.c:987 msgid "no WebDAV-server specified" msgstr "es wurde kein WebDAV-Server angegeben" -#: src/mount_davfs.c:992 +#: src/mount_davfs.c:990 msgid "invalid URL" msgstr "die URL ist ungültig" -#: src/mount_davfs.c:1011 +#: src/mount_davfs.c:1009 msgid "can't determine home directory" msgstr "kann das Home-Verzeichnis nicht ermitteln" -#: src/mount_davfs.c:1089 src/webdav.c:387 +#: src/mount_davfs.c:1087 src/webdav.c:387 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:1094 +#: src/mount_davfs.c:1092 #, 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:1100 +#: src/mount_davfs.c:1098 #, 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:1143 +#: src/mount_davfs.c:1141 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -451,11 +451,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:1145 src/mount_davfs.c:1161 +#: src/mount_davfs.c:1143 src/mount_davfs.c:1159 msgid "Username:" msgstr "Benutzername:" -#: src/mount_davfs.c:1149 +#: src/mount_davfs.c:1147 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -464,11 +464,11 @@ 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:1151 src/mount_davfs.c:1167 src/webdav.c:394 +#: src/mount_davfs.c:1149 src/mount_davfs.c:1165 src/webdav.c:394 msgid "Password: " msgstr "Passwort:" -#: src/mount_davfs.c:1159 +#: src/mount_davfs.c:1157 #, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -477,7 +477,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:1165 +#: src/mount_davfs.c:1163 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -486,12 +486,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:1214 +#: src/mount_davfs.c:1212 #, c-format msgid "pid %i, got signal %i" msgstr "PID %i, erhielt Signal %i" -#: src/mount_davfs.c:1246 +#: src/mount_davfs.c:1244 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -499,63 +499,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:1263 +#: src/mount_davfs.c:1261 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:1289 +#: src/mount_davfs.c:1287 #, 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:1292 +#: src/mount_davfs.c:1290 #, 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:1295 +#: src/mount_davfs.c:1293 #, 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:1555 +#: src/mount_davfs.c:1553 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1646 +#: src/mount_davfs.c:1644 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2100 src/mount_davfs.c:2321 src/mount_davfs.c:2333 +#: src/mount_davfs.c:2098 src/mount_davfs.c:2319 src/mount_davfs.c:2331 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: src/mount_davfs.c:2121 src/mount_davfs.c:2161 src/mount_davfs.c:2248 -#: src/mount_davfs.c:2349 src/mount_davfs.c:2414 +#: src/mount_davfs.c:2119 src/mount_davfs.c:2159 src/mount_davfs.c:2246 +#: src/mount_davfs.c:2347 src/mount_davfs.c:2412 msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2229 src/mount_davfs.c:2242 +#: src/mount_davfs.c:2227 src/mount_davfs.c:2240 msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2325 +#: src/mount_davfs.c:2323 #, c-format msgid "file %s has wrong owner" msgstr "die Datei %s hat den falschen Besitzer" -#: src/mount_davfs.c:2328 +#: src/mount_davfs.c:2326 #, c-format msgid "file %s has wrong permissions" msgstr "die Dateirechte für %s sind falsch" -#: src/mount_davfs.c:2552 +#: src/mount_davfs.c:2550 #, c-format msgid "" "Usage:\n" @@ -568,7 +568,7 @@ msgstr "" " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2556 +#: src/mount_davfs.c:2554 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -577,7 +577,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:2558 +#: src/mount_davfs.c:2556 #, c-format msgid "" " mount : or\n" @@ -588,7 +588,7 @@ msgstr "" " mount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab ein.\n" -#: src/mount_davfs.c:2561 +#: src/mount_davfs.c:2559 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -605,7 +605,7 @@ msgstr "" " Kommas unterteilte Liste von Optionen.\n" "\n" -#: src/mount_davfs.c:2566 +#: src/mount_davfs.c:2564 #, c-format msgid "" "Recognised options:\n" @@ -622,7 +622,7 @@ msgstr "" " file_mode= : Standard-Rechte für Dateien (oktal)\n" " dir_mode= : Standard-Rechte für Verzeichnisse (oktal)\n" -#: src/mount_davfs.c:2572 +#: src/mount_davfs.c:2570 #, c-format msgid "" " ro : mount read-only\n" diff --git a/src/cache.c b/src/cache.c index 0ed7743..ec8005b 100644 --- a/src/cache.c +++ b/src/cache.c @@ -810,6 +810,36 @@ dav_close(dav_node *node, int fd, int flags, pid_t pid, pid_t pgid) set_upload_time(node); } + if (delay_upload == 0 && (is_dirty(node) || is_created(node)) + && !is_open_write(node) && !is_backup(node)) { + int set_execute = -1; + if (is_created(node) && node->mode & (S_IXUSR | S_IXGRP | S_IXOTH)) + set_execute = 1; + int ret = dav_put(node->path, node->cache_path, &node->remote_exists, + &node->lock_expire, &node->etag, &node->smtime, + &node->mime_type, set_execute); + if (!ret) { + node->utime = time(NULL); + node->dirty = 0; + if (dav_unlock(node->path, &node->lock_expire) == 0) + remove_from_changed(node); + } else { + if (debug) { + syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "close: neon error"); + syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), " %s", + dav_get_webdav_error()); + } + if (ret == EACCES || ret == EINVAL || ret == ENOENT + || ret == EPERM || ret == ENOSPC || ret == EEXIST) { + dav_unlock(node->path, &node->lock_expire); + delete_cache_file(node->parent); + node->parent->utime = 0; + remove_node(node); + *flush = 1; + } + } + } + return 0; }