diff --git a/ChangeLog b/ChangeLog index 0c6a46a..aacdcbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ ChangeLog for davfs2 2009-06-12 Werner Baumann (werner.baumann@onlinehome.de) * cache.c, set_next_upload_attempt: Max. retry intervall for files must not exceed max_retry. + * Add configuration option max_upload_attempts. 2009-06-08 Werner Baumann (werner.baumann@onlinehome.de) * cache.c, write_node et al: diff --git a/NEWS b/NEWS index a8be46f..4cf0946 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,27 @@ # permitted in any medium without royalty. +What is new in davfs2 1.4.1 +=========================== + +For this version I got many bug fixes, informations and +suggestions for improvement from Dirk Arend of the German +company AVM. Thanks a lot. + +davfs2 experimentally uses the non-standard method USERINFO +to get information about available and used web space from the +server. Some of the big German providers use it. davfs2 will +now recognize when the server does not provide this information +and avoid useless further attempts. + +When attempts to upload changed files fail because of problems +with the network connection, new upload attempts will be done with +increasing time intervals to not waist bandwith with to many +useless attempts. When the davfs2 file system is unmounted while +the connection is down changed files will stay in the cache and +will be uploaded when the file system is mounted the next time. + + What is new in davfs2 1.4.0 =========================== diff --git a/man/davfs2.conf.5 b/man/davfs2.conf.5 index 7523b27..c10e12e 100644 --- a/man/davfs2.conf.5 +++ b/man/davfs2.conf.5 @@ -348,6 +348,18 @@ Maximum value of the retry interval. .br Default: 300 +.TP +.B max_upload_attempts +When uploading a changed file fails temporarily \fB@PROGRAM_NAME@\fR will +retry with increasing intervals, but not more often than this. +.br +With a bad connection this will cause additional traffic. To reduce +traffic caused by unsuccessful attempts option \fBuse_expect100\fR can be +set. But please test it. Most proxies and some servers don't support this +header. +.br +Default: 15 + .TP .B add_header Your server might expect special headers to do what you want. Different from diff --git a/man/davfs2.conf.5.pot b/man/davfs2.conf.5.pot index 3822504..6555717 100644 --- a/man/davfs2.conf.5.pot +++ b/man/davfs2.conf.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-05-02 16:52+0300\n" +"POT-Creation-Date: 2009-06-12 12:25+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -310,7 +310,7 @@ msgstr "" # type: Plain text #: davfs2.conf.5:143 davfs2.conf.5:208 davfs2.conf.5:215 davfs2.conf.5:293 -#: davfs2.conf.5:421 +#: davfs2.conf.5:433 msgid "Default: 1" msgstr "" @@ -392,7 +392,7 @@ msgid "" msgstr "" # type: TP -#: davfs2.conf.5:191 davfs2.conf.5:492 +#: davfs2.conf.5:191 davfs2.conf.5:504 #, no-wrap msgid "B" msgstr "" @@ -495,7 +495,7 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:238 davfs2.conf.5:411 +#: davfs2.conf.5:238 davfs2.conf.5:423 msgid "Default: 60" msgstr "" @@ -516,7 +516,7 @@ msgstr "" # type: Plain text #: davfs2.conf.5:247 davfs2.conf.5:255 davfs2.conf.5:273 davfs2.conf.5:283 -#: davfs2.conf.5:300 davfs2.conf.5:441 +#: davfs2.conf.5:300 davfs2.conf.5:453 msgid "Default: 0" msgstr "" @@ -663,7 +663,7 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:329 davfs2.conf.5:431 +#: davfs2.conf.5:329 davfs2.conf.5:443 msgid "Default: 10" msgstr "" @@ -718,11 +718,37 @@ msgstr "" # type: TP #: davfs2.conf.5:351 #, no-wrap +msgid "B" +msgstr "" + +# type: Plain text +#: davfs2.conf.5:355 +msgid "" +"When uploading a changed file fails temporarily B<@PROGRAM_NAME@> will retry " +"with increasing intervals, but not more often than this." +msgstr "" + +# type: Plain text +#: davfs2.conf.5:360 +msgid "" +"With a bad connection this will cause additional traffic. To reduce traffic " +"caused by unsuccessful attempts option B can be set. But " +"please test it. Most proxies and some servers don't support this header." +msgstr "" + +# type: Plain text +#: davfs2.conf.5:362 +msgid "Default: 15" +msgstr "" + +# type: TP +#: davfs2.conf.5:363 +#, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:356 +#: davfs2.conf.5:368 msgid "" "Your server might expect special headers to do what you want. Different from " "other options, this one takes two values: the name of the header and its " @@ -730,17 +756,17 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:358 +#: davfs2.conf.5:370 msgid "add_header Translate F" msgstr "" # type: Plain text -#: davfs2.conf.5:360 +#: davfs2.conf.5:372 msgid "B<@PROGRAM_NAME@> will add header \"Translate: F\" on all requests." msgstr "" # type: Plain text -#: davfs2.conf.5:364 +#: davfs2.conf.5:376 msgid "" "This option is cumulative. You can enter more than one add_header option and " "all of them will be added. Also add_header options from @SYS_CONF_DIR@/" @@ -748,19 +774,19 @@ msgid "" msgstr "" # type: SH -#: davfs2.conf.5:366 +#: davfs2.conf.5:378 #, no-wrap msgid "Cache Related Options" msgstr "" # type: TP -#: davfs2.conf.5:368 +#: davfs2.conf.5:380 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:373 +#: davfs2.conf.5:385 msgid "" "Each mounted @PACKAGE@ file system has a directory to store backups of files " "that could not be stored back to the server. This sets the name of this " @@ -768,25 +794,25 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:375 +#: davfs2.conf.5:387 msgid "Default: lost+found" msgstr "" # type: TP -#: davfs2.conf.5:376 +#: davfs2.conf.5:388 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:380 +#: davfs2.conf.5:392 msgid "" "The directory where B<@PROGRAM_NAME@> will store cached files. For every " "mount point a subdirectory will be created." msgstr "" # type: Plain text -#: davfs2.conf.5:384 +#: davfs2.conf.5:396 msgid "" "In the systemwide configuration file this will set the system wide cache, " "used by root. In a users configuration file it will set the cache used by " @@ -794,18 +820,18 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:386 +#: davfs2.conf.5:398 msgid "Defaults: @SYS_CACHE_DIR@ and ~/.@PACKAGE@/cache" msgstr "" # type: TP -#: davfs2.conf.5:387 +#: davfs2.conf.5:399 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:392 +#: davfs2.conf.5:404 msgid "" "The amount of disk space in MiByte that may be used. B<@PROGRAM_NAME@> will " "always take enough space to cache open files, ignoring this value if " @@ -813,18 +839,18 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:394 +#: davfs2.conf.5:406 msgid "Default: 50" msgstr "" # type: TP -#: davfs2.conf.5:395 +#: davfs2.conf.5:407 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:401 +#: davfs2.conf.5:413 msgid "" "B<@PROGRAM_NAME@> maintains a hash table with an entry for each known file " "or directory. This gives the number of entries in this table. For large file " @@ -833,18 +859,18 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:403 +#: davfs2.conf.5:415 msgid "Default: 1024" msgstr "" # type: TP -#: davfs2.conf.5:404 +#: davfs2.conf.5:416 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:409 +#: davfs2.conf.5:421 msgid "" "After B<@PROGRAM_NAME@> has got information about files in a directory it " "considers it valid for this time in seconds. Note: This does not affect " @@ -852,13 +878,13 @@ msgid "" msgstr "" # type: TP -#: davfs2.conf.5:412 +#: davfs2.conf.5:424 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:419 +#: davfs2.conf.5:431 msgid "" "When a file or directory is opened by an application, B<@PROGRAM_NAME@> will " "first check the server for a newer version. But some applications do open " @@ -868,13 +894,13 @@ msgid "" msgstr "" # type: TP -#: davfs2.conf.5:422 +#: davfs2.conf.5:434 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:429 +#: davfs2.conf.5:441 msgid "" "When a file that has been changed is closed, B<@PROGRAM_NAME@> will wait " "that many seconds before it will upload it to the server. This will avoid " @@ -884,13 +910,13 @@ msgid "" msgstr "" # type: TP -#: davfs2.conf.5:432 +#: davfs2.conf.5:444 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:439 +#: davfs2.conf.5:451 msgid "" "When a file is opened, B<@PROGRAM_NAME@> will have to check the server " "whether there is a newer version. Graphical User Interfaces tend to open " @@ -900,19 +926,19 @@ msgid "" msgstr "" # type: SH -#: davfs2.conf.5:443 +#: davfs2.conf.5:455 #, no-wrap msgid "Debugging Options" msgstr "" # type: TP -#: davfs2.conf.5:445 +#: davfs2.conf.5:457 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:453 +#: davfs2.conf.5:465 msgid "" "Send debug messages to the syslog daemon. The value tells what kind of " "information shall be logged. The messages are send with facility LOG_DAEMON " @@ -923,7 +949,7 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:457 +#: davfs2.conf.5:469 msgid "" "Unlike other options, this option is cumulative. If there are several debug " "entries with different values, all of them will be applied. Also debug " @@ -932,171 +958,171 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:460 +#: davfs2.conf.5:472 msgid "" "B Debug messages let the log-files grow quickly. Never use this " "option in normal operation of mount.davfs." msgstr "" # type: Plain text -#: davfs2.conf.5:462 +#: davfs2.conf.5:474 msgid "Default: no debugging messages" msgstr "" # type: TP -#: davfs2.conf.5:463 +#: davfs2.conf.5:475 #, no-wrap msgid "B" msgstr "" # type: TP -#: davfs2.conf.5:465 +#: davfs2.conf.5:477 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:468 +#: davfs2.conf.5:480 msgid "Command line and configuration options." msgstr "" # type: TP -#: davfs2.conf.5:468 +#: davfs2.conf.5:480 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:471 +#: davfs2.conf.5:483 msgid "Upcalls from the kernel file system." msgstr "" # type: TP -#: davfs2.conf.5:471 +#: davfs2.conf.5:483 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:474 +#: davfs2.conf.5:486 msgid "Cache operations like adding and removing nodes." msgstr "" # type: TP -#: davfs2.conf.5:474 +#: davfs2.conf.5:486 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:477 +#: davfs2.conf.5:489 msgid "HTTP headers." msgstr "" # type: TP -#: davfs2.conf.5:477 +#: davfs2.conf.5:489 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:480 +#: davfs2.conf.5:492 msgid "Parsing of the XML-body of WebDAV-requests." msgstr "" # type: TP -#: davfs2.conf.5:480 +#: davfs2.conf.5:492 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:483 +#: davfs2.conf.5:495 msgid "Negotiation of authentication." msgstr "" # type: TP -#: davfs2.conf.5:483 +#: davfs2.conf.5:495 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:486 +#: davfs2.conf.5:498 msgid "Information about locks." msgstr "" # type: TP -#: davfs2.conf.5:486 +#: davfs2.conf.5:498 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:489 +#: davfs2.conf.5:501 msgid "TLS/SSL related stuff like certificates." msgstr "" # type: TP -#: davfs2.conf.5:489 +#: davfs2.conf.5:501 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:492 +#: davfs2.conf.5:504 msgid "Complete body of HTTP-responses." msgstr "" # type: Plain text -#: davfs2.conf.5:495 +#: davfs2.conf.5:507 msgid "" "Also print confidential information, which is usually omitted or obscured." msgstr "" # type: TP -#: davfs2.conf.5:495 +#: davfs2.conf.5:507 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: davfs2.conf.5:498 +#: davfs2.conf.5:510 msgid "Includes config, kernel, cache and http." msgstr "" # type: SH -#: davfs2.conf.5:501 mount.davfs.8:518 umount.davfs.8:79 +#: davfs2.conf.5:513 mount.davfs.8:518 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "" # type: Plain text -#: davfs2.conf.5:505 +#: davfs2.conf.5:517 msgid "" "This man page was written by by Werner Baumann Ewerner." "baumann@onlinehome.deE." msgstr "" # type: SH -#: davfs2.conf.5:507 mount.davfs.8:535 umount.davfs.8:84 +#: davfs2.conf.5:519 mount.davfs.8:535 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "" # type: Plain text -#: davfs2.conf.5:510 mount.davfs.8:538 umount.davfs.8:87 +#: davfs2.conf.5:522 mount.davfs.8:538 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "" # type: SH -#: davfs2.conf.5:512 mount.davfs.8:540 umount.davfs.8:89 +#: davfs2.conf.5:524 mount.davfs.8:540 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "" # type: Plain text -#: davfs2.conf.5:518 +#: davfs2.conf.5:530 msgid "" "B<@PROGRAM_NAME@>(8), B(8), B(8), B(8), " "B(5)" diff --git a/man/de/davfs2.conf.5.po b/man/de/davfs2.conf.5.po index f705dd4..38b710b 100644 --- a/man/de/davfs2.conf.5.po +++ b/man/de/davfs2.conf.5.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: davfs2 1.4.0\n" -"POT-Creation-Date: 2009-05-02 16:52+0300\n" -"PO-Revision-Date: 2009-05-02 16:53+0200\n" +"POT-Creation-Date: 2009-06-12 12:25+0300\n" +"PO-Revision-Date: 2009-06-12 12:25+0200\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -366,7 +366,7 @@ msgstr "" # type: Plain text #: davfs2.conf.5:143 davfs2.conf.5:208 davfs2.conf.5:215 davfs2.conf.5:293 -#: davfs2.conf.5:421 +#: davfs2.conf.5:433 msgid "Default: 1" msgstr "Voreingestellt: 1" @@ -480,7 +480,7 @@ msgstr "" "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@> nach ihr gesucht." # type: TP -#: davfs2.conf.5:191 davfs2.conf.5:492 +#: davfs2.conf.5:191 davfs2.conf.5:504 #, no-wrap msgid "B" msgstr "B" @@ -601,7 +601,7 @@ msgstr "" "erneuern. Der Wert sollte deutlich größer sein als die B." # type: Plain text -#: davfs2.conf.5:238 davfs2.conf.5:411 +#: davfs2.conf.5:238 davfs2.conf.5:423 msgid "Default: 60" msgstr "Voreingestellt: 60" @@ -626,7 +626,7 @@ msgstr "" # type: Plain text #: davfs2.conf.5:247 davfs2.conf.5:255 davfs2.conf.5:273 davfs2.conf.5:283 -#: davfs2.conf.5:300 davfs2.conf.5:441 +#: davfs2.conf.5:300 davfs2.conf.5:453 msgid "Default: 0" msgstr "Voreingestellt: 0" @@ -820,7 +820,7 @@ msgstr "" "Operationen unterstützen." # type: Plain text -#: davfs2.conf.5:329 davfs2.conf.5:431 +#: davfs2.conf.5:329 davfs2.conf.5:443 msgid "Default: 10" msgstr "Voreingestellt: 10" @@ -880,11 +880,44 @@ msgstr "Voreingestellt: 300" # type: TP #: davfs2.conf.5:351 #, no-wrap +msgid "B" +msgstr "B" + +# type: Plain text +#: davfs2.conf.5:355 +msgid "" +"When uploading a changed file fails temporarily B<@PROGRAM_NAME@> will retry " +"with increasing intervals, but not more often than this." +msgstr "" +"Schlägt das Speichern einer geänderten Datei wegen eines nicht dauerhaften " +"Problems fehl, versucht es B<@PROGRAM_NAME@> mit größer werdenden " +"Intervallen immer wieder, aber höchsten so oft." + +# type: Plain text +#: davfs2.conf.5:360 +msgid "" +"With a bad connection this will cause additional traffic. To reduce traffic " +"caused by unsuccessful attempts option B can be set. But " +"please test it. Most proxies and some servers don't support this header." +msgstr "" +"Bei einer schlechten Verbindung verursacht dies zusätzlichen Datenverkehr. " +"Durch die Option B kann das Datenaufkommen durch " +"fehlgeschlagene Versuche reduziert werden. Aber bitte erst testen. Die " +"meisten Proxies und manche Server unterstützen diesen Header nicht." + +# type: Plain text +#: davfs2.conf.5:362 +msgid "Default: 15" +msgstr "Voreingestellt: 15" + +# type: TP +#: davfs2.conf.5:363 +#, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:356 +#: davfs2.conf.5:368 msgid "" "Your server might expect special headers to do what you want. Different from " "other options, this one takes two values: the name of the header and its " @@ -895,19 +928,19 @@ msgstr "" "Headers und seinen Wert. zum Beispiel:" # type: Plain text -#: davfs2.conf.5:358 +#: davfs2.conf.5:370 msgid "add_header Translate F" msgstr "add_header Translate F" # type: Plain text -#: davfs2.conf.5:360 +#: davfs2.conf.5:372 msgid "B<@PROGRAM_NAME@> will add header \"Translate: F\" on all requests." msgstr "" "B<@PROGRAM_NAME@> sendet nun den Header \"Translate: F\" bei allen Anfragen " "mit." # type: Plain text -#: davfs2.conf.5:364 +#: davfs2.conf.5:376 msgid "" "This option is cumulative. You can enter more than one add_header option and " "all of them will be added. Also add_header options from @SYS_CONF_DIR@/" @@ -918,19 +951,19 @@ msgstr "" "@CONFIGFILE@, als auch die aus ~/.@PACKAGE@/@CONFIGFILE@ werden angewandt." # type: SH -#: davfs2.conf.5:366 +#: davfs2.conf.5:378 #, no-wrap msgid "Cache Related Options" msgstr "Cache-Optionen" # type: TP -#: davfs2.conf.5:368 +#: davfs2.conf.5:380 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:373 +#: davfs2.conf.5:385 msgid "" "Each mounted @PACKAGE@ file system has a directory to store backups of files " "that could not be stored back to the server. This sets the name of this " @@ -941,18 +974,18 @@ msgstr "" "konnten. Du solltest dieses Verzeichnis öfter mal überprüfen." # type: Plain text -#: davfs2.conf.5:375 +#: davfs2.conf.5:387 msgid "Default: lost+found" msgstr "Voreingestellt: lost+found" # type: TP -#: davfs2.conf.5:376 +#: davfs2.conf.5:388 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:380 +#: davfs2.conf.5:392 msgid "" "The directory where B<@PROGRAM_NAME@> will store cached files. For every " "mount point a subdirectory will be created." @@ -961,7 +994,7 @@ msgstr "" "jedes Dateisystem wird darin ein Unterverzeichnis angelegt." # type: Plain text -#: davfs2.conf.5:384 +#: davfs2.conf.5:396 msgid "" "In the systemwide configuration file this will set the system wide cache, " "used by root. In a users configuration file it will set the cache used by " @@ -972,18 +1005,18 @@ msgstr "" "Verzeichnis, das von diesem Benutzer benutzt wird" # type: Plain text -#: davfs2.conf.5:386 +#: davfs2.conf.5:398 msgid "Defaults: @SYS_CACHE_DIR@ and ~/.@PACKAGE@/cache" msgstr "Voreingestellt: @SYS_CACHE_DIR@ und ~/.@PACKAGE@/cache" # type: TP -#: davfs2.conf.5:387 +#: davfs2.conf.5:399 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:392 +#: davfs2.conf.5:404 msgid "" "The amount of disk space in MiByte that may be used. B<@PROGRAM_NAME@> will " "always take enough space to cache open files, ignoring this value if " @@ -994,18 +1027,18 @@ msgstr "" "Dateien auch wenn dieser Wert überschritten wird." # type: Plain text -#: davfs2.conf.5:394 +#: davfs2.conf.5:406 msgid "Default: 50" msgstr "Voreingestellt: 50" # type: TP -#: davfs2.conf.5:395 +#: davfs2.conf.5:407 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:401 +#: davfs2.conf.5:413 msgid "" "B<@PROGRAM_NAME@> maintains a hash table with an entry for each known file " "or directory. This gives the number of entries in this table. For large file " @@ -1018,18 +1051,18 @@ msgstr "" "beschleunigen. Der Wert sollte eine Zweierpotenz sein." # type: Plain text -#: davfs2.conf.5:403 +#: davfs2.conf.5:415 msgid "Default: 1024" msgstr "Voreingestellt: 1024" # type: TP -#: davfs2.conf.5:404 +#: davfs2.conf.5:416 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:409 +#: davfs2.conf.5:421 msgid "" "After B<@PROGRAM_NAME@> has got information about files in a directory it " "considers it valid for this time in seconds. Note: This does not affect " @@ -1040,13 +1073,13 @@ msgstr "" "Datei oder wenn eine Anwendung den Inhalt eines Verzeichnisses liest. " # type: TP -#: davfs2.conf.5:412 +#: davfs2.conf.5:424 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:419 +#: davfs2.conf.5:431 msgid "" "When a file or directory is opened by an application, B<@PROGRAM_NAME@> will " "first check the server for a newer version. But some applications do open " @@ -1061,13 +1094,13 @@ msgstr "" "dieser Zeit in Sekunden dieselbe Information erneut anfragen." # type: TP -#: davfs2.conf.5:422 +#: davfs2.conf.5:434 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:429 +#: davfs2.conf.5:441 msgid "" "When a file that has been changed is closed, B<@PROGRAM_NAME@> will wait " "that many seconds before it will upload it to the server. This will avoid " @@ -1082,13 +1115,13 @@ msgstr "" "Schließen auf dem Server erscheinen, kann diese Option auf 0 gesetzt werden." # type: TP -#: davfs2.conf.5:432 +#: davfs2.conf.5:444 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:439 +#: davfs2.conf.5:451 msgid "" "When a file is opened, B<@PROGRAM_NAME@> will have to check the server " "whether there is a newer version. Graphical User Interfaces tend to open " @@ -1104,19 +1137,19 @@ msgstr "" "einem PROPFIND-Request zu erledigen. 0 = nein, 1 = ja." # type: SH -#: davfs2.conf.5:443 +#: davfs2.conf.5:455 #, no-wrap msgid "Debugging Options" msgstr "Debugging Optionen" # type: TP -#: davfs2.conf.5:445 +#: davfs2.conf.5:457 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:453 +#: davfs2.conf.5:465 msgid "" "Send debug messages to the syslog daemon. The value tells what kind of " "information shall be logged. The messages are send with facility LOG_DAEMON " @@ -1133,7 +1166,7 @@ msgstr "" "hängt von der Neon-Bibliothek ab." # type: Plain text -#: davfs2.conf.5:457 +#: davfs2.conf.5:469 msgid "" "Unlike other options, this option is cumulative. If there are several debug " "entries with different values, all of them will be applied. Also debug " @@ -1146,7 +1179,7 @@ msgstr "" "angewandt." # type: Plain text -#: davfs2.conf.5:460 +#: davfs2.conf.5:472 msgid "" "B Debug messages let the log-files grow quickly. Never use this " "option in normal operation of mount.davfs." @@ -1155,143 +1188,143 @@ msgstr "" "Verwende die Option niemals im normalen Betrieb." # type: Plain text -#: davfs2.conf.5:462 +#: davfs2.conf.5:474 msgid "Default: no debugging messages" msgstr "Voreinstellung: keine Debug-Meldungen." # type: Plain text -#: davfs2.conf.5:463 +#: davfs2.conf.5:475 #, no-wrap msgid "B" msgstr "B" # type: TP -#: davfs2.conf.5:465 +#: davfs2.conf.5:477 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:468 +#: davfs2.conf.5:480 msgid "Command line and configuration options." msgstr "Kommando-Zeile und Kofigurationsoptionen." # type: TP -#: davfs2.conf.5:468 +#: davfs2.conf.5:480 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:471 +#: davfs2.conf.5:483 msgid "Upcalls from the kernel file system." msgstr "Anfragen vom Kernel-Dateisystem." # type: TP -#: davfs2.conf.5:471 +#: davfs2.conf.5:483 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:474 +#: davfs2.conf.5:486 msgid "Cache operations like adding and removing nodes." msgstr "" "Cache-Operationen wie das Erzeugen und Löschen von Dateien und " "Verzeichnissen." # type: TP -#: davfs2.conf.5:474 +#: davfs2.conf.5:486 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:477 +#: davfs2.conf.5:489 msgid "HTTP headers." msgstr "HTTP-Header." # type: TP -#: davfs2.conf.5:477 +#: davfs2.conf.5:489 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:480 +#: davfs2.conf.5:492 msgid "Parsing of the XML-body of WebDAV-requests." msgstr "Analysieren von XML-Daten in WebDAV-Anfragen." # type: TP -#: davfs2.conf.5:480 +#: davfs2.conf.5:492 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:483 +#: davfs2.conf.5:495 msgid "Negotiation of authentication." msgstr "Aushandeln der Authentifizierung." # type: TP -#: davfs2.conf.5:483 +#: davfs2.conf.5:495 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:486 +#: davfs2.conf.5:498 msgid "Information about locks." msgstr "Informationen über Sperren." # type: TP -#: davfs2.conf.5:486 +#: davfs2.conf.5:498 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:489 +#: davfs2.conf.5:501 msgid "TLS/SSL related stuff like certificates." msgstr "TLS/SSL-Informatinen, z.B. Zertifikate." # type: TP -#: davfs2.conf.5:489 +#: davfs2.conf.5:501 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:492 +#: davfs2.conf.5:504 msgid "Complete body of HTTP-responses." msgstr "Der komplette Datenteil von HTTP-Antworten." # type: Plain text -#: davfs2.conf.5:495 +#: davfs2.conf.5:507 msgid "" "Also print confidential information, which is usually omitted or obscured." msgstr "" "Gib auch vertrauliche Daten aus, die normalerweise weg gelassen werden." # type: TP -#: davfs2.conf.5:495 +#: davfs2.conf.5:507 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:498 +#: davfs2.conf.5:510 msgid "Includes config, kernel, cache and http." msgstr "Beinhaltet config, kernel, cache und http." # type: SH -#: davfs2.conf.5:501 mount.davfs.8:518 umount.davfs.8:79 +#: davfs2.conf.5:513 mount.davfs.8:518 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "AUTOREN" # type: Plain text -#: davfs2.conf.5:505 +#: davfs2.conf.5:517 msgid "" "This man page was written by by Werner Baumann Ewerner." "baumann@onlinehome.deE." @@ -1300,24 +1333,24 @@ msgstr "" "geschrieben." # type: SH -#: davfs2.conf.5:507 mount.davfs.8:535 umount.davfs.8:84 +#: davfs2.conf.5:519 mount.davfs.8:535 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "DAVFS2 HOME" # type: TH -#: davfs2.conf.5:510 mount.davfs.8:538 umount.davfs.8:87 +#: davfs2.conf.5:522 mount.davfs.8:538 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "@PACKAGE_BUGREPORT@" # type: SH -#: davfs2.conf.5:512 mount.davfs.8:540 umount.davfs.8:89 +#: davfs2.conf.5:524 mount.davfs.8:540 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" # type: Plain text -#: davfs2.conf.5:518 +#: davfs2.conf.5:530 msgid "" "B<@PROGRAM_NAME@>(8), B(8), B(8), B(8), " "B(5)" diff --git a/man/es/davfs2.conf.5.po b/man/es/davfs2.conf.5.po index 434e94d..1c5d07b 100644 --- a/man/es/davfs2.conf.5.po +++ b/man/es/davfs2.conf.5.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: davfs2.conf.5\n" -"POT-Creation-Date: 2009-05-02 16:52+0300\n" +"POT-Creation-Date: 2009-06-12 12:25+0300\n" "PO-Revision-Date: 2007-04-26 01:24-0300\n" "Last-Translator: Luciano Bello \n" "Language-Team: Español \n" @@ -366,7 +366,7 @@ msgstr "" # type: Plain text #: davfs2.conf.5:143 davfs2.conf.5:208 davfs2.conf.5:215 davfs2.conf.5:293 -#: davfs2.conf.5:421 +#: davfs2.conf.5:433 msgid "Default: 1" msgstr "Predeterminado: 1" @@ -463,7 +463,7 @@ msgstr "" "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@> serán buscados." # type: TP -#: davfs2.conf.5:191 davfs2.conf.5:492 +#: davfs2.conf.5:191 davfs2.conf.5:504 #, no-wrap msgid "B" msgstr "B" @@ -586,7 +586,7 @@ msgstr "" "grande que B." # type: Plain text -#: davfs2.conf.5:238 davfs2.conf.5:411 +#: davfs2.conf.5:238 davfs2.conf.5:423 msgid "Default: 60" msgstr "Predeterminado: 60" @@ -611,7 +611,7 @@ msgstr "" # type: Plain text #: davfs2.conf.5:247 davfs2.conf.5:255 davfs2.conf.5:273 davfs2.conf.5:283 -#: davfs2.conf.5:300 davfs2.conf.5:441 +#: davfs2.conf.5:300 davfs2.conf.5:453 msgid "Default: 0" msgstr "Predeterminado: 0" @@ -771,7 +771,7 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:329 davfs2.conf.5:431 +#: davfs2.conf.5:329 davfs2.conf.5:443 msgid "Default: 10" msgstr "Predeterminado: 10" @@ -831,11 +831,38 @@ msgstr "Predeterminado: 300" # type: TP #: davfs2.conf.5:351 #, no-wrap +msgid "B" +msgstr "" + +# type: Plain text +#: davfs2.conf.5:355 +msgid "" +"When uploading a changed file fails temporarily B<@PROGRAM_NAME@> will retry " +"with increasing intervals, but not more often than this." +msgstr "" + +# type: Plain text +#: davfs2.conf.5:360 +msgid "" +"With a bad connection this will cause additional traffic. To reduce traffic " +"caused by unsuccessful attempts option B can be set. But " +"please test it. Most proxies and some servers don't support this header." +msgstr "" + +# type: Plain text +#: davfs2.conf.5:362 +#, fuzzy +msgid "Default: 15" +msgstr "Predeterminado: 1" + +# type: TP +#: davfs2.conf.5:363 +#, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:356 +#: davfs2.conf.5:368 msgid "" "Your server might expect special headers to do what you want. Different from " "other options, this one takes two values: the name of the header and its " @@ -843,17 +870,17 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:358 +#: davfs2.conf.5:370 msgid "add_header Translate F" msgstr "add_header Translate F" # type: Plain text -#: davfs2.conf.5:360 +#: davfs2.conf.5:372 msgid "B<@PROGRAM_NAME@> will add header \"Translate: F\" on all requests." msgstr "" # type: Plain text -#: davfs2.conf.5:364 +#: davfs2.conf.5:376 msgid "" "This option is cumulative. You can enter more than one add_header option and " "all of them will be added. Also add_header options from @SYS_CONF_DIR@/" @@ -861,19 +888,19 @@ msgid "" msgstr "" # type: SH -#: davfs2.conf.5:366 +#: davfs2.conf.5:378 #, no-wrap msgid "Cache Related Options" msgstr "Opciones Relacionadas al Caché " # type: TP -#: davfs2.conf.5:368 +#: davfs2.conf.5:380 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:373 +#: davfs2.conf.5:385 msgid "" "Each mounted @PACKAGE@ file system has a directory to store backups of files " "that could not be stored back to the server. This sets the name of this " @@ -885,18 +912,18 @@ msgstr "" "debe ser examinado periodicamente." # type: Plain text -#: davfs2.conf.5:375 +#: davfs2.conf.5:387 msgid "Default: lost+found" msgstr "Predeterminado: lost+found" # type: TP -#: davfs2.conf.5:376 +#: davfs2.conf.5:388 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:380 +#: davfs2.conf.5:392 msgid "" "The directory where B<@PROGRAM_NAME@> will store cached files. For every " "mount point a subdirectory will be created." @@ -905,7 +932,7 @@ msgstr "" "cadapunto de montaje un subdirectorio será creado." # type: Plain text -#: davfs2.conf.5:384 +#: davfs2.conf.5:396 msgid "" "In the systemwide configuration file this will set the system wide cache, " "used by root. In a users configuration file it will set the cache used by " @@ -916,18 +943,18 @@ msgstr "" "por ese usuario." # type: Plain text -#: davfs2.conf.5:386 +#: davfs2.conf.5:398 msgid "Defaults: @SYS_CACHE_DIR@ and ~/.@PACKAGE@/cache" msgstr "Predeterminado: @SYS_CACHE_DIR@ y ~/.@PACKAGE@/cache" # type: TP -#: davfs2.conf.5:387 +#: davfs2.conf.5:399 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:392 +#: davfs2.conf.5:404 msgid "" "The amount of disk space in MiByte that may be used. B<@PROGRAM_NAME@> will " "always take enough space to cache open files, ignoring this value if " @@ -938,18 +965,18 @@ msgstr "" "archivos, ignorando este valor si es necesario." # type: Plain text -#: davfs2.conf.5:394 +#: davfs2.conf.5:406 msgid "Default: 50" msgstr "Predeterminado: 50" # type: TP -#: davfs2.conf.5:395 +#: davfs2.conf.5:407 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:401 +#: davfs2.conf.5:413 msgid "" "B<@PROGRAM_NAME@> maintains a hash table with an entry for each known file " "or directory. This gives the number of entries in this table. For large file " @@ -963,18 +990,18 @@ msgstr "" "archivos. El parámetro debe ser potencia de 2." # type: Plain text -#: davfs2.conf.5:403 +#: davfs2.conf.5:415 msgid "Default: 1024" msgstr "Predeterminado: 1024" # type: TP -#: davfs2.conf.5:404 +#: davfs2.conf.5:416 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:409 +#: davfs2.conf.5:421 #, fuzzy msgid "" "After B<@PROGRAM_NAME@> has got information about files in a directory it " @@ -987,13 +1014,13 @@ msgstr "" "aplicación esté leyendo." # type: TP -#: davfs2.conf.5:412 +#: davfs2.conf.5:424 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:419 +#: davfs2.conf.5:431 msgid "" "When a file or directory is opened by an application, B<@PROGRAM_NAME@> will " "first check the server for a newer version. But some applications do open " @@ -1009,13 +1036,13 @@ msgstr "" "información." # type: TP -#: davfs2.conf.5:422 +#: davfs2.conf.5:434 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:429 +#: davfs2.conf.5:441 msgid "" "When a file that has been changed is closed, B<@PROGRAM_NAME@> will wait " "that many seconds before it will upload it to the server. This will avoid " @@ -1025,13 +1052,13 @@ msgid "" msgstr "" # type: TP -#: davfs2.conf.5:432 +#: davfs2.conf.5:444 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:439 +#: davfs2.conf.5:451 msgid "" "When a file is opened, B<@PROGRAM_NAME@> will have to check the server " "whether there is a newer version. Graphical User Interfaces tend to open " @@ -1047,19 +1074,19 @@ msgstr "" "con un único pedido PROPFIND. 0 = no, 1 = sí." # type: SH -#: davfs2.conf.5:443 +#: davfs2.conf.5:455 #, fuzzy, no-wrap msgid "Debugging Options" msgstr "Opciones Generales" # type: TP -#: davfs2.conf.5:445 +#: davfs2.conf.5:457 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:453 +#: davfs2.conf.5:465 msgid "" "Send debug messages to the syslog daemon. The value tells what kind of " "information shall be logged. The messages are send with facility LOG_DAEMON " @@ -1070,7 +1097,7 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:457 +#: davfs2.conf.5:469 msgid "" "Unlike other options, this option is cumulative. If there are several debug " "entries with different values, all of them will be applied. Also debug " @@ -1079,148 +1106,148 @@ msgid "" msgstr "" # type: Plain text -#: davfs2.conf.5:460 +#: davfs2.conf.5:472 msgid "" "B Debug messages let the log-files grow quickly. Never use this " "option in normal operation of mount.davfs." msgstr "" # type: Plain text -#: davfs2.conf.5:462 +#: davfs2.conf.5:474 msgid "Default: no debugging messages" msgstr "" # type: Plain text -#: davfs2.conf.5:463 +#: davfs2.conf.5:475 #, no-wrap msgid "B" msgstr "" # type: TP -#: davfs2.conf.5:465 +#: davfs2.conf.5:477 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:468 +#: davfs2.conf.5:480 #, fuzzy msgid "Command line and configuration options." msgstr "B" # type: TP -#: davfs2.conf.5:468 +#: davfs2.conf.5:480 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:471 +#: davfs2.conf.5:483 msgid "Upcalls from the kernel file system." msgstr "" # type: TP -#: davfs2.conf.5:471 +#: davfs2.conf.5:483 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:474 +#: davfs2.conf.5:486 msgid "Cache operations like adding and removing nodes." msgstr "" # type: TP -#: davfs2.conf.5:474 +#: davfs2.conf.5:486 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:477 +#: davfs2.conf.5:489 msgid "HTTP headers." msgstr "" # type: TP -#: davfs2.conf.5:477 +#: davfs2.conf.5:489 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:480 +#: davfs2.conf.5:492 msgid "Parsing of the XML-body of WebDAV-requests." msgstr "" # type: TP -#: davfs2.conf.5:480 +#: davfs2.conf.5:492 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:483 +#: davfs2.conf.5:495 msgid "Negotiation of authentication." msgstr "" # type: TP -#: davfs2.conf.5:483 +#: davfs2.conf.5:495 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:486 +#: davfs2.conf.5:498 msgid "Information about locks." msgstr "" # type: TP -#: davfs2.conf.5:486 +#: davfs2.conf.5:498 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:489 +#: davfs2.conf.5:501 msgid "TLS/SSL related stuff like certificates." msgstr "" # type: TP -#: davfs2.conf.5:489 +#: davfs2.conf.5:501 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:492 +#: davfs2.conf.5:504 msgid "Complete body of HTTP-responses." msgstr "" # type: Plain text -#: davfs2.conf.5:495 +#: davfs2.conf.5:507 msgid "" "Also print confidential information, which is usually omitted or obscured." msgstr "" # type: TP -#: davfs2.conf.5:495 +#: davfs2.conf.5:507 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: davfs2.conf.5:498 +#: davfs2.conf.5:510 msgid "Includes config, kernel, cache and http." msgstr "" # type: SH -#: davfs2.conf.5:501 mount.davfs.8:518 umount.davfs.8:79 +#: davfs2.conf.5:513 mount.davfs.8:518 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "AUTORES" # type: Plain text -#: davfs2.conf.5:505 +#: davfs2.conf.5:517 msgid "" "This man page was written by by Werner Baumann Ewerner." "baumann@onlinehome.deE." @@ -1229,24 +1256,24 @@ msgstr "" "baumann@onlinehome.deE." # type: SH -#: davfs2.conf.5:507 mount.davfs.8:535 umount.davfs.8:84 +#: davfs2.conf.5:519 mount.davfs.8:535 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "DAVFS2 HOME" # type: TH -#: davfs2.conf.5:510 mount.davfs.8:538 umount.davfs.8:87 +#: davfs2.conf.5:522 mount.davfs.8:538 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "@PACKAGE_BUGREPORT@" # type: SH -#: davfs2.conf.5:512 mount.davfs.8:540 umount.davfs.8:89 +#: davfs2.conf.5:524 mount.davfs.8:540 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "VER TAMBIÉN" # type: Plain text -#: davfs2.conf.5:518 +#: davfs2.conf.5:530 msgid "" "B<@PROGRAM_NAME@>(8), B(8), B(8), B(8), " "B(5)" diff --git a/po/cs.po b/po/cs.po index fa605e5..a5e8bcb 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-05-01 20:32+0200\n" +"POT-Creation-Date: 2009-06-11 21:32+0200\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bitX-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n" -#: src/cache.c:608 +#: src/cache.c:654 msgid "" "connection timed out two times;\n" "trying one last time" @@ -24,12 +24,12 @@ msgstr "" "spojení vypršelo dvakrát;\n" "zkouším to ještě jednou a naposledy" -#: src/cache.c:613 +#: src/cache.c:659 #, c-format msgid "Last try succeeded.\n" msgstr "Poslední pokus byl úspěšný.\n" -#: src/cache.c:616 +#: src/cache.c:662 msgid "" "server temporarily unreachable;\n" "mounting anyway" @@ -37,7 +37,7 @@ msgstr "" "server je dočasně nedostupný;\n" "přesto připojuji" -#: src/cache.c:619 +#: src/cache.c:665 #, c-format msgid "" "Mounting failed.\n" @@ -46,78 +46,78 @@ msgstr "" "Připojení selhalo;\n" "%s" -#: src/cache.c:657 +#: src/cache.c:705 #, c-format msgid "can't replace %s with %s" msgstr "nemohu nahradit %s pomocí %s" -#: src/cache.c:661 +#: src/cache.c:709 #, c-format msgid "error writing new index file %s" msgstr "chyba při zápisu nového indexového souboru %s" -#: src/cache.c:665 +#: src/cache.c:713 #, c-format msgid "can't create new index file for %s" msgstr "nemohu vytvořit nový indexový soubor pro %s" -#: src/cache.c:2504 src/cache.c:2538 +#: src/cache.c:2549 src/cache.c:2583 #, c-format msgid "can't create cache file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/cache.c:2553 +#: src/cache.c:2598 #, c-format msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2719 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 +#: src/cache.c:2764 src/mount_davfs.c:594 src/mount_davfs.c:596 +#: src/mount_davfs.c:773 src/mount_davfs.c:775 src/mount_davfs.c:781 +#: src/mount_davfs.c:821 src/mount_davfs.c:823 src/mount_davfs.c:840 +#: src/mount_davfs.c:842 src/mount_davfs.c:1685 src/mount_davfs.c:1687 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" -#: src/cache.c:2730 +#: src/cache.c:2775 #, c-format msgid "can't open cache directory %s" msgstr "nemohu otevřít kešovací adresář %s" -#: src/cache.c:2745 +#: src/cache.c:2790 #, c-format msgid "can't create cache directory %s" msgstr "nemohu vytvořit kešovací adresář %s" -#: src/cache.c:2752 +#: src/cache.c:2797 #, c-format msgid "can't access cache directory %s" msgstr "nemohu přistoupit ke kešovacímu adresáři %s" -#: src/cache.c:2755 +#: src/cache.c:2800 #, c-format msgid "wrong owner of cache directory %s" msgstr "chybný vlastník kešovacího adresáře %s" -#: src/cache.c:2759 +#: src/cache.c:2804 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "pro kešovací adresář %s nastaveno chybné oprávnění" -#: src/cache.c:2789 +#: src/cache.c:2834 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2860 +#: src/cache.c:2907 #, c-format msgid "error parsing %s" msgstr "chyba při zpracování %s" -#: src/cache.c:2861 +#: src/cache.c:2908 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2906 +#: src/cache.c:2953 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -165,91 +165,91 @@ msgstr "nemohu otevřít fuse zařízení" msgid "can't mount using fuse kernel file system" msgstr "nemohu připojit jaderný souborový systém fuse" -#: src/mount_davfs.c:240 +#: src/mount_davfs.c:243 msgid "program is not setuid root" msgstr "program není spuštěn jako setuid root" -#: src/mount_davfs.c:242 src/mount_davfs.c:443 src/mount_davfs.c:447 +#: src/mount_davfs.c:245 src/mount_davfs.c:446 src/mount_davfs.c:450 msgid "can't change effective user id" msgstr "nemohu změnit identifikátor efektivního uživatele" -#: src/mount_davfs.c:308 +#: src/mount_davfs.c:311 msgid "can't start daemon process" msgstr "nemohu spustit proces na pozadí" -#: src/mount_davfs.c:331 +#: src/mount_davfs.c:334 msgid "can't release root privileges" msgstr "nemohu uvolnit oprávnění uživatele root" -#: src/mount_davfs.c:351 +#: src/mount_davfs.c:354 msgid "failed to release tty properly" msgstr "" -#: src/mount_davfs.c:362 +#: src/mount_davfs.c:365 #, c-format msgid "can't write pid file %s" msgstr "nemohu zapsat pid souboru %s" -#: src/mount_davfs.c:380 +#: src/mount_davfs.c:383 #, c-format msgid "unmounting %s" msgstr "odpojuji %s" -#: src/mount_davfs.c:382 +#: src/mount_davfs.c:385 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:842 +#: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 +#: src/mount_davfs.c:845 #, c-format msgid "group %s does not exist" msgstr "skupina %s neexistuje" -#: src/mount_davfs.c:435 +#: src/mount_davfs.c:438 msgid "can't change group id" msgstr "nemohu změnit id skupiny" -#: src/mount_davfs.c:440 +#: src/mount_davfs.c:443 #, c-format msgid "user %s does not exist" msgstr "uživatel %s neexistuje" -#: src/mount_davfs.c:480 src/mount_davfs.c:562 src/mount_davfs.c:597 +#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 #, c-format msgid "can't create directory %s" msgstr "nemohu vytvořit adresář %s" -#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601 -#: src/mount_davfs.c:606 src/mount_davfs.c:615 +#: 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 #, c-format msgid "can't access directory %s" msgstr "nemohu přistupovat k adresáři %s" -#: src/mount_davfs.c:490 src/mount_davfs.c:572 +#: src/mount_davfs.c:493 src/mount_davfs.c:575 #, 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:499 src/mount_davfs.c:582 +#: src/mount_davfs.c:502 src/mount_davfs.c:585 #, c-format 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:823 +#: src/mount_davfs.c:613 src/mount_davfs.c:826 msgid "can't read group data base" msgstr "nemohu přečíst údaje o skupinách" -#: src/mount_davfs.c:633 +#: src/mount_davfs.c:636 #, c-format msgid "can't open file %s" msgstr "nemohu otevřít soubor %s" -#: src/mount_davfs.c:638 +#: src/mount_davfs.c:641 #, c-format msgid "%s is already mounted on %s" msgstr "%s už je připojeno jako %s" -#: src/mount_davfs.c:661 +#: src/mount_davfs.c:664 #, c-format msgid "" "found PID file %s.\n" @@ -260,91 +260,91 @@ msgstr "" "Buď %s používá jiný proces, nebo\n" "jiné připojení skončilo neobvykle" -#: src/mount_davfs.c:682 +#: src/mount_davfs.c:685 #, c-format msgid "no entry for %s found in %s" msgstr "pro %s nebyla v %s nalezena žádná položka" -#: src/mount_davfs.c:688 +#: src/mount_davfs.c:691 #, c-format msgid "different URL in %s" msgstr "v %s je jiné URL" -#: src/mount_davfs.c:696 +#: src/mount_davfs.c:699 #, c-format msgid "different file system type in %s" msgstr "v %s je jiný souborový systém" -#: src/mount_davfs.c:699 +#: src/mount_davfs.c:702 #, c-format msgid "different config file in %s" msgstr "v %s je jiný konfigurační soubor" -#: src/mount_davfs.c:702 +#: src/mount_davfs.c:705 #, fuzzy, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "volba 'user' není v %s nastavena" -#: src/mount_davfs.c:705 +#: src/mount_davfs.c:708 #, fuzzy, c-format msgid "different option `user' in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:707 +#: src/mount_davfs.c:710 #, fuzzy, c-format msgid "different option `users' in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:713 #, c-format msgid "different mount options in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:713 +#: src/mount_davfs.c:716 #, c-format msgid "different uid in %s" msgstr "v %s je odlišné uid" -#: src/mount_davfs.c:715 +#: src/mount_davfs.c:718 #, c-format msgid "different gid in %s" msgstr "v %s je odlišné gid" -#: src/mount_davfs.c:717 +#: src/mount_davfs.c:720 #, c-format msgid "different dir_mode in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:722 #, c-format msgid "different file_mode in %s" msgstr "v %s je odlišný file_mode" -#: src/mount_davfs.c:747 +#: src/mount_davfs.c:750 #, 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:752 +#: src/mount_davfs.c:755 #, c-format msgid "can't get home directory for uid %i" msgstr "nemohu zjistit domovský adresář pro uid %i" -#: src/mount_davfs.c:754 +#: src/mount_davfs.c:757 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:762 +#: src/mount_davfs.c:765 #, c-format msgid "invalid mount point %s" msgstr "neplatný přípojný bod %s" -#: src/mount_davfs.c:765 +#: src/mount_davfs.c:768 #, c-format msgid "mount point %s does not exist" msgstr "přípojný bod %s neexistuje" -#: src/mount_davfs.c:783 +#: src/mount_davfs.c:786 #, 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:811 +#: src/mount_davfs.c:814 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:829 +#: src/mount_davfs.c:832 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:849 +#: src/mount_davfs.c:852 #, 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:872 +#: src/mount_davfs.c:875 #, c-format msgid "can't mount %s on %s" msgstr "není možno připojit %s do %s" -#: src/mount_davfs.c:874 +#: src/mount_davfs.c:877 #, c-format msgid "kernel does not know file system %s" msgstr "kernel nezná souborový systém %s" -#: src/mount_davfs.c:876 +#: src/mount_davfs.c:879 msgid "mount point is busy" msgstr "přípojný bod je zaneprázdněn" -#: src/mount_davfs.c:938 src/umount_davfs.c:88 +#: src/mount_davfs.c:941 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:954 src/umount_davfs.c:113 +#: src/mount_davfs.c:957 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:963 src/umount_davfs.c:119 +#: src/mount_davfs.c:966 src/umount_davfs.c:119 msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:976 src/umount_davfs.c:121 +#: src/mount_davfs.c:979 src/umount_davfs.c:121 msgid "too many arguments" msgstr "příliš mnoho argumentů" -#: src/mount_davfs.c:982 +#: src/mount_davfs.c:985 msgid "no mountpoint specified" msgstr "nebyl zadán žádný přípojný bod" -#: src/mount_davfs.c:987 +#: src/mount_davfs.c:990 msgid "no WebDAV-server specified" msgstr "nebyl zadán žádný WebDAV server" -#: src/mount_davfs.c:990 +#: src/mount_davfs.c:993 msgid "invalid URL" msgstr "neplatné URL" -#: src/mount_davfs.c:1009 +#: src/mount_davfs.c:1012 msgid "can't determine home directory" msgstr "nelze určit domovský adresář" -#: src/mount_davfs.c:1087 src/webdav.c:390 +#: src/mount_davfs.c:1090 src/webdav.c:407 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:1092 +#: src/mount_davfs.c:1095 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:1098 +#: src/mount_davfs.c:1101 #, 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:1141 +#: src/mount_davfs.c:1144 #, 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:1143 src/mount_davfs.c:1159 +#: src/mount_davfs.c:1146 src/mount_davfs.c:1162 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1147 +#: src/mount_davfs.c:1150 #, 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:1149 src/mount_davfs.c:1165 src/webdav.c:397 +#: src/mount_davfs.c:1152 src/mount_davfs.c:1168 src/webdav.c:414 msgid "Password: " msgstr "Heslo: " -#: src/mount_davfs.c:1157 +#: src/mount_davfs.c:1160 #, 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:1163 +#: src/mount_davfs.c:1166 #, 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:1212 +#: src/mount_davfs.c:1215 #, c-format msgid "pid %i, got signal %i" msgstr "pid %i dostal signál %i" -#: src/mount_davfs.c:1244 +#: src/mount_davfs.c:1247 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:1261 +#: src/mount_davfs.c:1264 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:1287 +#: src/mount_davfs.c:1290 #, 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:1290 +#: src/mount_davfs.c:1293 #, 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:1293 +#: src/mount_davfs.c:1296 #, 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:1553 +#: src/mount_davfs.c:1556 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1644 +#: src/mount_davfs.c:1647 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2098 src/mount_davfs.c:2319 src/mount_davfs.c:2331 +#: src/mount_davfs.c:2101 src/mount_davfs.c:2322 src/mount_davfs.c:2334 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: 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 +#: src/mount_davfs.c:2122 src/mount_davfs.c:2162 src/mount_davfs.c:2249 +#: src/mount_davfs.c:2350 src/mount_davfs.c:2418 msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2227 src/mount_davfs.c:2240 +#: src/mount_davfs.c:2230 src/mount_davfs.c:2243 msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2323 +#: src/mount_davfs.c:2326 #, c-format msgid "file %s has wrong owner" msgstr "soubor %s má chybného vlastníka" -#: src/mount_davfs.c:2326 +#: src/mount_davfs.c:2329 #, c-format msgid "file %s has wrong permissions" msgstr "soubor %s má chybná oprávnění" -#: src/mount_davfs.c:2550 +#: src/mount_davfs.c:2556 #, c-format msgid "" "Usage:\n" @@ -561,7 +561,7 @@ msgstr "" " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2554 +#: src/mount_davfs.c:2560 #, 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:2556 +#: src/mount_davfs.c:2562 #, 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:2559 +#: src/mount_davfs.c:2565 #, 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:2564 +#: src/mount_davfs.c:2570 #, 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:2570 +#: src/mount_davfs.c:2576 #, c-format msgid "" " ro : mount read-only\n" @@ -716,25 +716,25 @@ msgstr "%s: čekám, než si %s (pid %s) sesynchronizuje vyrovnávací paměť. msgid "an error occured while waiting; please wait for %s to terminate" msgstr "při čekání došlo k chybě; čekejte prosím až %s skončí" -#: src/webdav.c:323 +#: src/webdav.c:340 #, fuzzy msgid "socket library initialization failed" msgstr "selhala inicializace knihovny socketů" -#: src/webdav.c:336 +#: src/webdav.c:353 msgid "can't open stream to log neon-messages" msgstr "" -#: src/webdav.c:369 +#: src/webdav.c:386 msgid "neon library does not support TLS/SSL" msgstr "knihovna neon nepodporuje TLS/SSL" -#: src/webdav.c:377 +#: src/webdav.c:394 #, c-format msgid "can't read server certificate %s" msgstr "nemohu přečíst serverový cerifikát %s" -#: src/webdav.c:395 +#: src/webdav.c:412 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -743,78 +743,78 @@ msgstr "" "Zadejte prosím heslo pro dešifrování klientského\n" "certifikátu %s.\n" -#: src/webdav.c:409 +#: src/webdav.c:426 #, c-format msgid "can't decrypt client certificate %s" msgstr "nemohu dešifrovat klientský certifikát %s" -#: src/webdav.c:461 src/webdav.c:464 +#: src/webdav.c:478 src/webdav.c:481 msgid "mounting failed; the server does not support WebDAV" msgstr "připojení selhalo; server nepodporuje WebDAV" -#: src/webdav.c:472 +#: src/webdav.c:489 msgid "warning: the server does not support locks" msgstr "varování: server nepodporuje zámky" -#: src/webdav.c:1501 +#: src/webdav.c:1554 msgid "authentication failure:" msgstr "selhání autentizace:" -#: src/webdav.c:1539 +#: src/webdav.c:1592 #, c-format msgid "%i can't open cache file" msgstr "%i nemůže otevřít soubor vyrovnávací paměti" -#: src/webdav.c:1547 +#: src/webdav.c:1600 #, 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:1789 src/webdav.c:1792 +#: src/webdav.c:1895 src/webdav.c:1898 msgid "error processing server certificate" msgstr "chyba při zpracování certifikátu serveru" -#: src/webdav.c:1799 src/webdav.c:1835 +#: src/webdav.c:1905 src/webdav.c:1941 msgid "the server certificate is not yet valid" msgstr "certifikát serveru zatím není platný" -#: src/webdav.c:1801 src/webdav.c:1838 +#: src/webdav.c:1907 src/webdav.c:1944 msgid "the server certificate has expired" msgstr "platnost certifikátu serveru vypršela" -#: src/webdav.c:1803 src/webdav.c:1841 +#: src/webdav.c:1909 src/webdav.c:1947 msgid "the server certificate does not match the server name" msgstr "certifikát serveru nedopovídá jménu serveru" -#: src/webdav.c:1805 src/webdav.c:1844 +#: src/webdav.c:1911 src/webdav.c:1950 msgid "the server certificate is not trusted" msgstr "certifikát serveru je nedůvěryhodný" -#: src/webdav.c:1807 src/webdav.c:1847 +#: src/webdav.c:1913 src/webdav.c:1953 msgid "unknown certificate error" msgstr "neznámá chyba certifikátu" -#: src/webdav.c:1808 +#: src/webdav.c:1914 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1810 +#: src/webdav.c:1916 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1812 +#: src/webdav.c:1918 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1814 +#: src/webdav.c:1920 #, c-format msgid " fingerprint: %s" msgstr " otisk: %s" -#: src/webdav.c:1817 +#: src/webdav.c:1923 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -825,27 +825,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:1820 +#: src/webdav.c:1926 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Přijmout certifikát pro toto sezení? [y,N] " -#: src/webdav.c:1848 +#: src/webdav.c:1954 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1849 +#: src/webdav.c:1955 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1850 +#: src/webdav.c:1956 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1853 +#: src/webdav.c:1959 msgid " accepted by user" msgstr " přijat uživatelem" diff --git a/po/davfs2.pot b/po/davfs2.pot index 8d394a1..8e1bbb7 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-05-01 20:32+0200\n" +"POT-Creation-Date: 2009-06-11 21:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,102 +17,102 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/cache.c:608 +#: src/cache.c:654 msgid "" "connection timed out two times;\n" "trying one last time" msgstr "" -#: src/cache.c:613 +#: src/cache.c:659 #, c-format msgid "Last try succeeded.\n" msgstr "" -#: src/cache.c:616 +#: src/cache.c:662 msgid "" "server temporarily unreachable;\n" "mounting anyway" msgstr "" -#: src/cache.c:619 +#: src/cache.c:665 #, c-format msgid "" "Mounting failed.\n" "%s" msgstr "" -#: src/cache.c:657 +#: src/cache.c:705 #, c-format msgid "can't replace %s with %s" msgstr "" -#: src/cache.c:661 +#: src/cache.c:709 #, c-format msgid "error writing new index file %s" msgstr "" -#: src/cache.c:665 +#: src/cache.c:713 #, c-format msgid "can't create new index file for %s" msgstr "" -#: src/cache.c:2504 src/cache.c:2538 +#: src/cache.c:2549 src/cache.c:2583 #, c-format msgid "can't create cache file %s" msgstr "" -#: src/cache.c:2553 +#: src/cache.c:2598 #, c-format msgid "error writing directory %s" msgstr "" -#: src/cache.c:2719 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 +#: src/cache.c:2764 src/mount_davfs.c:594 src/mount_davfs.c:596 +#: src/mount_davfs.c:773 src/mount_davfs.c:775 src/mount_davfs.c:781 +#: src/mount_davfs.c:821 src/mount_davfs.c:823 src/mount_davfs.c:840 +#: src/mount_davfs.c:842 src/mount_davfs.c:1685 src/mount_davfs.c:1687 msgid "can't read user data base" msgstr "" -#: src/cache.c:2730 +#: src/cache.c:2775 #, c-format msgid "can't open cache directory %s" msgstr "" -#: src/cache.c:2745 +#: src/cache.c:2790 #, c-format msgid "can't create cache directory %s" msgstr "" -#: src/cache.c:2752 +#: src/cache.c:2797 #, c-format msgid "can't access cache directory %s" msgstr "" -#: src/cache.c:2755 +#: src/cache.c:2800 #, c-format msgid "wrong owner of cache directory %s" msgstr "" -#: src/cache.c:2759 +#: src/cache.c:2804 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "" -#: src/cache.c:2789 +#: src/cache.c:2834 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2860 +#: src/cache.c:2907 #, c-format msgid "error parsing %s" msgstr "" -#: src/cache.c:2861 +#: src/cache.c:2908 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2906 +#: src/cache.c:2953 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -159,91 +159,91 @@ msgstr "" msgid "can't mount using fuse kernel file system" msgstr "" -#: src/mount_davfs.c:240 +#: src/mount_davfs.c:243 msgid "program is not setuid root" msgstr "" -#: src/mount_davfs.c:242 src/mount_davfs.c:443 src/mount_davfs.c:447 +#: src/mount_davfs.c:245 src/mount_davfs.c:446 src/mount_davfs.c:450 msgid "can't change effective user id" msgstr "" -#: src/mount_davfs.c:308 +#: src/mount_davfs.c:311 msgid "can't start daemon process" msgstr "" -#: src/mount_davfs.c:331 +#: src/mount_davfs.c:334 msgid "can't release root privileges" msgstr "" -#: src/mount_davfs.c:351 +#: src/mount_davfs.c:354 msgid "failed to release tty properly" msgstr "" -#: src/mount_davfs.c:362 +#: src/mount_davfs.c:365 #, c-format msgid "can't write pid file %s" msgstr "" -#: src/mount_davfs.c:380 +#: src/mount_davfs.c:383 #, c-format msgid "unmounting %s" msgstr "" -#: src/mount_davfs.c:382 +#: src/mount_davfs.c:385 msgid "unmounting failed" msgstr "" -#: src/mount_davfs.c:431 src/mount_davfs.c:494 src/mount_davfs.c:577 -#: src/mount_davfs.c:842 +#: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 +#: src/mount_davfs.c:845 #, c-format msgid "group %s does not exist" msgstr "" -#: src/mount_davfs.c:435 +#: src/mount_davfs.c:438 msgid "can't change group id" msgstr "" -#: src/mount_davfs.c:440 +#: src/mount_davfs.c:443 #, c-format msgid "user %s does not exist" msgstr "" -#: src/mount_davfs.c:480 src/mount_davfs.c:562 src/mount_davfs.c:597 +#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 #, c-format msgid "can't create directory %s" msgstr "" -#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601 -#: src/mount_davfs.c:606 src/mount_davfs.c:615 +#: 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 #, c-format msgid "can't access directory %s" msgstr "" -#: src/mount_davfs.c:490 src/mount_davfs.c:572 +#: src/mount_davfs.c:493 src/mount_davfs.c:575 #, c-format msgid "can't change mode of directory %s" msgstr "" -#: src/mount_davfs.c:499 src/mount_davfs.c:582 +#: src/mount_davfs.c:502 src/mount_davfs.c:585 #, c-format msgid "can't change group of directory %s" msgstr "" -#: src/mount_davfs.c:610 src/mount_davfs.c:823 +#: src/mount_davfs.c:613 src/mount_davfs.c:826 msgid "can't read group data base" msgstr "" -#: src/mount_davfs.c:633 +#: src/mount_davfs.c:636 #, c-format msgid "can't open file %s" msgstr "" -#: src/mount_davfs.c:638 +#: src/mount_davfs.c:641 #, c-format msgid "%s is already mounted on %s" msgstr "" -#: src/mount_davfs.c:661 +#: src/mount_davfs.c:664 #, c-format msgid "" "found PID file %s.\n" @@ -251,276 +251,276 @@ msgid "" "or another mount process ended irregular" msgstr "" -#: src/mount_davfs.c:682 +#: src/mount_davfs.c:685 #, c-format msgid "no entry for %s found in %s" msgstr "" -#: src/mount_davfs.c:688 +#: src/mount_davfs.c:691 #, c-format msgid "different URL in %s" msgstr "" -#: src/mount_davfs.c:696 +#: src/mount_davfs.c:699 #, c-format msgid "different file system type in %s" msgstr "" -#: src/mount_davfs.c:699 +#: src/mount_davfs.c:702 #, c-format msgid "different config file in %s" msgstr "" -#: src/mount_davfs.c:702 +#: src/mount_davfs.c:705 #, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "" -#: src/mount_davfs.c:705 +#: src/mount_davfs.c:708 #, c-format msgid "different option `user' in %s" msgstr "" -#: src/mount_davfs.c:707 +#: src/mount_davfs.c:710 #, c-format msgid "different option `users' in %s" msgstr "" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:713 #, c-format msgid "different mount options in %s" msgstr "" -#: src/mount_davfs.c:713 +#: src/mount_davfs.c:716 #, c-format msgid "different uid in %s" msgstr "" -#: src/mount_davfs.c:715 +#: src/mount_davfs.c:718 #, c-format msgid "different gid in %s" msgstr "" -#: src/mount_davfs.c:717 +#: src/mount_davfs.c:720 #, c-format msgid "different dir_mode in %s" msgstr "" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:722 #, c-format msgid "different file_mode in %s" msgstr "" -#: src/mount_davfs.c:747 +#: src/mount_davfs.c:750 #, c-format msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:752 +#: src/mount_davfs.c:755 #, c-format msgid "can't get home directory for uid %i" msgstr "" -#: src/mount_davfs.c:754 +#: src/mount_davfs.c:757 msgid "A relative mount point must lie within your home directory" msgstr "" -#: src/mount_davfs.c:762 -#, c-format -msgid "invalid mount point %s" -msgstr "" - #: src/mount_davfs.c:765 #, c-format +msgid "invalid mount point %s" +msgstr "" + +#: src/mount_davfs.c:768 +#, c-format msgid "mount point %s does not exist" msgstr "" -#: src/mount_davfs.c:783 +#: src/mount_davfs.c:786 #, 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:811 +#: src/mount_davfs.c:814 msgid "you can't set file owner different from your uid" msgstr "" -#: src/mount_davfs.c:829 +#: src/mount_davfs.c:832 msgid "you must be member of the group of the file system" msgstr "" -#: src/mount_davfs.c:849 +#: src/mount_davfs.c:852 #, c-format msgid "user %s must be member of group %s" msgstr "" -#: src/mount_davfs.c:872 +#: src/mount_davfs.c:875 #, c-format msgid "can't mount %s on %s" msgstr "" -#: src/mount_davfs.c:874 +#: src/mount_davfs.c:877 #, c-format msgid "kernel does not know file system %s" msgstr "" -#: src/mount_davfs.c:876 +#: src/mount_davfs.c:879 msgid "mount point is busy" msgstr "" -#: src/mount_davfs.c:938 src/umount_davfs.c:88 +#: src/mount_davfs.c:941 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:954 src/umount_davfs.c:113 +#: src/mount_davfs.c:957 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:963 src/umount_davfs.c:119 +#: src/mount_davfs.c:966 src/umount_davfs.c:119 msgid "missing argument" msgstr "" -#: src/mount_davfs.c:976 src/umount_davfs.c:121 +#: src/mount_davfs.c:979 src/umount_davfs.c:121 msgid "too many arguments" msgstr "" -#: src/mount_davfs.c:982 +#: src/mount_davfs.c:985 msgid "no mountpoint specified" msgstr "" -#: src/mount_davfs.c:987 +#: src/mount_davfs.c:990 msgid "no WebDAV-server specified" msgstr "" -#: src/mount_davfs.c:990 +#: src/mount_davfs.c:993 msgid "invalid URL" msgstr "" -#: src/mount_davfs.c:1009 +#: src/mount_davfs.c:1012 msgid "can't determine home directory" msgstr "" -#: src/mount_davfs.c:1087 src/webdav.c:390 +#: src/mount_davfs.c:1090 src/webdav.c:407 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:1092 +#: src/mount_davfs.c:1095 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:1098 +#: src/mount_davfs.c:1101 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:1141 +#: src/mount_davfs.c:1144 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1143 src/mount_davfs.c:1159 +#: src/mount_davfs.c:1146 src/mount_davfs.c:1162 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1147 +#: src/mount_davfs.c:1150 #, 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:1149 src/mount_davfs.c:1165 src/webdav.c:397 +#: src/mount_davfs.c:1152 src/mount_davfs.c:1168 src/webdav.c:414 msgid "Password: " msgstr "" -#: src/mount_davfs.c:1157 +#: src/mount_davfs.c:1160 #, c-format msgid "" "Please enter the username to authenticate with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1163 +#: src/mount_davfs.c:1166 #, 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:1212 +#: src/mount_davfs.c:1215 #, c-format msgid "pid %i, got signal %i" msgstr "" -#: src/mount_davfs.c:1244 +#: src/mount_davfs.c:1247 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." msgstr "" -#: src/mount_davfs.c:1261 +#: src/mount_davfs.c:1264 msgid "" "Warning: can't write entry into mtab, but will mount the file system anyway" msgstr "" -#: src/mount_davfs.c:1287 +#: src/mount_davfs.c:1290 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "" -#: src/mount_davfs.c:1290 +#: src/mount_davfs.c:1293 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "" -#: src/mount_davfs.c:1293 +#: src/mount_davfs.c:1296 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "" -#: src/mount_davfs.c:1553 +#: src/mount_davfs.c:1556 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1644 +#: src/mount_davfs.c:1647 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2098 src/mount_davfs.c:2319 src/mount_davfs.c:2331 +#: src/mount_davfs.c:2101 src/mount_davfs.c:2322 src/mount_davfs.c:2334 #, c-format msgid "opening %s failed" msgstr "" -#: 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 +#: src/mount_davfs.c:2122 src/mount_davfs.c:2162 src/mount_davfs.c:2249 +#: src/mount_davfs.c:2350 src/mount_davfs.c:2418 msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2227 src/mount_davfs.c:2240 +#: src/mount_davfs.c:2230 src/mount_davfs.c:2243 msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2323 -#, c-format -msgid "file %s has wrong owner" -msgstr "" - #: src/mount_davfs.c:2326 #, c-format +msgid "file %s has wrong owner" +msgstr "" + +#: src/mount_davfs.c:2329 +#, c-format msgid "file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2550 +#: src/mount_davfs.c:2556 #, c-format msgid "" "Usage:\n" @@ -529,14 +529,14 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2554 +#: src/mount_davfs.c:2560 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2556 +#: src/mount_davfs.c:2562 #, c-format msgid "" " mount : or\n" @@ -544,7 +544,7 @@ msgid "" " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2559 +#: src/mount_davfs.c:2565 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -555,7 +555,7 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2564 +#: src/mount_davfs.c:2570 #, c-format msgid "" "Recognised options:\n" @@ -566,7 +566,7 @@ msgid "" " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2570 +#: src/mount_davfs.c:2576 #, c-format msgid "" " ro : mount read-only\n" @@ -640,102 +640,102 @@ msgstr "" msgid "an error occured while waiting; please wait for %s to terminate" msgstr "" -#: src/webdav.c:323 +#: src/webdav.c:340 msgid "socket library initialization failed" msgstr "" -#: src/webdav.c:336 +#: src/webdav.c:353 msgid "can't open stream to log neon-messages" msgstr "" -#: src/webdav.c:369 +#: src/webdav.c:386 msgid "neon library does not support TLS/SSL" msgstr "" -#: src/webdav.c:377 +#: src/webdav.c:394 #, c-format msgid "can't read server certificate %s" msgstr "" -#: src/webdav.c:395 +#: src/webdav.c:412 #, c-format msgid "" "Please enter the password to decrypt client\n" "certificate %s.\n" msgstr "" -#: src/webdav.c:409 +#: src/webdav.c:426 #, c-format msgid "can't decrypt client certificate %s" msgstr "" -#: src/webdav.c:461 src/webdav.c:464 +#: src/webdav.c:478 src/webdav.c:481 msgid "mounting failed; the server does not support WebDAV" msgstr "" -#: src/webdav.c:472 +#: src/webdav.c:489 msgid "warning: the server does not support locks" msgstr "" -#: src/webdav.c:1501 +#: src/webdav.c:1554 msgid "authentication failure:" msgstr "" -#: src/webdav.c:1539 +#: src/webdav.c:1592 #, c-format msgid "%i can't open cache file" msgstr "" -#: src/webdav.c:1547 +#: src/webdav.c:1600 #, c-format msgid "%i error writing to cache file" msgstr "" -#: src/webdav.c:1789 src/webdav.c:1792 +#: src/webdav.c:1895 src/webdav.c:1898 msgid "error processing server certificate" msgstr "" -#: src/webdav.c:1799 src/webdav.c:1835 +#: src/webdav.c:1905 src/webdav.c:1941 msgid "the server certificate is not yet valid" msgstr "" -#: src/webdav.c:1801 src/webdav.c:1838 +#: src/webdav.c:1907 src/webdav.c:1944 msgid "the server certificate has expired" msgstr "" -#: src/webdav.c:1803 src/webdav.c:1841 +#: src/webdav.c:1909 src/webdav.c:1947 msgid "the server certificate does not match the server name" msgstr "" -#: src/webdav.c:1805 src/webdav.c:1844 +#: src/webdav.c:1911 src/webdav.c:1950 msgid "the server certificate is not trusted" msgstr "" -#: src/webdav.c:1807 src/webdav.c:1847 +#: src/webdav.c:1913 src/webdav.c:1953 msgid "unknown certificate error" msgstr "" -#: src/webdav.c:1808 +#: src/webdav.c:1914 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1810 +#: src/webdav.c:1916 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1812 +#: src/webdav.c:1918 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1814 +#: src/webdav.c:1920 #, c-format msgid " fingerprint: %s" msgstr "" -#: src/webdav.c:1817 +#: src/webdav.c:1923 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -743,26 +743,26 @@ msgid "" "or there might be a man-in-the-middle-attack.\n" msgstr "" -#: src/webdav.c:1820 +#: src/webdav.c:1926 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "" -#: src/webdav.c:1848 +#: src/webdav.c:1954 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1849 +#: src/webdav.c:1955 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1850 +#: src/webdav.c:1956 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1853 +#: src/webdav.c:1959 msgid " accepted by user" msgstr "" diff --git a/po/de.po b/po/de.po index fbdac95..906a850 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-05-01 20:32+0200\n" +"POT-Creation-Date: 2009-06-11 21:32+0200\n" "PO-Revision-Date: 2009-01-02 12:26+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/cache.c:608 +#: src/cache.c:654 msgid "" "connection timed out two times;\n" "trying one last time" @@ -24,12 +24,12 @@ msgstr "" "die Verbindung wurde zweimal wegen Zeitüberschreitung abgebrochen;\n" "ich versuche es zum letzten mal" -#: src/cache.c:613 +#: src/cache.c:659 #, c-format msgid "Last try succeeded.\n" msgstr "Der letzte Versuch war erfolgreich.\n" -#: src/cache.c:616 +#: src/cache.c:662 msgid "" "server temporarily unreachable;\n" "mounting anyway" @@ -37,7 +37,7 @@ msgstr "" "der Server ist zur Zeit nicht erreichbar;\n" "das Dateisystem wird trotzdem eingehängt" -#: src/cache.c:619 +#: src/cache.c:665 #, c-format msgid "" "Mounting failed.\n" @@ -46,78 +46,78 @@ msgstr "" "das Einhängen schlug fehl;\n" "%s" -#: src/cache.c:657 +#: src/cache.c:705 #, c-format msgid "can't replace %s with %s" msgstr "kann %s nicht durch %s ersetzen" -#: src/cache.c:661 +#: src/cache.c:709 #, c-format msgid "error writing new index file %s" msgstr "Fehler beim Schreiben der neuen Indexdatei %s" -#: src/cache.c:665 +#: src/cache.c:713 #, c-format msgid "can't create new index file for %s" msgstr "kann keine neue Indexdatei für %s erzeugen" -#: src/cache.c:2504 src/cache.c:2538 +#: src/cache.c:2549 src/cache.c:2583 #, c-format msgid "can't create cache file %s" msgstr "kann die Cachedatei %s nicht erzeugen" -#: src/cache.c:2553 +#: src/cache.c:2598 #, c-format msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2719 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 +#: src/cache.c:2764 src/mount_davfs.c:594 src/mount_davfs.c:596 +#: src/mount_davfs.c:773 src/mount_davfs.c:775 src/mount_davfs.c:781 +#: src/mount_davfs.c:821 src/mount_davfs.c:823 src/mount_davfs.c:840 +#: src/mount_davfs.c:842 src/mount_davfs.c:1685 src/mount_davfs.c:1687 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" -#: src/cache.c:2730 +#: src/cache.c:2775 #, c-format msgid "can't open cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht öffnen" -#: src/cache.c:2745 +#: src/cache.c:2790 #, c-format msgid "can't create cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht erzeugen" -#: src/cache.c:2752 +#: src/cache.c:2797 #, c-format msgid "can't access cache directory %s" msgstr "Zugriff auf das Cachverzeichnis %s verweigert" -#: src/cache.c:2755 +#: src/cache.c:2800 #, c-format msgid "wrong owner of cache directory %s" msgstr "das Cacheverzeichnis %s hat den falschen Besitzer" -#: src/cache.c:2759 +#: src/cache.c:2804 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "das Cachverzeichnis %s hat die falschen Dateirechte" -#: src/cache.c:2789 +#: src/cache.c:2834 msgid "found orphaned file in cache:" msgstr "fand verwaiste Datei im Cache:" -#: src/cache.c:2860 +#: src/cache.c:2907 #, c-format msgid "error parsing %s" msgstr "Syntaxfehler in %s" -#: src/cache.c:2861 +#: src/cache.c:2908 #, c-format msgid " at line %i" msgstr " in Zeile %i" -#: src/cache.c:2906 +#: src/cache.c:2953 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -167,91 +167,91 @@ msgid "can't mount using fuse kernel file system" msgstr "" "mit Kernel-Dateisystem fuse kann das Dateisystem nicht eingehängt werden" -#: src/mount_davfs.c:240 +#: src/mount_davfs.c:243 msgid "program is not setuid root" msgstr "die Programmdatei hat das setuid-Bit nicht gesetzt" -#: src/mount_davfs.c:242 src/mount_davfs.c:443 src/mount_davfs.c:447 +#: src/mount_davfs.c:245 src/mount_davfs.c:446 src/mount_davfs.c:450 msgid "can't change effective user id" msgstr "kann die effektive Benutzer-ID nicht ändern" -#: src/mount_davfs.c:308 +#: src/mount_davfs.c:311 msgid "can't start daemon process" msgstr "kann den Hintergrundprozess nicht starten" -#: src/mount_davfs.c:331 +#: src/mount_davfs.c:334 msgid "can't release root privileges" msgstr "ich werde die root-Rechte nicht los" -#: src/mount_davfs.c:351 +#: src/mount_davfs.c:354 msgid "failed to release tty properly" msgstr "kann das Terminal nicht freigeben" -#: src/mount_davfs.c:362 +#: src/mount_davfs.c:365 #, c-format msgid "can't write pid file %s" msgstr "kann die PID-Datei %s nicht schreiben" -#: src/mount_davfs.c:380 +#: src/mount_davfs.c:383 #, c-format msgid "unmounting %s" msgstr "hänge %s aus" -#: src/mount_davfs.c:382 +#: src/mount_davfs.c:385 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:842 +#: src/mount_davfs.c:434 src/mount_davfs.c:497 src/mount_davfs.c:580 +#: src/mount_davfs.c:845 #, c-format msgid "group %s does not exist" msgstr "die Gruppe %s existiert nicht" -#: src/mount_davfs.c:435 +#: src/mount_davfs.c:438 msgid "can't change group id" msgstr "kann die Gruppenkennung nicht ändern" -#: src/mount_davfs.c:440 +#: src/mount_davfs.c:443 #, c-format msgid "user %s does not exist" msgstr "der Benutzer %s existiert nicht" -#: src/mount_davfs.c:480 src/mount_davfs.c:562 src/mount_davfs.c:597 +#: src/mount_davfs.c:483 src/mount_davfs.c:565 src/mount_davfs.c:600 #, c-format msgid "can't create directory %s" msgstr "kann das Verzeichnis %s nicht erzeugen" -#: src/mount_davfs.c:484 src/mount_davfs.c:566 src/mount_davfs.c:601 -#: src/mount_davfs.c:606 src/mount_davfs.c:615 +#: 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 #, c-format msgid "can't access directory %s" msgstr "Zugriff auf das Verzeichnis %s verweigert" -#: src/mount_davfs.c:490 src/mount_davfs.c:572 +#: src/mount_davfs.c:493 src/mount_davfs.c:575 #, c-format msgid "can't change mode of directory %s" msgstr "kann die Rechte des Verzeichnisses %s nicht ändern" -#: src/mount_davfs.c:499 src/mount_davfs.c:582 +#: src/mount_davfs.c:502 src/mount_davfs.c:585 #, c-format 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:823 +#: src/mount_davfs.c:613 src/mount_davfs.c:826 msgid "can't read group data base" msgstr "kann die Gruppendatenbank nicht lesen" -#: src/mount_davfs.c:633 +#: src/mount_davfs.c:636 #, c-format msgid "can't open file %s" msgstr "kann die Datei %s nicht öffnen" -#: src/mount_davfs.c:638 +#: src/mount_davfs.c:641 #, c-format msgid "%s is already mounted on %s" msgstr "%s ist bereits auf %s eingehängt" -#: src/mount_davfs.c:661 +#: src/mount_davfs.c:664 #, c-format msgid "" "found PID file %s.\n" @@ -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:682 +#: src/mount_davfs.c:685 #, c-format msgid "no entry for %s found in %s" msgstr "für %s ist kein Eintrag in %s" -#: src/mount_davfs.c:688 +#: src/mount_davfs.c:691 #, c-format msgid "different URL in %s" msgstr "in %s ist eine andere URL angegeben" -#: src/mount_davfs.c:696 +#: src/mount_davfs.c:699 #, c-format msgid "different file system type in %s" msgstr "in %s ist ein anderer Dateisystemtyp angegeben" -#: src/mount_davfs.c:699 +#: src/mount_davfs.c:702 #, c-format msgid "different config file in %s" msgstr "in %s ist eine andere Konfigurationsdatei angegeben" -#: src/mount_davfs.c:702 +#: src/mount_davfs.c:705 #, 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:705 +#: src/mount_davfs.c:708 #, c-format msgid "different option `user' in %s" msgstr "in %s ist die Option „user” anders gesetzt" -#: src/mount_davfs.c:707 +#: src/mount_davfs.c:710 #, c-format msgid "different option `users' in %s" msgstr "in %s ist die Option „users” anders gesetzt" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:713 #, c-format msgid "different mount options in %s" msgstr "in %s sind andere Mount-Optionen angegeben" -#: src/mount_davfs.c:713 +#: src/mount_davfs.c:716 #, c-format msgid "different uid in %s" msgstr "in %s ist eine andere uid angegeben" -#: src/mount_davfs.c:715 +#: src/mount_davfs.c:718 #, c-format msgid "different gid in %s" msgstr "in %s ist eine andere gid angegeben" -#: src/mount_davfs.c:717 +#: src/mount_davfs.c:720 #, c-format msgid "different dir_mode in %s" msgstr "in %s ist ein anderer dir_mode angegeben" -#: src/mount_davfs.c:719 +#: src/mount_davfs.c:722 #, c-format msgid "different file_mode in %s" msgstr "in %s ist ein anderer file_mode angegeben" -#: src/mount_davfs.c:747 +#: src/mount_davfs.c:750 #, 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:752 +#: src/mount_davfs.c:755 #, 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:754 +#: src/mount_davfs.c:757 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:762 +#: src/mount_davfs.c:765 #, c-format msgid "invalid mount point %s" msgstr "der Einhängepunkt %s ist nicht erlaubt" -#: src/mount_davfs.c:765 +#: src/mount_davfs.c:768 #, c-format msgid "mount point %s does not exist" msgstr "der Einhängepunkt %s existiert nicht" -#: src/mount_davfs.c:783 +#: src/mount_davfs.c:786 #, 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:811 +#: src/mount_davfs.c:814 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:829 +#: src/mount_davfs.c:832 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:849 +#: src/mount_davfs.c:852 #, 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:872 +#: src/mount_davfs.c:875 #, c-format msgid "can't mount %s on %s" msgstr "kann %s nicht auf %s einhängen" -#: src/mount_davfs.c:874 +#: src/mount_davfs.c:877 #, c-format msgid "kernel does not know file system %s" msgstr "der Kernel kenn das Dateisystem %s nicht" -#: src/mount_davfs.c:876 +#: src/mount_davfs.c:879 msgid "mount point is busy" msgstr "das Einhängepunkt wird anderweitig benutzt" -#: src/mount_davfs.c:938 src/umount_davfs.c:88 +#: src/mount_davfs.c:941 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:954 src/umount_davfs.c:113 +#: src/mount_davfs.c:957 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:963 src/umount_davfs.c:119 +#: src/mount_davfs.c:966 src/umount_davfs.c:119 msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:976 src/umount_davfs.c:121 +#: src/mount_davfs.c:979 src/umount_davfs.c:121 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/mount_davfs.c:982 +#: src/mount_davfs.c:985 msgid "no mountpoint specified" msgstr "es wurde kein Einhängepunkt angegeben" -#: src/mount_davfs.c:987 +#: src/mount_davfs.c:990 msgid "no WebDAV-server specified" msgstr "es wurde kein WebDAV-Server angegeben" -#: src/mount_davfs.c:990 +#: src/mount_davfs.c:993 msgid "invalid URL" msgstr "die URL ist ungültig" -#: src/mount_davfs.c:1009 +#: src/mount_davfs.c:1012 msgid "can't determine home directory" msgstr "kann das Home-Verzeichnis nicht ermitteln" -#: src/mount_davfs.c:1087 src/webdav.c:390 +#: src/mount_davfs.c:1090 src/webdav.c:407 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:1092 +#: src/mount_davfs.c:1095 #, 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:1098 +#: src/mount_davfs.c:1101 #, 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:1141 +#: src/mount_davfs.c:1144 #, 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:1143 src/mount_davfs.c:1159 +#: src/mount_davfs.c:1146 src/mount_davfs.c:1162 msgid "Username:" msgstr "Benutzername:" -#: src/mount_davfs.c:1147 +#: src/mount_davfs.c:1150 #, 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:1149 src/mount_davfs.c:1165 src/webdav.c:397 +#: src/mount_davfs.c:1152 src/mount_davfs.c:1168 src/webdav.c:414 msgid "Password: " msgstr "Passwort:" -#: src/mount_davfs.c:1157 +#: src/mount_davfs.c:1160 #, 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:1163 +#: src/mount_davfs.c:1166 #, 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:1212 +#: src/mount_davfs.c:1215 #, c-format msgid "pid %i, got signal %i" msgstr "PID %i, erhielt Signal %i" -#: src/mount_davfs.c:1244 +#: src/mount_davfs.c:1247 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:1261 +#: src/mount_davfs.c:1264 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:1287 +#: src/mount_davfs.c:1290 #, 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:1290 +#: src/mount_davfs.c:1293 #, 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:1293 +#: src/mount_davfs.c:1296 #, 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:1553 +#: src/mount_davfs.c:1556 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1644 +#: src/mount_davfs.c:1647 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2098 src/mount_davfs.c:2319 src/mount_davfs.c:2331 +#: src/mount_davfs.c:2101 src/mount_davfs.c:2322 src/mount_davfs.c:2334 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: 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 +#: src/mount_davfs.c:2122 src/mount_davfs.c:2162 src/mount_davfs.c:2249 +#: src/mount_davfs.c:2350 src/mount_davfs.c:2418 msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2227 src/mount_davfs.c:2240 +#: src/mount_davfs.c:2230 src/mount_davfs.c:2243 msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2323 +#: src/mount_davfs.c:2326 #, c-format msgid "file %s has wrong owner" msgstr "die Datei %s hat den falschen Besitzer" -#: src/mount_davfs.c:2326 +#: src/mount_davfs.c:2329 #, c-format msgid "file %s has wrong permissions" msgstr "die Dateirechte für %s sind falsch" -#: src/mount_davfs.c:2550 +#: src/mount_davfs.c:2556 #, c-format msgid "" "Usage:\n" @@ -568,7 +568,7 @@ msgstr "" " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2554 +#: src/mount_davfs.c:2560 #, 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:2556 +#: src/mount_davfs.c:2562 #, 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:2559 +#: src/mount_davfs.c:2565 #, 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:2564 +#: src/mount_davfs.c:2570 #, 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:2570 +#: src/mount_davfs.c:2576 #, c-format msgid "" " ro : mount read-only\n" @@ -724,24 +724,24 @@ msgid "an error occured while waiting; please wait for %s to terminate" msgstr "" "während des Wartens trat ein Fehler auf; bitte warte bis der %s-Prozess endet" -#: src/webdav.c:323 +#: src/webdav.c:340 msgid "socket library initialization failed" msgstr "die socket-Bibliothek konnte nicht initialisiert werden" -#: src/webdav.c:336 +#: src/webdav.c:353 msgid "can't open stream to log neon-messages" msgstr "kann die Ausgabe für neon-Log-Meldungen nicht öffnen" -#: src/webdav.c:369 +#: src/webdav.c:386 msgid "neon library does not support TLS/SSL" msgstr "die Neon-Bibliothek uterstützt TLS/SSL nicht" -#: src/webdav.c:377 +#: src/webdav.c:394 #, c-format msgid "can't read server certificate %s" msgstr "kann das Server-Zertifikat %s nicht lesen" -#: src/webdav.c:395 +#: src/webdav.c:412 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -750,78 +750,78 @@ msgstr "" "Gib bitte das Passwort für die Entschlüsselung des\n" "Client-Zertifikats %s ein.\n" -#: src/webdav.c:409 +#: src/webdav.c:426 #, c-format msgid "can't decrypt client certificate %s" msgstr "kann das Zertifikat %s nicht entschlüsseln" -#: src/webdav.c:461 src/webdav.c:464 +#: src/webdav.c:478 src/webdav.c:481 msgid "mounting failed; the server does not support WebDAV" msgstr "das Einhängen schlug fehl; der Server unterstützt WebDAV nicht" -#: src/webdav.c:472 +#: src/webdav.c:489 msgid "warning: the server does not support locks" msgstr "Warnung: der Server kann Dateien nicht sperren" -#: src/webdav.c:1501 +#: src/webdav.c:1554 msgid "authentication failure:" msgstr "Authentifizierungsfehler" -#: src/webdav.c:1539 +#: src/webdav.c:1592 #, c-format msgid "%i can't open cache file" msgstr "%i kann die Cache-Datei nicht öffnen" -#: src/webdav.c:1547 +#: src/webdav.c:1600 #, c-format msgid "%i error writing to cache file" msgstr "%i Fehler beim Schreiben der Cache-Datei" -#: src/webdav.c:1789 src/webdav.c:1792 +#: src/webdav.c:1895 src/webdav.c:1898 msgid "error processing server certificate" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1799 src/webdav.c:1835 +#: src/webdav.c:1905 src/webdav.c:1941 msgid "the server certificate is not yet valid" msgstr "das Server-Zertifikat ist noch nicht gültig" -#: src/webdav.c:1801 src/webdav.c:1838 +#: src/webdav.c:1907 src/webdav.c:1944 msgid "the server certificate has expired" msgstr "das Server-Zertifikat ist nicht mehr gültig" -#: src/webdav.c:1803 src/webdav.c:1841 +#: src/webdav.c:1909 src/webdav.c:1947 msgid "the server certificate does not match the server name" msgstr "das Server-Zertifikat passt nicht zum Namen des Servers" -#: src/webdav.c:1805 src/webdav.c:1844 +#: src/webdav.c:1911 src/webdav.c:1950 msgid "the server certificate is not trusted" msgstr "wir trauen dem Zertifikat nicht" -#: src/webdav.c:1807 src/webdav.c:1847 +#: src/webdav.c:1913 src/webdav.c:1953 msgid "unknown certificate error" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1808 +#: src/webdav.c:1914 #, c-format msgid " issuer: %s" msgstr " Aussteller: %s" -#: src/webdav.c:1810 +#: src/webdav.c:1916 #, c-format msgid " subject: %s" msgstr " Inhaber: %s" -#: src/webdav.c:1812 +#: src/webdav.c:1918 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1814 +#: src/webdav.c:1920 #, c-format msgid " fingerprint: %s" msgstr " Fingerabdruck: %s" -#: src/webdav.c:1817 +#: src/webdav.c:1923 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -832,26 +832,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:1820 +#: src/webdav.c:1926 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Ich akzeptiere das Zertifikat für diese Sitzung [j,N]: " -#: src/webdav.c:1848 +#: src/webdav.c:1954 #, c-format msgid " issuer: %s" msgstr " Aussteller des Zertifikats: %s" -#: src/webdav.c:1849 +#: src/webdav.c:1955 #, c-format msgid " subject: %s" msgstr " Inhaber des Zertifikats: %s" -#: src/webdav.c:1850 +#: src/webdav.c:1956 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1853 +#: src/webdav.c:1959 msgid " accepted by user" msgstr " durch den Benutzer akzeptiert" diff --git a/src/cache.c b/src/cache.c index 1397777..d804d35 100644 --- a/src/cache.c +++ b/src/cache.c @@ -126,8 +126,6 @@ static const char* const type[] = { [END] = NULL }; -#define MAX_UPLOAD_ATTEMPTS 20 - /* Private global variables */ /*==========================*/ @@ -180,6 +178,9 @@ static time_t min_retry; /* Maximum retry time. */ static time_t max_retry; +/* Maximum number of upload attempts. */ +static int max_upload_attempts; + /* Refresh locks this much seconds before they time out. */ static time_t lock_refresh; @@ -309,7 +310,7 @@ set_next_upload_attempt(dav_node *node) item = item->next; if (!item) return 0; item->attempts++; - if (item->attempts > MAX_UPLOAD_ATTEMPTS) + if (item->attempts > max_upload_attempts) return -1; time_t delay = item->attempts * min_retry; item->save_at += (delay > max_retry) ? max_retry : delay; @@ -606,6 +607,7 @@ dav_init_cache(const dav_args *args, const char *mpoint) retry = dir_refresh; min_retry = args->retry; max_retry = args->max_retry; + max_upload_attempts = args->max_upload_attempts; lock_refresh = args->lock_refresh; fs_stat = (dav_stat *) malloc(sizeof(dav_stat)); diff --git a/src/defaults.h b/src/defaults.h index bc3e0bc..7afd308 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -161,15 +161,20 @@ May be overridden by system config file and user config file. */ #define DAV_READ_TIMEOUT 30 -/* Default retry time after a PROPFIND request failed. When the request fails +/* Default retry time after a HTTP request failed. When the request fails again, the retry time will subsequently be increased up to DAV_MAX_RETRY. May be overridden by system config file and user config file. */ #define DAV_RETRY 30 -/* Maximum retry time after a PROPFIND request failed. +/* Maximum retry time after a HTTP request failed. May be overridden by system config file and user config file. */ #define DAV_MAX_RETRY 300 +/* Maximum Number of attempts made to upoad a changed file before it is + moved into the lost+found directory. + May be overridden by system config file and user config file. */ +#define DAV_MAX_UPLOAD_ATTEMPTS 15 + /* Preferred live time of locks in seconds, before they have to be refreshed. May be overridden by system config file and user config file. */ #define DAV_LOCK_TIMEOUT 1800 diff --git a/src/mount_davfs.c b/src/mount_davfs.c index e06a13d..1792f95 100644 --- a/src/mount_davfs.c +++ b/src/mount_davfs.c @@ -1753,6 +1753,7 @@ new_args(void) args->read_timeout = DAV_READ_TIMEOUT; args->retry = DAV_RETRY; args->max_retry = DAV_MAX_RETRY; + args->max_upload_attempts = DAV_MAX_UPLOAD_ATTEMPTS; args->s_charset = NULL; args->header = NULL; @@ -2194,6 +2195,8 @@ read_config(dav_args *args, const char * filename, int system) args->retry = arg_to_int(parmv[1], 10, parmv[0]); } else if (strcmp(parmv[0], "max_retry") == 0) { args->max_retry = arg_to_int(parmv[1], 10, parmv[0]); + } else if (strcmp(parmv[0], "max_upload_attempts") == 0) { + args->max_upload_attempts = arg_to_int(parmv[1], 10, parmv[0]); } else if (strcmp(parmv[0], "server_charset") == 0) { if (args->s_charset) free(args->s_charset); diff --git a/src/mount_davfs.h b/src/mount_davfs.h index 6e440c0..a38a1fa 100644 --- a/src/mount_davfs.h +++ b/src/mount_davfs.h @@ -81,6 +81,7 @@ typedef struct { time_t read_timeout; /* User config file, system config file */ time_t retry; /* User config file, system config file */ time_t max_retry; /* User config file, system config file */ + int max_upload_attempts; /* User config file, system config file */ char * s_charset; /* User config file, system config file */ char * header; /* User config file, system config file */ /* Cache */