From d8544209c10d6ac0ff01fcbffde9de73d50e9222 Mon Sep 17 00:00:00 2001 From: wbaumann Date: Fri, 23 Oct 2009 20:12:47 +0000 Subject: [PATCH] create log message in case of supposed server bug --- ChangeLog | 1 + TODO | 6 +- configure.ac | 2 +- po/cs.po | 218 +++++++++++++++++++++++------------------------ po/davfs2.pot | 230 +++++++++++++++++++++++++------------------------- po/de.po | 218 +++++++++++++++++++++++------------------------ 6 files changed, 340 insertions(+), 335 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17218c7..bfc8ec0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ ChangeLog for davfs2 * mount_davfs.c, webdav.c: Don't ask the user for unverified certificates if "askauth 0". + * Released version 1.4.3 2009-10-18 Werner Baumann (werner.baumann@onlinehome.de) * mount_davfs.c: diff --git a/TODO b/TODO index 8c354d6..92be239 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -davfs2 TODO 2009-10-18 +davfs2 TODO 2009-10-23 ---------------------- - write a GNU-style manual @@ -26,3 +26,7 @@ davfs2 TODO 2009-10-18 - revisit precedence rules for options (e.g. username) +- create log message in case of errors that seem to be caused + by broken server implementations (see Debian bug #551782 - davfs2: + improve the output in case of a server with a broken LOCK) + diff --git a/configure.ac b/configure.ac index 861ab35..1b67db9 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_PREREQ(2.59) -AC_INIT(davfs2, 1.4.2, http://savannah.nongnu.org/projects/davfs2) +AC_INIT(davfs2, 1.4.3, http://savannah.nongnu.org/projects/davfs2) AC_CONFIG_SRCDIR([src/cache.c]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE diff --git a/po/cs.po b/po/cs.po index 412453b..f96bd6f 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-10-18 10:59+0200\n" +"POT-Creation-Date: 2009-10-18 18:17+0200\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -71,10 +71,10 @@ msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2771 src/mount_davfs.c:594 src/mount_davfs.c:596 -#: src/mount_davfs.c:782 src/mount_davfs.c:784 src/mount_davfs.c:790 -#: src/mount_davfs.c:830 src/mount_davfs.c:832 src/mount_davfs.c:849 -#: src/mount_davfs.c:851 src/mount_davfs.c:1722 src/mount_davfs.c:1724 +#: src/cache.c:2771 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 +#: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 +#: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" @@ -169,7 +169,7 @@ msgstr "nemohu připojit jaderný souborový systém fuse" msgid "program is not setuid root" msgstr "program není spuštěn jako setuid root" -#: src/mount_davfs.c:245 src/mount_davfs.c:446 src/mount_davfs.c:450 +#: src/mount_davfs.c:245 src/mount_davfs.c:447 src/mount_davfs.c:451 msgid "can't change effective user id" msgstr "nemohu změnit identifikátor efektivního uživatele" @@ -185,71 +185,71 @@ msgstr "nemohu uvolnit oprávnění uživatele root" msgid "failed to release tty properly" msgstr "" -#: src/mount_davfs.c:365 +#: src/mount_davfs.c:366 #, c-format msgid "can't write pid file %s" msgstr "nemohu zapsat pid souboru %s" -#: src/mount_davfs.c:383 +#: src/mount_davfs.c:384 #, c-format msgid "unmounting %s" msgstr "odpojuji %s" -#: src/mount_davfs.c:385 +#: src/mount_davfs.c:386 msgid "unmounting failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 -#: src/mount_davfs.c:854 +#: src/mount_davfs.c:435 src/mount_davfs.c:498 src/mount_davfs.c:581 +#: src/mount_davfs.c:855 #, c-format msgid "group %s does not exist" msgstr "skupina %s neexistuje" -#: src/mount_davfs.c:438 +#: src/mount_davfs.c:439 msgid "can't change group id" msgstr "nemohu změnit id skupiny" -#: src/mount_davfs.c:443 +#: src/mount_davfs.c:444 #, c-format msgid "user %s does not exist" msgstr "uživatel %s neexistuje" -#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 +#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601 #, c-format msgid "can't create directory %s" msgstr "nemohu vytvořit adresář %s" -#: src/mount_davfs.c:487 src/mount_davfs.c:569 src/mount_davfs.c:604 -#: src/mount_davfs.c:609 src/mount_davfs.c:618 +#: src/mount_davfs.c:488 src/mount_davfs.c:570 src/mount_davfs.c:605 +#: src/mount_davfs.c:610 src/mount_davfs.c:619 #, c-format msgid "can't access directory %s" msgstr "nemohu přistupovat k adresáři %s" -#: src/mount_davfs.c:493 src/mount_davfs.c:575 +#: src/mount_davfs.c:494 src/mount_davfs.c:576 #, 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:502 src/mount_davfs.c:585 +#: src/mount_davfs.c:503 src/mount_davfs.c:586 #, c-format msgid "can't change group of directory %s" msgstr "nemohu změnit skupinu adresáře %s" -#: src/mount_davfs.c:613 src/mount_davfs.c:835 +#: src/mount_davfs.c:614 src/mount_davfs.c:836 msgid "can't read group data base" msgstr "nemohu přečíst údaje o skupinách" -#: src/mount_davfs.c:636 +#: src/mount_davfs.c:637 #, c-format msgid "can't open file %s" msgstr "nemohu otevřít soubor %s" -#: src/mount_davfs.c:641 +#: src/mount_davfs.c:642 #, c-format msgid "%s is already mounted on %s" msgstr "%s už je připojeno jako %s" -#: src/mount_davfs.c:664 +#: src/mount_davfs.c:665 #, c-format msgid "" "found PID file %s.\n" @@ -260,96 +260,96 @@ msgstr "" "Buď %s používá jiný proces, nebo\n" "jiné připojení skončilo neobvykle" -#: src/mount_davfs.c:685 +#: src/mount_davfs.c:686 #, c-format msgid "no entry for %s found in %s" msgstr "pro %s nebyla v %s nalezena žádná položka" -#: src/mount_davfs.c:691 +#: src/mount_davfs.c:692 #, c-format msgid "different URL in %s" msgstr "v %s je jiné URL" -#: src/mount_davfs.c:699 +#: src/mount_davfs.c:700 #, c-format msgid "different file system type in %s" msgstr "v %s je jiný souborový systém" -#: src/mount_davfs.c:704 +#: src/mount_davfs.c:705 #, c-format msgid "different config file in %s" msgstr "v %s je jiný konfigurační soubor" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:711 #, fuzzy, c-format msgid "different username in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:715 #, fuzzy, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "volba 'user' není v %s nastavena" -#: src/mount_davfs.c:717 +#: src/mount_davfs.c:718 #, fuzzy, c-format msgid "different option `user' in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:720 #, fuzzy, c-format msgid "different option `users' in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:722 +#: src/mount_davfs.c:723 #, c-format msgid "different mount options in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:725 +#: src/mount_davfs.c:726 #, c-format msgid "different uid in %s" msgstr "v %s je odlišné uid" -#: src/mount_davfs.c:727 +#: src/mount_davfs.c:728 #, c-format msgid "different gid in %s" msgstr "v %s je odlišné gid" -#: src/mount_davfs.c:729 +#: src/mount_davfs.c:730 #, c-format msgid "different dir_mode in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:731 +#: src/mount_davfs.c:732 #, c-format msgid "different file_mode in %s" msgstr "v %s je odlišný file_mode" -#: src/mount_davfs.c:759 +#: src/mount_davfs.c:760 #, 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:764 +#: src/mount_davfs.c:765 #, c-format msgid "can't get home directory for uid %i" msgstr "nemohu zjistit domovský adresář pro uid %i" -#: src/mount_davfs.c:766 +#: src/mount_davfs.c:767 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:774 +#: src/mount_davfs.c:775 #, c-format msgid "invalid mount point %s" msgstr "neplatný přípojný bod %s" -#: src/mount_davfs.c:777 +#: src/mount_davfs.c:778 #, c-format msgid "mount point %s does not exist" msgstr "přípojný bod %s neexistuje" -#: src/mount_davfs.c:795 +#: src/mount_davfs.c:796 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -358,34 +358,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:823 +#: src/mount_davfs.c:824 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:841 +#: src/mount_davfs.c:842 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:861 +#: src/mount_davfs.c:862 #, 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:884 +#: src/mount_davfs.c:885 #, c-format msgid "can't mount %s on %s" msgstr "není možno připojit %s do %s" -#: src/mount_davfs.c:886 +#: src/mount_davfs.c:887 #, c-format msgid "kernel does not know file system %s" msgstr "kernel nezná souborový systém %s" -#: src/mount_davfs.c:888 +#: src/mount_davfs.c:889 msgid "mount point is busy" msgstr "přípojný bod je zaneprázdněn" -#: src/mount_davfs.c:950 src/umount_davfs.c:88 +#: src/mount_davfs.c:951 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -396,50 +396,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:966 src/umount_davfs.c:113 +#: src/mount_davfs.c:967 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:975 src/umount_davfs.c:119 +#: src/mount_davfs.c:976 src/umount_davfs.c:119 msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:988 src/umount_davfs.c:121 +#: src/mount_davfs.c:989 src/umount_davfs.c:121 msgid "too many arguments" msgstr "příliš mnoho argumentů" -#: src/mount_davfs.c:994 +#: src/mount_davfs.c:995 msgid "no mountpoint specified" msgstr "nebyl zadán žádný přípojný bod" -#: src/mount_davfs.c:999 +#: src/mount_davfs.c:1000 msgid "no WebDAV-server specified" msgstr "nebyl zadán žádný WebDAV server" -#: src/mount_davfs.c:1002 +#: src/mount_davfs.c:1003 msgid "invalid URL" msgstr "neplatné URL" -#: src/mount_davfs.c:1021 +#: src/mount_davfs.c:1022 msgid "can't determine home directory" msgstr "nelze určit domovský adresář" -#: src/mount_davfs.c:1099 src/webdav.c:415 +#: src/mount_davfs.c:1100 src/webdav.c:415 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:1104 +#: src/mount_davfs.c:1105 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:1110 +#: src/mount_davfs.c:1111 #, 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:1162 +#: src/mount_davfs.c:1161 src/mount_davfs.c:1174 src/mount_davfs.c:1176 +#: src/mount_davfs.c:1194 src/mount_davfs.c:1196 src/webdav.c:422 +msgid "Password: " +msgstr "Heslo: " + +#: src/mount_davfs.c:1165 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -449,11 +454,11 @@ msgstr "" "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1164 src/mount_davfs.c:1184 +#: src/mount_davfs.c:1167 src/mount_davfs.c:1187 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1168 +#: src/mount_davfs.c:1171 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -462,12 +467,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:1171 src/mount_davfs.c:1173 src/mount_davfs.c:1191 -#: src/mount_davfs.c:1193 src/webdav.c:422 -msgid "Password: " -msgstr "Heslo: " - -#: src/mount_davfs.c:1182 +#: src/mount_davfs.c:1185 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -477,7 +477,7 @@ msgstr "" "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1188 +#: src/mount_davfs.c:1191 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -486,12 +486,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:1243 +#: src/mount_davfs.c:1246 #, c-format msgid "pid %i, got signal %i" msgstr "pid %i dostal signál %i" -#: src/mount_davfs.c:1275 +#: src/mount_davfs.c:1278 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -499,62 +499,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:1292 +#: src/mount_davfs.c:1295 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:1318 +#: src/mount_davfs.c:1321 #, 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:1321 +#: src/mount_davfs.c:1324 #, 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:1324 +#: src/mount_davfs.c:1327 #, 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:1588 +#: src/mount_davfs.c:1591 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1684 +#: src/mount_davfs.c:1687 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2140 src/mount_davfs.c:2363 src/mount_davfs.c:2375 +#: src/mount_davfs.c:2143 src/mount_davfs.c:2366 src/mount_davfs.c:2378 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:2161 src/mount_davfs.c:2201 src/mount_davfs.c:2290 -#: src/mount_davfs.c:2391 src/mount_davfs.c:2459 +#: src/mount_davfs.c:2164 src/mount_davfs.c:2204 src/mount_davfs.c:2293 +#: src/mount_davfs.c:2394 src/mount_davfs.c:2462 msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2271 src/mount_davfs.c:2284 +#: src/mount_davfs.c:2274 src/mount_davfs.c:2287 msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2367 +#: src/mount_davfs.c:2370 #, c-format msgid "file %s has wrong owner" msgstr "soubor %s má chybného vlastníka" -#: src/mount_davfs.c:2370 +#: src/mount_davfs.c:2373 #, c-format msgid "file %s has wrong permissions" msgstr "soubor %s má chybná oprávnění" -#: src/mount_davfs.c:2597 +#: src/mount_davfs.c:2600 #, c-format msgid "" "Usage:\n" @@ -567,7 +567,7 @@ msgstr "" " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2601 +#: src/mount_davfs.c:2604 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -576,7 +576,7 @@ msgstr "" "Pro připojení zdroje WebDAV nevolejte přímo %s, ale\n" "použijte místo toho `mount'.\n" -#: src/mount_davfs.c:2603 +#: src/mount_davfs.c:2606 #, c-format msgid "" " mount : or\n" @@ -587,7 +587,7 @@ msgstr "" " mount : připojí zdroj WebDAV tak, jak je zadáno\n" " v /etc/fstab.\n" -#: src/mount_davfs.c:2606 +#: src/mount_davfs.c:2609 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -604,7 +604,7 @@ msgstr "" " označuje seznam voleb oddělených čárkou.\n" "\n" -#: src/mount_davfs.c:2611 +#: src/mount_davfs.c:2614 #, c-format msgid "" "Recognised options:\n" @@ -623,7 +623,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:2617 +#: src/mount_davfs.c:2620 #, c-format msgid "" " ro : mount read-only\n" @@ -754,73 +754,73 @@ msgstr "" msgid "can't decrypt client certificate %s" msgstr "nemohu dešifrovat klientský certifikát %s" -#: src/webdav.c:486 src/webdav.c:489 +#: src/webdav.c:488 src/webdav.c:491 msgid "mounting failed; the server does not support WebDAV" msgstr "připojení selhalo; server nepodporuje WebDAV" -#: src/webdav.c:497 +#: src/webdav.c:499 msgid "warning: the server does not support locks" msgstr "varování: server nepodporuje zámky" -#: src/webdav.c:1565 +#: src/webdav.c:1567 msgid "authentication failure:" msgstr "selhání autentizace:" -#: src/webdav.c:1603 +#: src/webdav.c:1605 #, c-format msgid "%i can't open cache file" msgstr "%i nemůže otevřít soubor vyrovnávací paměti" -#: src/webdav.c:1611 +#: src/webdav.c:1613 #, 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:1921 src/webdav.c:1924 +#: src/webdav.c:1923 src/webdav.c:1926 msgid "error processing server certificate" msgstr "chyba při zpracování certifikátu serveru" -#: src/webdav.c:1931 src/webdav.c:1967 +#: src/webdav.c:1933 src/webdav.c:1969 msgid "the server certificate is not yet valid" msgstr "certifikát serveru zatím není platný" -#: src/webdav.c:1933 src/webdav.c:1970 +#: src/webdav.c:1935 src/webdav.c:1972 msgid "the server certificate has expired" msgstr "platnost certifikátu serveru vypršela" -#: src/webdav.c:1935 src/webdav.c:1973 +#: src/webdav.c:1937 src/webdav.c:1975 msgid "the server certificate does not match the server name" msgstr "certifikát serveru nedopovídá jménu serveru" -#: src/webdav.c:1937 src/webdav.c:1976 +#: src/webdav.c:1939 src/webdav.c:1978 msgid "the server certificate is not trusted" msgstr "certifikát serveru je nedůvěryhodný" -#: src/webdav.c:1939 src/webdav.c:1979 +#: src/webdav.c:1941 src/webdav.c:1981 msgid "unknown certificate error" msgstr "neznámá chyba certifikátu" -#: src/webdav.c:1940 +#: src/webdav.c:1942 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1942 +#: src/webdav.c:1944 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1944 +#: src/webdav.c:1946 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1946 +#: src/webdav.c:1948 #, c-format msgid " fingerprint: %s" msgstr " otisk: %s" -#: src/webdav.c:1949 +#: src/webdav.c:1951 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -831,27 +831,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:1952 +#: src/webdav.c:1954 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Přijmout certifikát pro toto sezení? [y,N] " -#: src/webdav.c:1980 +#: src/webdav.c:1982 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1981 +#: src/webdav.c:1983 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1982 +#: src/webdav.c:1984 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1985 +#: src/webdav.c:1987 msgid " accepted by user" msgstr " přijat uživatelem" diff --git a/po/davfs2.pot b/po/davfs2.pot index 0b9188a..c9c5f89 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-10-18 10:59+0200\n" +"POT-Creation-Date: 2009-10-18 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,10 +66,10 @@ msgstr "" msgid "error writing directory %s" msgstr "" -#: src/cache.c:2771 src/mount_davfs.c:594 src/mount_davfs.c:596 -#: src/mount_davfs.c:782 src/mount_davfs.c:784 src/mount_davfs.c:790 -#: src/mount_davfs.c:830 src/mount_davfs.c:832 src/mount_davfs.c:849 -#: src/mount_davfs.c:851 src/mount_davfs.c:1722 src/mount_davfs.c:1724 +#: src/cache.c:2771 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 +#: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 +#: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "" @@ -163,7 +163,7 @@ msgstr "" msgid "program is not setuid root" msgstr "" -#: src/mount_davfs.c:245 src/mount_davfs.c:446 src/mount_davfs.c:450 +#: src/mount_davfs.c:245 src/mount_davfs.c:447 src/mount_davfs.c:451 msgid "can't change effective user id" msgstr "" @@ -179,71 +179,71 @@ msgstr "" msgid "failed to release tty properly" msgstr "" -#: src/mount_davfs.c:365 +#: src/mount_davfs.c:366 #, c-format msgid "can't write pid file %s" msgstr "" -#: src/mount_davfs.c:383 +#: src/mount_davfs.c:384 #, c-format msgid "unmounting %s" msgstr "" -#: src/mount_davfs.c:385 +#: src/mount_davfs.c:386 msgid "unmounting failed" msgstr "" -#: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 -#: src/mount_davfs.c:854 +#: src/mount_davfs.c:435 src/mount_davfs.c:498 src/mount_davfs.c:581 +#: src/mount_davfs.c:855 #, c-format msgid "group %s does not exist" msgstr "" -#: src/mount_davfs.c:438 +#: src/mount_davfs.c:439 msgid "can't change group id" msgstr "" -#: src/mount_davfs.c:443 +#: src/mount_davfs.c:444 #, c-format msgid "user %s does not exist" msgstr "" -#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 +#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601 #, c-format msgid "can't create directory %s" msgstr "" -#: src/mount_davfs.c:487 src/mount_davfs.c:569 src/mount_davfs.c:604 -#: src/mount_davfs.c:609 src/mount_davfs.c:618 +#: src/mount_davfs.c:488 src/mount_davfs.c:570 src/mount_davfs.c:605 +#: src/mount_davfs.c:610 src/mount_davfs.c:619 #, c-format msgid "can't access directory %s" msgstr "" -#: src/mount_davfs.c:493 src/mount_davfs.c:575 +#: src/mount_davfs.c:494 src/mount_davfs.c:576 #, c-format msgid "can't change mode of directory %s" msgstr "" -#: src/mount_davfs.c:502 src/mount_davfs.c:585 +#: src/mount_davfs.c:503 src/mount_davfs.c:586 #, c-format msgid "can't change group of directory %s" msgstr "" -#: src/mount_davfs.c:613 src/mount_davfs.c:835 +#: src/mount_davfs.c:614 src/mount_davfs.c:836 msgid "can't read group data base" msgstr "" -#: src/mount_davfs.c:636 +#: src/mount_davfs.c:637 #, c-format msgid "can't open file %s" msgstr "" -#: src/mount_davfs.c:641 +#: src/mount_davfs.c:642 #, c-format msgid "%s is already mounted on %s" msgstr "" -#: src/mount_davfs.c:664 +#: src/mount_davfs.c:665 #, c-format msgid "" "found PID file %s.\n" @@ -251,282 +251,282 @@ msgid "" "or another mount process ended irregular" msgstr "" -#: src/mount_davfs.c:685 +#: src/mount_davfs.c:686 #, c-format msgid "no entry for %s found in %s" msgstr "" -#: src/mount_davfs.c:691 +#: src/mount_davfs.c:692 #, c-format msgid "different URL in %s" msgstr "" -#: src/mount_davfs.c:699 +#: src/mount_davfs.c:700 #, c-format msgid "different file system type in %s" msgstr "" -#: src/mount_davfs.c:704 +#: src/mount_davfs.c:705 #, c-format msgid "different config file in %s" msgstr "" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:711 #, c-format msgid "different username in %s" msgstr "" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:715 #, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "" -#: src/mount_davfs.c:717 +#: src/mount_davfs.c:718 #, c-format msgid "different option `user' in %s" msgstr "" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:720 #, c-format msgid "different option `users' in %s" msgstr "" -#: src/mount_davfs.c:722 +#: src/mount_davfs.c:723 #, c-format msgid "different mount options in %s" msgstr "" -#: src/mount_davfs.c:725 +#: src/mount_davfs.c:726 #, c-format msgid "different uid in %s" msgstr "" -#: src/mount_davfs.c:727 +#: src/mount_davfs.c:728 #, c-format msgid "different gid in %s" msgstr "" -#: src/mount_davfs.c:729 +#: src/mount_davfs.c:730 #, c-format msgid "different dir_mode in %s" msgstr "" -#: src/mount_davfs.c:731 +#: src/mount_davfs.c:732 #, c-format msgid "different file_mode in %s" msgstr "" -#: src/mount_davfs.c:759 +#: src/mount_davfs.c:760 #, c-format msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:764 +#: src/mount_davfs.c:765 #, c-format msgid "can't get home directory for uid %i" msgstr "" -#: src/mount_davfs.c:766 +#: src/mount_davfs.c:767 msgid "A relative mount point must lie within your home directory" msgstr "" -#: src/mount_davfs.c:774 +#: src/mount_davfs.c:775 #, c-format msgid "invalid mount point %s" msgstr "" -#: src/mount_davfs.c:777 +#: src/mount_davfs.c:778 #, c-format msgid "mount point %s does not exist" msgstr "" -#: src/mount_davfs.c:795 +#: src/mount_davfs.c:796 #, 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:823 +#: src/mount_davfs.c:824 msgid "you can't set file owner different from your uid" msgstr "" -#: src/mount_davfs.c:841 +#: src/mount_davfs.c:842 msgid "you must be member of the group of the file system" msgstr "" -#: src/mount_davfs.c:861 +#: src/mount_davfs.c:862 #, c-format msgid "user %s must be member of group %s" msgstr "" -#: src/mount_davfs.c:884 +#: src/mount_davfs.c:885 #, c-format msgid "can't mount %s on %s" msgstr "" -#: src/mount_davfs.c:886 +#: src/mount_davfs.c:887 #, c-format msgid "kernel does not know file system %s" msgstr "" -#: src/mount_davfs.c:888 +#: src/mount_davfs.c:889 msgid "mount point is busy" msgstr "" -#: src/mount_davfs.c:950 src/umount_davfs.c:88 +#: src/mount_davfs.c:951 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:966 src/umount_davfs.c:113 +#: src/mount_davfs.c:967 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:975 src/umount_davfs.c:119 +#: src/mount_davfs.c:976 src/umount_davfs.c:119 msgid "missing argument" msgstr "" -#: src/mount_davfs.c:988 src/umount_davfs.c:121 +#: src/mount_davfs.c:989 src/umount_davfs.c:121 msgid "too many arguments" msgstr "" -#: src/mount_davfs.c:994 +#: src/mount_davfs.c:995 msgid "no mountpoint specified" msgstr "" -#: src/mount_davfs.c:999 +#: src/mount_davfs.c:1000 msgid "no WebDAV-server specified" msgstr "" -#: src/mount_davfs.c:1002 +#: src/mount_davfs.c:1003 msgid "invalid URL" msgstr "" -#: src/mount_davfs.c:1021 +#: src/mount_davfs.c:1022 msgid "can't determine home directory" msgstr "" -#: src/mount_davfs.c:1099 src/webdav.c:415 +#: src/mount_davfs.c:1100 src/webdav.c:415 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:1104 +#: src/mount_davfs.c:1105 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:1110 +#: src/mount_davfs.c:1111 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:1162 +#: src/mount_davfs.c:1161 src/mount_davfs.c:1174 src/mount_davfs.c:1176 +#: src/mount_davfs.c:1194 src/mount_davfs.c:1196 src/webdav.c:422 +msgid "Password: " +msgstr "" + +#: src/mount_davfs.c:1165 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1164 src/mount_davfs.c:1184 +#: src/mount_davfs.c:1167 src/mount_davfs.c:1187 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1168 +#: src/mount_davfs.c:1171 #, 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:1171 src/mount_davfs.c:1173 src/mount_davfs.c:1191 -#: src/mount_davfs.c:1193 src/webdav.c:422 -msgid "Password: " -msgstr "" - -#: src/mount_davfs.c:1182 +#: src/mount_davfs.c:1185 #, c-format msgid "" "Please enter the username to authenticate with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1188 +#: src/mount_davfs.c:1191 #, 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:1243 +#: src/mount_davfs.c:1246 #, c-format msgid "pid %i, got signal %i" msgstr "" -#: src/mount_davfs.c:1275 +#: src/mount_davfs.c:1278 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." msgstr "" -#: src/mount_davfs.c:1292 +#: src/mount_davfs.c:1295 msgid "" "Warning: can't write entry into mtab, but will mount the file system anyway" msgstr "" -#: src/mount_davfs.c:1318 +#: src/mount_davfs.c:1321 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "" -#: src/mount_davfs.c:1321 +#: src/mount_davfs.c:1324 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "" -#: src/mount_davfs.c:1324 +#: src/mount_davfs.c:1327 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "" -#: src/mount_davfs.c:1588 +#: src/mount_davfs.c:1591 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1684 +#: src/mount_davfs.c:1687 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2140 src/mount_davfs.c:2363 src/mount_davfs.c:2375 +#: src/mount_davfs.c:2143 src/mount_davfs.c:2366 src/mount_davfs.c:2378 #, c-format msgid "opening %s failed" msgstr "" -#: src/mount_davfs.c:2161 src/mount_davfs.c:2201 src/mount_davfs.c:2290 -#: src/mount_davfs.c:2391 src/mount_davfs.c:2459 +#: src/mount_davfs.c:2164 src/mount_davfs.c:2204 src/mount_davfs.c:2293 +#: src/mount_davfs.c:2394 src/mount_davfs.c:2462 msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2271 src/mount_davfs.c:2284 +#: src/mount_davfs.c:2274 src/mount_davfs.c:2287 msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2367 -#, c-format -msgid "file %s has wrong owner" -msgstr "" - #: src/mount_davfs.c:2370 #, c-format +msgid "file %s has wrong owner" +msgstr "" + +#: src/mount_davfs.c:2373 +#, c-format msgid "file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2597 +#: src/mount_davfs.c:2600 #, c-format msgid "" "Usage:\n" @@ -535,14 +535,14 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2601 +#: src/mount_davfs.c:2604 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2603 +#: src/mount_davfs.c:2606 #, c-format msgid "" " mount : or\n" @@ -550,7 +550,7 @@ msgid "" " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2606 +#: src/mount_davfs.c:2609 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -561,7 +561,7 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2611 +#: src/mount_davfs.c:2614 #, c-format msgid "" "Recognised options:\n" @@ -572,7 +572,7 @@ msgid "" " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2617 +#: src/mount_davfs.c:2620 #, c-format msgid "" " ro : mount read-only\n" @@ -675,73 +675,73 @@ msgstr "" msgid "can't decrypt client certificate %s" msgstr "" -#: src/webdav.c:486 src/webdav.c:489 +#: src/webdav.c:488 src/webdav.c:491 msgid "mounting failed; the server does not support WebDAV" msgstr "" -#: src/webdav.c:497 +#: src/webdav.c:499 msgid "warning: the server does not support locks" msgstr "" -#: src/webdav.c:1565 +#: src/webdav.c:1567 msgid "authentication failure:" msgstr "" -#: src/webdav.c:1603 +#: src/webdav.c:1605 #, c-format msgid "%i can't open cache file" msgstr "" -#: src/webdav.c:1611 +#: src/webdav.c:1613 #, c-format msgid "%i error writing to cache file" msgstr "" -#: src/webdav.c:1921 src/webdav.c:1924 +#: src/webdav.c:1923 src/webdav.c:1926 msgid "error processing server certificate" msgstr "" -#: src/webdav.c:1931 src/webdav.c:1967 +#: src/webdav.c:1933 src/webdav.c:1969 msgid "the server certificate is not yet valid" msgstr "" -#: src/webdav.c:1933 src/webdav.c:1970 +#: src/webdav.c:1935 src/webdav.c:1972 msgid "the server certificate has expired" msgstr "" -#: src/webdav.c:1935 src/webdav.c:1973 +#: src/webdav.c:1937 src/webdav.c:1975 msgid "the server certificate does not match the server name" msgstr "" -#: src/webdav.c:1937 src/webdav.c:1976 +#: src/webdav.c:1939 src/webdav.c:1978 msgid "the server certificate is not trusted" msgstr "" -#: src/webdav.c:1939 src/webdav.c:1979 +#: src/webdav.c:1941 src/webdav.c:1981 msgid "unknown certificate error" msgstr "" -#: src/webdav.c:1940 -#, c-format -msgid " issuer: %s" -msgstr "" - #: src/webdav.c:1942 #, c-format -msgid " subject: %s" +msgid " issuer: %s" msgstr "" #: src/webdav.c:1944 #, c-format -msgid " identity: %s" +msgid " subject: %s" msgstr "" #: src/webdav.c:1946 #, c-format +msgid " identity: %s" +msgstr "" + +#: src/webdav.c:1948 +#, c-format msgid " fingerprint: %s" msgstr "" -#: src/webdav.c:1949 +#: src/webdav.c:1951 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -749,26 +749,26 @@ msgid "" "or there might be a man-in-the-middle-attack.\n" msgstr "" -#: src/webdav.c:1952 +#: src/webdav.c:1954 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "" -#: src/webdav.c:1980 +#: src/webdav.c:1982 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1981 +#: src/webdav.c:1983 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1982 +#: src/webdav.c:1984 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1985 +#: src/webdav.c:1987 msgid " accepted by user" msgstr "" diff --git a/po/de.po b/po/de.po index 577ec36..89fd630 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-10-18 10:59+0200\n" +"POT-Creation-Date: 2009-10-18 18:17+0200\n" "PO-Revision-Date: 2009-01-02 12:26+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -71,10 +71,10 @@ msgstr "kann die Cachedatei %s nicht erzeugen" msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2771 src/mount_davfs.c:594 src/mount_davfs.c:596 -#: src/mount_davfs.c:782 src/mount_davfs.c:784 src/mount_davfs.c:790 -#: src/mount_davfs.c:830 src/mount_davfs.c:832 src/mount_davfs.c:849 -#: src/mount_davfs.c:851 src/mount_davfs.c:1722 src/mount_davfs.c:1724 +#: src/cache.c:2771 src/mount_davfs.c:595 src/mount_davfs.c:597 +#: src/mount_davfs.c:783 src/mount_davfs.c:785 src/mount_davfs.c:791 +#: src/mount_davfs.c:831 src/mount_davfs.c:833 src/mount_davfs.c:850 +#: src/mount_davfs.c:852 src/mount_davfs.c:1725 src/mount_davfs.c:1727 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" @@ -171,7 +171,7 @@ msgstr "" msgid "program is not setuid root" msgstr "die Programmdatei hat das setuid-Bit nicht gesetzt" -#: src/mount_davfs.c:245 src/mount_davfs.c:446 src/mount_davfs.c:450 +#: src/mount_davfs.c:245 src/mount_davfs.c:447 src/mount_davfs.c:451 msgid "can't change effective user id" msgstr "kann die effektive Benutzer-ID nicht ändern" @@ -187,71 +187,71 @@ msgstr "ich werde die root-Rechte nicht los" msgid "failed to release tty properly" msgstr "kann das Terminal nicht freigeben" -#: src/mount_davfs.c:365 +#: src/mount_davfs.c:366 #, c-format msgid "can't write pid file %s" msgstr "kann die PID-Datei %s nicht schreiben" -#: src/mount_davfs.c:383 +#: src/mount_davfs.c:384 #, c-format msgid "unmounting %s" msgstr "hänge %s aus" -#: src/mount_davfs.c:385 +#: src/mount_davfs.c:386 msgid "unmounting failed" msgstr "das Aushängen schlug fehl" -#: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 -#: src/mount_davfs.c:854 +#: src/mount_davfs.c:435 src/mount_davfs.c:498 src/mount_davfs.c:581 +#: src/mount_davfs.c:855 #, c-format msgid "group %s does not exist" msgstr "die Gruppe %s existiert nicht" -#: src/mount_davfs.c:438 +#: src/mount_davfs.c:439 msgid "can't change group id" msgstr "kann die Gruppenkennung nicht ändern" -#: src/mount_davfs.c:443 +#: src/mount_davfs.c:444 #, c-format msgid "user %s does not exist" msgstr "der Benutzer %s existiert nicht" -#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 +#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601 #, c-format msgid "can't create directory %s" msgstr "kann das Verzeichnis %s nicht erzeugen" -#: src/mount_davfs.c:487 src/mount_davfs.c:569 src/mount_davfs.c:604 -#: src/mount_davfs.c:609 src/mount_davfs.c:618 +#: src/mount_davfs.c:488 src/mount_davfs.c:570 src/mount_davfs.c:605 +#: src/mount_davfs.c:610 src/mount_davfs.c:619 #, c-format msgid "can't access directory %s" msgstr "Zugriff auf das Verzeichnis %s verweigert" -#: src/mount_davfs.c:493 src/mount_davfs.c:575 +#: src/mount_davfs.c:494 src/mount_davfs.c:576 #, c-format msgid "can't change mode of directory %s" msgstr "kann die Rechte des Verzeichnisses %s nicht ändern" -#: src/mount_davfs.c:502 src/mount_davfs.c:585 +#: src/mount_davfs.c:503 src/mount_davfs.c:586 #, c-format msgid "can't change group of directory %s" msgstr "kann die Gruppenkennung des Verneichnisses %s nicht ändern" -#: src/mount_davfs.c:613 src/mount_davfs.c:835 +#: src/mount_davfs.c:614 src/mount_davfs.c:836 msgid "can't read group data base" msgstr "kann die Gruppendatenbank nicht lesen" -#: src/mount_davfs.c:636 +#: src/mount_davfs.c:637 #, c-format msgid "can't open file %s" msgstr "kann die Datei %s nicht öffnen" -#: src/mount_davfs.c:641 +#: src/mount_davfs.c:642 #, c-format msgid "%s is already mounted on %s" msgstr "%s ist bereits auf %s eingehängt" -#: src/mount_davfs.c:664 +#: src/mount_davfs.c:665 #, c-format msgid "" "found PID file %s.\n" @@ -262,96 +262,96 @@ msgstr "" "Möglicherweise wird %s von einem anderen Prozess benutzt,\n" "oder ein anderer Mount-Prozess endete irregulär" -#: src/mount_davfs.c:685 +#: src/mount_davfs.c:686 #, c-format msgid "no entry for %s found in %s" msgstr "für %s ist kein Eintrag in %s" -#: src/mount_davfs.c:691 +#: src/mount_davfs.c:692 #, c-format msgid "different URL in %s" msgstr "in %s ist eine andere URL angegeben" -#: src/mount_davfs.c:699 +#: src/mount_davfs.c:700 #, c-format msgid "different file system type in %s" msgstr "in %s ist ein anderer Dateisystemtyp angegeben" -#: src/mount_davfs.c:704 +#: src/mount_davfs.c:705 #, c-format msgid "different config file in %s" msgstr "in %s ist eine andere Konfigurationsdatei angegeben" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:711 #, fuzzy, c-format msgid "different username in %s" msgstr "in %s ist ein anderer dir_mode angegeben" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:715 #, 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:717 +#: src/mount_davfs.c:718 #, c-format msgid "different option `user' in %s" msgstr "in %s ist die Option „user” anders gesetzt" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:720 #, c-format msgid "different option `users' in %s" msgstr "in %s ist die Option „users” anders gesetzt" -#: src/mount_davfs.c:722 +#: src/mount_davfs.c:723 #, c-format msgid "different mount options in %s" msgstr "in %s sind andere Mount-Optionen angegeben" -#: src/mount_davfs.c:725 +#: src/mount_davfs.c:726 #, c-format msgid "different uid in %s" msgstr "in %s ist eine andere uid angegeben" -#: src/mount_davfs.c:727 +#: src/mount_davfs.c:728 #, c-format msgid "different gid in %s" msgstr "in %s ist eine andere gid angegeben" -#: src/mount_davfs.c:729 +#: src/mount_davfs.c:730 #, c-format msgid "different dir_mode in %s" msgstr "in %s ist ein anderer dir_mode angegeben" -#: src/mount_davfs.c:731 +#: src/mount_davfs.c:732 #, c-format msgid "different file_mode in %s" msgstr "in %s ist ein anderer file_mode angegeben" -#: src/mount_davfs.c:759 +#: src/mount_davfs.c:760 #, 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:764 +#: src/mount_davfs.c:765 #, 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:766 +#: src/mount_davfs.c:767 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:774 +#: src/mount_davfs.c:775 #, c-format msgid "invalid mount point %s" msgstr "der Einhängepunkt %s ist nicht erlaubt" -#: src/mount_davfs.c:777 +#: src/mount_davfs.c:778 #, c-format msgid "mount point %s does not exist" msgstr "der Einhängepunkt %s existiert nicht" -#: src/mount_davfs.c:795 +#: src/mount_davfs.c:796 #, 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:823 +#: src/mount_davfs.c:824 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:841 +#: src/mount_davfs.c:842 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:861 +#: src/mount_davfs.c:862 #, 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:884 +#: src/mount_davfs.c:885 #, c-format msgid "can't mount %s on %s" msgstr "kann %s nicht auf %s einhängen" -#: src/mount_davfs.c:886 +#: src/mount_davfs.c:887 #, c-format msgid "kernel does not know file system %s" msgstr "der Kernel kenn das Dateisystem %s nicht" -#: src/mount_davfs.c:888 +#: src/mount_davfs.c:889 msgid "mount point is busy" msgstr "das Einhängepunkt wird anderweitig benutzt" -#: src/mount_davfs.c:950 src/umount_davfs.c:88 +#: src/mount_davfs.c:951 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -400,54 +400,59 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:966 src/umount_davfs.c:113 +#: src/mount_davfs.c:967 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:975 src/umount_davfs.c:119 +#: src/mount_davfs.c:976 src/umount_davfs.c:119 msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:988 src/umount_davfs.c:121 +#: src/mount_davfs.c:989 src/umount_davfs.c:121 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/mount_davfs.c:994 +#: src/mount_davfs.c:995 msgid "no mountpoint specified" msgstr "es wurde kein Einhängepunkt angegeben" -#: src/mount_davfs.c:999 +#: src/mount_davfs.c:1000 msgid "no WebDAV-server specified" msgstr "es wurde kein WebDAV-Server angegeben" -#: src/mount_davfs.c:1002 +#: src/mount_davfs.c:1003 msgid "invalid URL" msgstr "die URL ist ungültig" -#: src/mount_davfs.c:1021 +#: src/mount_davfs.c:1022 msgid "can't determine home directory" msgstr "kann das Home-Verzeichnis nicht ermitteln" -#: src/mount_davfs.c:1099 src/webdav.c:415 +#: src/mount_davfs.c:1100 src/webdav.c:415 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:1104 +#: src/mount_davfs.c:1105 #, 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:1110 +#: src/mount_davfs.c:1111 #, 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:1162 +#: src/mount_davfs.c:1161 src/mount_davfs.c:1174 src/mount_davfs.c:1176 +#: src/mount_davfs.c:1194 src/mount_davfs.c:1196 src/webdav.c:422 +msgid "Password: " +msgstr "Passwort:" + +#: src/mount_davfs.c:1165 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -456,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:1164 src/mount_davfs.c:1184 +#: src/mount_davfs.c:1167 src/mount_davfs.c:1187 msgid "Username:" msgstr "Benutzername:" -#: src/mount_davfs.c:1168 +#: src/mount_davfs.c:1171 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -469,12 +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:1171 src/mount_davfs.c:1173 src/mount_davfs.c:1191 -#: src/mount_davfs.c:1193 src/webdav.c:422 -msgid "Password: " -msgstr "Passwort:" - -#: src/mount_davfs.c:1182 +#: src/mount_davfs.c:1185 #, 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:1188 +#: src/mount_davfs.c:1191 #, 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:1243 +#: src/mount_davfs.c:1246 #, c-format msgid "pid %i, got signal %i" msgstr "PID %i, erhielt Signal %i" -#: src/mount_davfs.c:1275 +#: src/mount_davfs.c:1278 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:1292 +#: src/mount_davfs.c:1295 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:1318 +#: src/mount_davfs.c:1321 #, 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:1321 +#: src/mount_davfs.c:1324 #, 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:1324 +#: src/mount_davfs.c:1327 #, 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:1588 +#: src/mount_davfs.c:1591 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1684 +#: src/mount_davfs.c:1687 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2140 src/mount_davfs.c:2363 src/mount_davfs.c:2375 +#: src/mount_davfs.c:2143 src/mount_davfs.c:2366 src/mount_davfs.c:2378 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: src/mount_davfs.c:2161 src/mount_davfs.c:2201 src/mount_davfs.c:2290 -#: src/mount_davfs.c:2391 src/mount_davfs.c:2459 +#: src/mount_davfs.c:2164 src/mount_davfs.c:2204 src/mount_davfs.c:2293 +#: src/mount_davfs.c:2394 src/mount_davfs.c:2462 msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2271 src/mount_davfs.c:2284 +#: src/mount_davfs.c:2274 src/mount_davfs.c:2287 msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2367 +#: src/mount_davfs.c:2370 #, c-format msgid "file %s has wrong owner" msgstr "die Datei %s hat den falschen Besitzer" -#: src/mount_davfs.c:2370 +#: src/mount_davfs.c:2373 #, c-format msgid "file %s has wrong permissions" msgstr "die Dateirechte für %s sind falsch" -#: src/mount_davfs.c:2597 +#: src/mount_davfs.c:2600 #, c-format msgid "" "Usage:\n" @@ -574,7 +574,7 @@ msgstr "" " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2601 +#: src/mount_davfs.c:2604 #, 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:2603 +#: src/mount_davfs.c:2606 #, 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:2606 +#: src/mount_davfs.c:2609 #, 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:2611 +#: src/mount_davfs.c:2614 #, 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:2617 +#: src/mount_davfs.c:2620 #, c-format msgid "" " ro : mount read-only\n" @@ -761,73 +761,73 @@ msgstr "" msgid "can't decrypt client certificate %s" msgstr "kann das Zertifikat %s nicht entschlüsseln" -#: src/webdav.c:486 src/webdav.c:489 +#: src/webdav.c:488 src/webdav.c:491 msgid "mounting failed; the server does not support WebDAV" msgstr "das Einhängen schlug fehl; der Server unterstützt WebDAV nicht" -#: src/webdav.c:497 +#: src/webdav.c:499 msgid "warning: the server does not support locks" msgstr "Warnung: der Server kann Dateien nicht sperren" -#: src/webdav.c:1565 +#: src/webdav.c:1567 msgid "authentication failure:" msgstr "Authentifizierungsfehler" -#: src/webdav.c:1603 +#: src/webdav.c:1605 #, c-format msgid "%i can't open cache file" msgstr "%i kann die Cache-Datei nicht öffnen" -#: src/webdav.c:1611 +#: src/webdav.c:1613 #, c-format msgid "%i error writing to cache file" msgstr "%i Fehler beim Schreiben der Cache-Datei" -#: src/webdav.c:1921 src/webdav.c:1924 +#: src/webdav.c:1923 src/webdav.c:1926 msgid "error processing server certificate" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1931 src/webdav.c:1967 +#: src/webdav.c:1933 src/webdav.c:1969 msgid "the server certificate is not yet valid" msgstr "das Server-Zertifikat ist noch nicht gültig" -#: src/webdav.c:1933 src/webdav.c:1970 +#: src/webdav.c:1935 src/webdav.c:1972 msgid "the server certificate has expired" msgstr "das Server-Zertifikat ist nicht mehr gültig" -#: src/webdav.c:1935 src/webdav.c:1973 +#: src/webdav.c:1937 src/webdav.c:1975 msgid "the server certificate does not match the server name" msgstr "das Server-Zertifikat passt nicht zum Namen des Servers" -#: src/webdav.c:1937 src/webdav.c:1976 +#: src/webdav.c:1939 src/webdav.c:1978 msgid "the server certificate is not trusted" msgstr "wir trauen dem Zertifikat nicht" -#: src/webdav.c:1939 src/webdav.c:1979 +#: src/webdav.c:1941 src/webdav.c:1981 msgid "unknown certificate error" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1940 +#: src/webdav.c:1942 #, c-format msgid " issuer: %s" msgstr " Aussteller: %s" -#: src/webdav.c:1942 +#: src/webdav.c:1944 #, c-format msgid " subject: %s" msgstr " Inhaber: %s" -#: src/webdav.c:1944 +#: src/webdav.c:1946 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1946 +#: src/webdav.c:1948 #, c-format msgid " fingerprint: %s" msgstr " Fingerabdruck: %s" -#: src/webdav.c:1949 +#: src/webdav.c:1951 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -838,26 +838,26 @@ 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:1952 +#: src/webdav.c:1954 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Ich akzeptiere das Zertifikat für diese Sitzung [j,N]: " -#: src/webdav.c:1980 +#: src/webdav.c:1982 #, c-format msgid " issuer: %s" msgstr " Aussteller des Zertifikats: %s" -#: src/webdav.c:1981 +#: src/webdav.c:1983 #, c-format msgid " subject: %s" msgstr " Inhaber des Zertifikats: %s" -#: src/webdav.c:1982 +#: src/webdav.c:1984 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1985 +#: src/webdav.c:1987 msgid " accepted by user" msgstr " durch den Benutzer akzeptiert"