From 3b80e972ff3793770b50ed090859993a0f68621f Mon Sep 17 00:00:00 2001 From: wbaumann Date: Wed, 29 Apr 2009 18:37:47 +0000 Subject: [PATCH] add mount option 'users' --- ChangeLog | 4 + man/de/mount.davfs.8.po | 226 ++++++++++++++++++++++------------------ man/mount.davfs.8 | 10 ++ man/mount.davfs.8.pot | 218 ++++++++++++++++++++------------------ po/cs.po | 136 +++++++++++++----------- po/davfs2.pot | 144 +++++++++++++------------ po/de.po | 136 +++++++++++++----------- src/mount_davfs.c | 21 +++- src/mount_davfs.h | 1 + 9 files changed, 499 insertions(+), 397 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a49e0e..1988fc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ ChangeLog for davfs2 -------------------- +2009-04-29 Werner Baumann (werner.baumann@onlinehome.de) + * mount_davfs.c, mount_davfs.h: + Add mount-option "users". + 2009-04-26 Werner Baumann (werner.baumann@onlinehome.de) * mount_davfs.c: New function split_uri; allow arbitrary characters diff --git a/man/de/mount.davfs.8.po b/man/de/mount.davfs.8.po index 3041fe2..8d2c730 100644 --- a/man/de/mount.davfs.8.po +++ b/man/de/mount.davfs.8.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: davfs2 1.4.0\n" -"POT-Creation-Date: 2009-04-27 20:28+0300\n" -"PO-Revision-Date: 2009-04-27 18:49+0200\n" +"POT-Creation-Date: 2009-04-29 20:18+0300\n" +"PO-Revision-Date: 2009-04-29 20:26+0200\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -39,24 +39,24 @@ msgid "DESCRIPTION" msgstr "BESCHREIBUNG" # type: SH -#: davfs2.conf.5:501 mount.davfs.8:508 umount.davfs.8:79 +#: davfs2.conf.5:501 mount.davfs.8:518 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "AUTOREN" # type: SH -#: davfs2.conf.5:507 mount.davfs.8:525 umount.davfs.8:84 +#: davfs2.conf.5:507 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:528 umount.davfs.8:87 +#: davfs2.conf.5:510 mount.davfs.8:538 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "@PACKAGE_BUGREPORT@" # type: SH -#: davfs2.conf.5:512 mount.davfs.8:530 umount.davfs.8:89 +#: davfs2.conf.5:512 mount.davfs.8:540 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" @@ -476,11 +476,37 @@ msgstr "Voreinstellung: normale Benutzer dürfen nicht mounten." # type: TP #: mount.davfs.8:169 #, no-wrap +msgid "B" +msgstr "B" + +# type: Plain text +#: mount.davfs.8:176 +msgid "" +"Like B, but B user is allowed to unmount the file system, not " +"only the mounting user. This is generally not recomended. On systems with " +"no I file with the B option unmounting by the mounting user will " +"fail. In this case the B may be an appropriate work around." +msgstr "" +"Wie B, aber B Benutzer darf das Dateisystem wieder aushängen. " +"Dies wird im Allgemeinen nicht empfohlen. Auf Systemen ohne I-Datei " +"kann der Benutzer bei Verwendung der B-Option das Dateisystem nicht " +"mehr aushängen. In diesem Fall kann die B-Option sinnvoll sein." + +# type: Plain text +#: mount.davfs.8:178 +msgid "Default: only the mounting user is allowed to unmount the file system." +msgstr "" +"Voreinstellung: nur der Benutzer, der das Dateisystem einghängt hat, darf es " +"wieder aushängen." + +# type: TP +#: mount.davfs.8:179 +#, no-wrap msgid "BI" msgstr "BI" # type: Plain text -#: mount.davfs.8:173 +#: mount.davfs.8:183 msgid "" "The owner of the mounted file system. It may be a numeric ID or a user " "name. Only when mounted by root, this may be different from the mounting " @@ -491,18 +517,18 @@ msgstr "" "der Benutzerkennung des Benutzers abweichen, der das Dateisystem einhängt." # type: Plain text -#: mount.davfs.8:175 +#: mount.davfs.8:185 msgid "Default: ID of the mounting user." msgstr "Voreinstellung: Kennung des Benutzers." # type: SH -#: mount.davfs.8:178 +#: mount.davfs.8:188 #, no-wrap msgid "SECURITY POLICY" msgstr "SICHERHEITSREGELN" # type: Plain text -#: mount.davfs.8:183 +#: mount.davfs.8:193 msgid "" "B<@PROGRAM_NAME@> needs root privileges for mounting. But running a daemon, " "that is connected to the internet, with root privileges is a security risk. " @@ -515,7 +541,7 @@ msgstr "" "Hinterdrund wechselt." # type: Plain text -#: mount.davfs.8:188 +#: mount.davfs.8:198 msgid "" "When invoked by root B<@PROGRAM_NAME@> will run as user B<@USER@> and group " "B<@GROUP@>. This may be changed in I<@SYS_CONF_DIR@/@CONFIGFILE@>." @@ -525,7 +551,7 @@ msgstr "" "geändert werden." # type: Plain text -#: mount.davfs.8:192 +#: mount.davfs.8:202 msgid "" "When invoked by an ordinary user it will run with the id of this user and " "with group B<@GROUP@>." @@ -534,7 +560,7 @@ msgstr "" "Benutzerkennung und Gruppe B<@GROUP@>." # type: Plain text -#: mount.davfs.8:198 +#: mount.davfs.8:208 msgid "" "As the file system may be mounted over an insecure internet connection, this " "increases the risk that malicious content may be included in the file " @@ -546,7 +572,7 @@ msgstr "" "B(8)." # type: Plain text -#: mount.davfs.8:203 +#: mount.davfs.8:213 msgid "" "Options B and B will always be set; even root can not change " "this." @@ -555,7 +581,7 @@ msgstr "" "nicht ändern." # type: Plain text -#: mount.davfs.8:207 +#: mount.davfs.8:217 msgid "" "For ordinary users to be able to mount, they must be member of group " "B<@GROUP@> and there must be an entry in I." @@ -565,7 +591,7 @@ msgstr "" "erlaubt werden." # type: Plain text -#: mount.davfs.8:211 +#: mount.davfs.8:221 msgid "" "When mounted by an ordinary user, the mount point must not lie within the " "home directory of another user." @@ -574,7 +600,7 @@ msgstr "" "nicht innerhalb des Home-Verzeichnisses eines anderen Benutzers liegen." # type: Plain text -#: mount.davfs.8:216 +#: mount.davfs.8:226 msgid "" "If in I option B and/or B are given, an ordinary user can " "only mount, if her uid is the one given in option B and he belongs to " @@ -585,7 +611,7 @@ msgstr "" "Benutzerkennung ist und wenn er zur angegebenen Gruppe gehört." # type: Plain text -#: mount.davfs.8:224 +#: mount.davfs.8:234 msgid "" "B If root allows an ordinary user to mount a file system (using " "I) this includes the permission to read the associated B " @@ -602,13 +628,13 @@ msgstr "" "tun, wenn man diese Informationen dem Benutzer auch direkt geben würde." # type: SH -#: mount.davfs.8:225 +#: mount.davfs.8:235 #, no-wrap msgid "URLS AND MOUNT POINTS WITH SPACES" msgstr "URLS UND EINHÄNGEPUNKTE MIT LEERZEICHEN" # type: Plain text -#: mount.davfs.8:230 +#: mount.davfs.8:240 msgid "" "Special characters like spaces in pathnames are a mess. They are interpreted " "differently by different programs and protocols, and there are different " @@ -619,7 +645,7 @@ msgstr "" "unterschiedlich und haben unterschiedliche Escape-Regeln." # type: Plain text -#: mount.davfs.8:236 +#: mount.davfs.8:246 msgid "" "In I spaces must be replaced by a three digit octal escape sequence. " "Write I instead of I and the I<@SECRETSFILE@> files please see the escape " "and quotation rules described in the B<@CONFIGFILE@>(5) man page." @@ -642,18 +668,18 @@ msgstr "" "B<@CONFIGFILE@>(5)-Handbuch beschrieben." # type: Plain text -#: mount.davfs.8:243 +#: mount.davfs.8:253 msgid "On I you must obey the escaping rules of the shell." msgstr "Auf der Kommandozeile müssen die Regeln der Shell beachtet werden." # type: SH -#: mount.davfs.8:245 +#: mount.davfs.8:255 #, no-wrap msgid "CACHING" msgstr "CACHE" # type: Plain text -#: mount.davfs.8:250 +#: mount.davfs.8:260 msgid "" "B<@PROGRAM_NAME@> tries to reduce HTTP-trafic by caching and reusing data. " "Information about directories and files are held in memory, while downloaded " @@ -664,7 +690,7 @@ msgstr "" "gehalten und heruntergeladene Dateien werden auf der Festplatte gespeichert." # type: Plain text -#: mount.davfs.8:258 +#: mount.davfs.8:268 msgid "" "B<@PROGRAM_NAME@> will consider cached information about directories and " "file attributes valid for a configurable time and look up this information " @@ -681,7 +707,7 @@ msgstr "" "es deshalb etwas dauern, bis dies im lokalen Dateisystem sichtbar wird." # type: Plain text -#: mount.davfs.8:264 +#: mount.davfs.8:274 msgid "" "This will not affect the content of files and directory listings. Whenever a " "file is opened, the server is looked up for a newer version of the file. " @@ -694,13 +720,13 @@ msgstr "" "finden sich Hinweise, wie dies angepasst werden kann." # type: SH -#: mount.davfs.8:266 +#: mount.davfs.8:276 #, no-wrap msgid "LOCKS, LOST UPDATE PROBLEM AND BACKUP FILES" msgstr "SPERREN, VERLORENGEGANGENE ÄNDERUNGEN UND BACKUP-DATEIEN" # type: Plain text -#: mount.davfs.8:271 +#: mount.davfs.8:281 msgid "" "WebDAV introduced locks and B<@PROGRAM_NAME@> uses them by default. This " "will in most cases prevent two people from changing the same file in " @@ -711,7 +737,7 @@ msgstr "" "die selbe Datei ändern. Aber nicht immer:" # type: Plain text -#: mount.davfs.8:276 +#: mount.davfs.8:286 msgid "" "You might have disabled locks in I<@SYS_CONF_DIR@/@CONFIGFILE@> or I<~/." "@PACKAGE@/@CONFIGFILE@>." @@ -720,14 +746,14 @@ msgstr "" "die Sperren deaktiviert sein." # type: Plain text -#: mount.davfs.8:279 +#: mount.davfs.8:289 msgid "The server might not support locks (they are not mandatory)." msgstr "" "Möglicherweise unterstützt der Server keine Sperren (sie sind in WevDAV " "nicht zwingend vorgeschrieben)." # type: Plain text -#: mount.davfs.8:283 +#: mount.davfs.8:293 msgid "" "A bad connection might prevent B<@PROGRAM_NAME@> from refreshing the lock in " "time." @@ -736,7 +762,7 @@ msgstr "" "einer Sperre verhindert werden." # type: Plain text -#: mount.davfs.8:287 +#: mount.davfs.8:297 msgid "" "Another WebDAV-client might use your lock (that is not too difficult and " "might even happen without intention)." @@ -745,7 +771,7 @@ msgstr "" "schwierig und könnte auch aus Versehen geschehen)." # type: Plain text -#: mount.davfs.8:295 +#: mount.davfs.8:305 msgid "" "B<@PROGRAM_NAME@> will therefore check if the file has been changed on the " "the server before it uploads a new version. If it finds it impossible to " @@ -760,7 +786,7 @@ msgstr "" "zu überprüfen und entscheiden, was mit diesen Dateien zu tun ist." # type: Plain text -#: mount.davfs.8:303 +#: mount.davfs.8:313 msgid "" "Sometimes locks held by some client on the server will not be released. " "Maybe the client crashes or the network connection fails. When " @@ -780,7 +806,7 @@ msgstr "" "vorgegebenen Zeit erneuert werden." # type: Plain text -#: mount.davfs.8:310 +#: mount.davfs.8:320 msgid "" "WebDAV allows to lock files that don't exist (to protect the name when a " "client intends to create a new file). This locks will be displayed as files " @@ -798,13 +824,13 @@ msgstr "" "webdav.org/cadaver/>E können solche Sperren entfernt werden." # type: SH -#: mount.davfs.8:312 +#: mount.davfs.8:322 #, no-wrap msgid "FILE OWNER AND PERMISSIONS" msgstr "EIGENTÜMER UND DATEIRECHTE" # type: Plain text -#: mount.davfs.8:318 +#: mount.davfs.8:328 msgid "" "B<@PACKAGE@> implements Unix permissions for access control. But changing " "owner and permissions of a file is only B. It is intended as a means " @@ -817,7 +843,7 @@ msgstr "" "Benutzer auf sein Dateisystem zugreifen dürfen." # type: Plain text -#: mount.davfs.8:323 +#: mount.davfs.8:333 msgid "" "The server does not know about this. From the servers point of view there is " "just one user (identified by the credentials) connected. Another WebDAV-" @@ -829,7 +855,7 @@ msgstr "" "lokalen Änderungen an Eigentümer und Dateirechten nichts mit." # type: Plain text -#: mount.davfs.8:329 +#: mount.davfs.8:339 msgid "" "There is one exeption: The B on files is stored as a property " "on the sever. You may think of this property as an information about the " @@ -843,7 +869,7 @@ msgstr "" "lokalen Rechte festgelegt." # type: Plain text -#: mount.davfs.8:335 +#: mount.davfs.8:345 msgid "" "When the file system is unmounted, attributes of cached files (including " "owner and permissions) are stored in cache, as well as the attributs of the " @@ -856,30 +882,30 @@ msgstr "" "enthalten, die im Cache sind." # type: SH -#: mount.davfs.8:337 umount.davfs.8:67 +#: mount.davfs.8:347 umount.davfs.8:67 #, no-wrap msgid "FILES" msgstr "DATEIEN" # type: TP -#: mount.davfs.8:339 +#: mount.davfs.8:349 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CONFIGFILE@>" msgstr "I<@SYS_CONF_DIR@/@CONFIGFILE@>" # type: Plain text -#: mount.davfs.8:342 +#: mount.davfs.8:352 msgid "System wide configuration file." msgstr "Systemweite Konfigurationsdatei." # type: TP -#: mount.davfs.8:343 +#: mount.davfs.8:353 #, no-wrap msgid "I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "I<~/.@PACKAGE@/@CONFIGFILE@>" # type: Plain text -#: mount.davfs.8:348 +#: mount.davfs.8:358 msgid "" "Configuration file in the users home directory.The user configuration takes " "precedence over the system wide configuration. If it does not exist, " @@ -890,13 +916,13 @@ msgstr "" "B<@PROGRAM_NAME@> eine Vorlage an." # type: TP -#: mount.davfs.8:349 +#: mount.davfs.8:359 #, no-wrap msgid "I<@SYS_CONF_DIR@/@SECRETSFILE@>" msgstr "I<@SYS_CONF_DIR@/@SECRETSFILE@>" # type: Plain text -#: mount.davfs.8:354 +#: mount.davfs.8:364 msgid "" "Holds the credentials for WebDAV servers and the proxy, as well as " "decryption passwords for client certificates. The file must be read-writable " @@ -907,13 +933,13 @@ msgstr "" "Schreib- und Leserechte für root haben." # type: TP -#: mount.davfs.8:355 +#: mount.davfs.8:365 #, no-wrap msgid "I<~/.@PACKAGE@/@SECRETSFILE@>" msgstr "I<~/.@PACKAGE@/@SECRETSFILE@>" # type: Plain text -#: mount.davfs.8:365 +#: mount.davfs.8:375 msgid "" "Holds credentials for WebDAV servers and proxy, as well as decryption " "passwords for client certificates. The file must be read-writable by the " @@ -933,13 +959,13 @@ msgstr "" "Vorlage an." # type: TP -#: mount.davfs.8:366 +#: mount.davfs.8:376 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@>" msgstr "I<@SYS_CONF_DIR@/@CERTS_DIR@>" # type: Plain text -#: mount.davfs.8:373 +#: mount.davfs.8:383 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -955,18 +981,18 @@ msgstr "" "konfiguriert werden. Die Zertifikate müssen im PEM-Format vorliegen." # type: Plain text -#: mount.davfs.8:375 mount.davfs.8:384 +#: mount.davfs.8:385 mount.davfs.8:394 msgid "Be sure to verify the certificate." msgstr "Vergiss nicht, das Zertifikat selbst zu prüfen." # type: TP -#: mount.davfs.8:376 +#: mount.davfs.8:386 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@>" msgstr "I<~/.@PACKAGE@/@CERTS_DIR@>" # type: Plain text -#: mount.davfs.8:382 +#: mount.davfs.8:392 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -981,13 +1007,13 @@ msgstr "" "Format vorliegen." # type: TP -#: mount.davfs.8:385 +#: mount.davfs.8:395 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" # type: Plain text -#: mount.davfs.8:391 +#: mount.davfs.8:401 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<@SYS_CONF_DIR@/@CONFIGFILE@> or " @@ -1000,13 +1026,13 @@ msgstr "" "und Ausführungsrecht für root haben." # type: TP -#: mount.davfs.8:392 +#: mount.davfs.8:402 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" # type: Plain text -#: mount.davfs.8:397 +#: mount.davfs.8:407 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<~/.@PACKAGE@/@CONFIGFILE@> to " @@ -1018,13 +1044,13 @@ msgstr "" "haben." # type: TP -#: mount.davfs.8:398 umount.davfs.8:69 +#: mount.davfs.8:408 umount.davfs.8:69 #, no-wrap msgid "I<@SYS_RUN@>" msgstr "I<@SYS_RUN@>" # type: Plain text -#: mount.davfs.8:404 +#: mount.davfs.8:414 msgid "" "PID-files of running mount.davfs processes are stored there. This directory " "must belong to group B<@USER@> with write permissions for the group and the " @@ -1037,13 +1063,13 @@ msgstr "" "vom Einhängepunkt abgeleitet." # type: TP -#: mount.davfs.8:405 +#: mount.davfs.8:415 #, no-wrap msgid "I<@SYS_CACHE_DIR@>" msgstr "I<@SYS_CACHE_DIR@>" # type: Plain text -#: mount.davfs.8:412 +#: mount.davfs.8:422 msgid "" "System wide directory for cached files. Used when the file system is mounted " "by root. It must belong do group B<@USER@> and read, write and execute bits " @@ -1058,13 +1084,13 @@ msgstr "" "URL, dem Einhängepunkt und dem Benutzernamen gebildet." # type: TP -#: mount.davfs.8:413 +#: mount.davfs.8:423 #, no-wrap msgid "I<~/.@PACKAGE@/cache>" msgstr "I<~/.@PACKAGE@/cache>" # type: Plain text -#: mount.davfs.8:417 +#: mount.davfs.8:427 msgid "" "Cache directory in the mounting users home directory. For every mounted " "WebDAV resource a subdirectory is created." @@ -1073,7 +1099,7 @@ msgstr "" "wird ein Unterverzeichnis angelegt." # type: Plain text -#: mount.davfs.8:421 +#: mount.davfs.8:431 msgid "" "B<@PROGRAM_NAME@> will try to create missing directories, but it will B " "touch I<@SYS_CONF_DIR@>." @@ -1082,19 +1108,19 @@ msgstr "" "lässt die Pfoten von I<@SYS_CONF_DIR@>." # type: SH -#: mount.davfs.8:422 +#: mount.davfs.8:432 #, no-wrap msgid "ENVIRONMENT" msgstr "UMGEBUNGSVARIABLEN" # type: TP -#: mount.davfs.8:424 +#: mount.davfs.8:434 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:429 +#: mount.davfs.8:439 msgid "" "If no proxy is defined in the configuration file the value is taken from " "this environment variables. The proxy may be given with or without scheme " @@ -1105,23 +1131,23 @@ msgstr "" "angegeben werden." # type: Plain text -#: mount.davfs.8:431 +#: mount.davfs.8:441 msgid "http_proxy=[http://]foo.bar[:3218]" msgstr "http_proxy=[http://]foo.bar[:3218]" # type: Plain text -#: mount.davfs.8:433 mount.davfs.8:441 +#: mount.davfs.8:443 mount.davfs.8:451 msgid "Only used when the mounting user is root." msgstr "Wird nur benutzt, wenn der Benutzer root das Dateisystem einhängt." # type: TP -#: mount.davfs.8:434 +#: mount.davfs.8:444 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:439 +#: mount.davfs.8:449 msgid "" "A comma separated list of domain names that shall be accessed directly. " "B<*> matches any domain name. A domain name starting with B<.> (period) " @@ -1132,36 +1158,36 @@ msgstr "" "der mit einem Punkt B<.> beginnt, umfasst auch alle Subdomains." # type: Plain text -#: mount.davfs.8:443 +#: mount.davfs.8:453 msgid "Not applied when the proxy is defined in I<@SYS_CONF_DIR@>." msgstr "" "Wird nicht benutzt, wenn der Proxy in I<@SYS_CONF_DIR@> festgelegt wird." # type: SH -#: mount.davfs.8:445 +#: mount.davfs.8:455 #, no-wrap msgid "EXAMPLES" msgstr "BEISPIELE" # type: Plain text -#: mount.davfs.8:448 +#: mount.davfs.8:458 msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:451 +#: mount.davfs.8:461 msgid "To allow an ordinary user to mount there must be an entry in I" msgstr "" "Damit ein normaler Benutzer ein Dateisystem einhängen kann, ist ein Eintrag " "in I nötig." # type: Plain text -#: mount.davfs.8:453 +#: mount.davfs.8:463 msgid "http://webdav.org/dav /media/dav davfs noauto,user 0 0" msgstr "http://webdav.org/dav /media/dav davfs noauto,user 0 0" # type: Plain text -#: mount.davfs.8:458 +#: mount.davfs.8:468 msgid "" "If a proxy must be used this should be configured in I<@SYS_CONF_DIR@/" "@CONFIGFILE@>" @@ -1170,54 +1196,54 @@ msgstr "" "@CONFIGFILE@> konfiguriert werden." # type: Plain text -#: mount.davfs.8:460 +#: mount.davfs.8:470 msgid "proxy proxy.mycompany.com:8080" msgstr "proxy proxy.mycompany.com:8080" # type: Plain text -#: mount.davfs.8:464 +#: mount.davfs.8:474 msgid "Credentials are stored in I" msgstr "" "Die vertraulichen Zugangsdaten für den Server werden in I gespeichert." # type: Plain text -#: mount.davfs.8:466 +#: mount.davfs.8:476 msgid "proxy.mycompany.com filomena \"my secret\"" msgstr "proxy.mycompany.com filomena \"my secret\"" # type: Plain text -#: mount.davfs.8:468 +#: mount.davfs.8:478 msgid "/media/dav webdav-username password" msgstr "/media/dav webdav-username password" # type: Plain text -#: mount.davfs.8:472 +#: mount.davfs.8:482 msgid "Now the WebDAV resource may be mounted by user filomena invoking" msgstr "Jetzt kann Benutzerin filomena das Dateisystem einhängen durch " # type: Plain text -#: mount.davfs.8:474 +#: mount.davfs.8:484 msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:478 +#: mount.davfs.8:488 msgid "and unmounted by user filomena invoking" msgstr "und dieselbe Benutzerin filomena kann es aushängen durch" # type: Plain text -#: mount.davfs.8:480 +#: mount.davfs.8:490 msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:484 +#: mount.davfs.8:494 msgid "B" msgstr "B" # type: Plain text -#: mount.davfs.8:490 +#: mount.davfs.8:500 msgid "" "Mounts the resource I at mount point I, encrypting all traffic with SSL. Credentials for I" @@ -1240,38 +1266,38 @@ msgstr "" "webdav /mount/site>" # type: Plain text -#: mount.davfs.8:496 +#: mount.davfs.8:506 msgid "Mounts the resource I at I." msgstr "" "Die WebDAV-Resource I wird auf I eingehängt." # type: Plain text -#: mount.davfs.8:498 +#: mount.davfs.8:508 msgid "" "B" msgstr "" "B" # type: SH -#: mount.davfs.8:501 umount.davfs.8:74 +#: mount.davfs.8:511 umount.davfs.8:74 #, no-wrap msgid "BUGS" msgstr "FEHLER" # type: Plain text -#: mount.davfs.8:504 +#: mount.davfs.8:514 msgid "B<@PACKAGE@> does not support links." msgstr "B<@PACKAGE@> unterstützt keine Links." # type: Plain text -#: mount.davfs.8:506 +#: mount.davfs.8:516 msgid "A B<@PACKAGE@> file system cannot be moved with I." msgstr "" "Ein B<@PACKAGE@>-Dateisystem kann nicht mit I verschoben " "werden." # type: Plain text -#: mount.davfs.8:512 +#: mount.davfs.8:522 msgid "" "This man page was written by Luciano Bello Eluciano@linux.org.arE " "for Debian, for version 0.2.3 of davfs2." @@ -1280,7 +1306,7 @@ msgstr "" "die Version 0.2.3 von @PACKAGE@ in Debian geschrieben." # type: Plain text -#: mount.davfs.8:516 +#: mount.davfs.8:526 msgid "" "It has been updated for this version by Werner Baumann Ewerner." "baumann@onlinhome.deE." @@ -1289,12 +1315,12 @@ msgstr "" "baumann@onlinehome.deE angepasst." # type: Plain text -#: mount.davfs.8:519 +#: mount.davfs.8:529 msgid "@PACKAGE@ is developed by Sung Kim Ehunkim@gmail.comE." msgstr "@PACKAGE@ wurde von Sung Kim Ehunkim@gmail.comE entwickelt." # type: Plain text -#: mount.davfs.8:523 +#: mount.davfs.8:533 msgid "" "Version 1.0.0 (and later) of @PACKAGE@ is a complete rewrite by Werner " "Baumann." @@ -1303,7 +1329,7 @@ msgstr "" "von Werner Baumann." # type: Plain text -#: mount.davfs.8:536 +#: mount.davfs.8:546 msgid "" "B(8), B<@CONFIGFILE@>(5), B(8), B(8), " "B(5)" diff --git a/man/mount.davfs.8 b/man/mount.davfs.8 index c37bd0e..df5f5f7 100644 --- a/man/mount.davfs.8 +++ b/man/mount.davfs.8 @@ -166,6 +166,16 @@ sense when set in \fIfstab\fP. .br Default: ordinary users are not allowed to mount. +.TP +.B users +Like \fBuser\fR, but \fBany\fR user is allowed to unmount the file system, +not only the mounting user. This is generally not recomended. +On systems with no \fImtab\fP file with the \fBuser\fR option unmounting by +the mounting user will fail. In this case the \fBusers\fR may be an appropriate +work around. +.br +Default: only the mounting user is allowed to unmount the file system. + .TP .B uid=\fIuser\fP The owner of the mounted file system. It may be a numeric ID or a user name. diff --git a/man/mount.davfs.8.pot b/man/mount.davfs.8.pot index 027d34e..b8f4b36 100644 --- a/man/mount.davfs.8.pot +++ b/man/mount.davfs.8.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-04-27 20:28+0300\n" +"POT-Creation-Date: 2009-04-29 20:18+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,24 +40,24 @@ msgid "DESCRIPTION" msgstr "" # type: SH -#: davfs2.conf.5:501 mount.davfs.8:508 umount.davfs.8:79 +#: davfs2.conf.5:501 mount.davfs.8:518 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "" # type: SH -#: davfs2.conf.5:507 mount.davfs.8:525 umount.davfs.8:84 +#: davfs2.conf.5:507 mount.davfs.8:535 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "" # type: Plain text -#: davfs2.conf.5:510 mount.davfs.8:528 umount.davfs.8:87 +#: davfs2.conf.5:510 mount.davfs.8:538 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "" # type: SH -#: davfs2.conf.5:512 mount.davfs.8:530 umount.davfs.8:89 +#: davfs2.conf.5:512 mount.davfs.8:540 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -416,11 +416,31 @@ msgstr "" # type: TP #: mount.davfs.8:169 #, no-wrap +msgid "B" +msgstr "" + +# type: Plain text +#: mount.davfs.8:176 +msgid "" +"Like B, but B user is allowed to unmount the file system, not " +"only the mounting user. This is generally not recomended. On systems with " +"no I file with the B option unmounting by the mounting user will " +"fail. In this case the B may be an appropriate work around." +msgstr "" + +# type: Plain text +#: mount.davfs.8:178 +msgid "Default: only the mounting user is allowed to unmount the file system." +msgstr "" + +# type: TP +#: mount.davfs.8:179 +#, no-wrap msgid "BI" msgstr "" # type: Plain text -#: mount.davfs.8:173 +#: mount.davfs.8:183 msgid "" "The owner of the mounted file system. It may be a numeric ID or a user " "name. Only when mounted by root, this may be different from the mounting " @@ -428,18 +448,18 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:175 +#: mount.davfs.8:185 msgid "Default: ID of the mounting user." msgstr "" # type: SH -#: mount.davfs.8:178 +#: mount.davfs.8:188 #, no-wrap msgid "SECURITY POLICY" msgstr "" # type: Plain text -#: mount.davfs.8:183 +#: mount.davfs.8:193 msgid "" "B<@PROGRAM_NAME@> needs root privileges for mounting. But running a daemon, " "that is connected to the internet, with root privileges is a security risk. " @@ -447,21 +467,21 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:188 +#: mount.davfs.8:198 msgid "" "When invoked by root B<@PROGRAM_NAME@> will run as user B<@USER@> and group " "B<@GROUP@>. This may be changed in I<@SYS_CONF_DIR@/@CONFIGFILE@>." msgstr "" # type: Plain text -#: mount.davfs.8:192 +#: mount.davfs.8:202 msgid "" "When invoked by an ordinary user it will run with the id of this user and " "with group B<@GROUP@>." msgstr "" # type: Plain text -#: mount.davfs.8:198 +#: mount.davfs.8:208 msgid "" "As the file system may be mounted over an insecure internet connection, this " "increases the risk that malicious content may be included in the file " @@ -469,28 +489,28 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:203 +#: mount.davfs.8:213 msgid "" "Options B and B will always be set; even root can not change " "this." msgstr "" # type: Plain text -#: mount.davfs.8:207 +#: mount.davfs.8:217 msgid "" "For ordinary users to be able to mount, they must be member of group " "B<@GROUP@> and there must be an entry in I." msgstr "" # type: Plain text -#: mount.davfs.8:211 +#: mount.davfs.8:221 msgid "" "When mounted by an ordinary user, the mount point must not lie within the " "home directory of another user." msgstr "" # type: Plain text -#: mount.davfs.8:216 +#: mount.davfs.8:226 msgid "" "If in I option B and/or B are given, an ordinary user can " "only mount, if her uid is the one given in option B and he belongs to " @@ -498,7 +518,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:224 +#: mount.davfs.8:234 msgid "" "B If root allows an ordinary user to mount a file system (using " "I) this includes the permission to read the associated B " @@ -509,13 +529,13 @@ msgid "" msgstr "" # type: SH -#: mount.davfs.8:225 +#: mount.davfs.8:235 #, no-wrap msgid "URLS AND MOUNT POINTS WITH SPACES" msgstr "" # type: Plain text -#: mount.davfs.8:230 +#: mount.davfs.8:240 msgid "" "Special characters like spaces in pathnames are a mess. They are interpreted " "differently by different programs and protocols, and there are different " @@ -523,7 +543,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:236 +#: mount.davfs.8:246 msgid "" "In I spaces must be replaced by a three digit octal escape sequence. " "Write I instead of I and the I<@SECRETSFILE@> files please see the escape " "and quotation rules described in the B<@CONFIGFILE@>(5) man page." msgstr "" # type: Plain text -#: mount.davfs.8:243 +#: mount.davfs.8:253 msgid "On I you must obey the escaping rules of the shell." msgstr "" # type: SH -#: mount.davfs.8:245 +#: mount.davfs.8:255 #, no-wrap msgid "CACHING" msgstr "" # type: Plain text -#: mount.davfs.8:250 +#: mount.davfs.8:260 msgid "" "B<@PROGRAM_NAME@> tries to reduce HTTP-trafic by caching and reusing data. " "Information about directories and files are held in memory, while downloaded " @@ -558,7 +578,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:258 +#: mount.davfs.8:268 msgid "" "B<@PROGRAM_NAME@> will consider cached information about directories and " "file attributes valid for a configurable time and look up this information " @@ -569,7 +589,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:264 +#: mount.davfs.8:274 msgid "" "This will not affect the content of files and directory listings. Whenever a " "file is opened, the server is looked up for a newer version of the file. " @@ -578,13 +598,13 @@ msgid "" msgstr "" # type: SH -#: mount.davfs.8:266 +#: mount.davfs.8:276 #, no-wrap msgid "LOCKS, LOST UPDATE PROBLEM AND BACKUP FILES" msgstr "" # type: Plain text -#: mount.davfs.8:271 +#: mount.davfs.8:281 msgid "" "WebDAV introduced locks and B<@PROGRAM_NAME@> uses them by default. This " "will in most cases prevent two people from changing the same file in " @@ -592,33 +612,33 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:276 +#: mount.davfs.8:286 msgid "" "You might have disabled locks in I<@SYS_CONF_DIR@/@CONFIGFILE@> or I<~/." "@PACKAGE@/@CONFIGFILE@>." msgstr "" # type: Plain text -#: mount.davfs.8:279 +#: mount.davfs.8:289 msgid "The server might not support locks (they are not mandatory)." msgstr "" # type: Plain text -#: mount.davfs.8:283 +#: mount.davfs.8:293 msgid "" "A bad connection might prevent B<@PROGRAM_NAME@> from refreshing the lock in " "time." msgstr "" # type: Plain text -#: mount.davfs.8:287 +#: mount.davfs.8:297 msgid "" "Another WebDAV-client might use your lock (that is not too difficult and " "might even happen without intention)." msgstr "" # type: Plain text -#: mount.davfs.8:295 +#: mount.davfs.8:305 msgid "" "B<@PROGRAM_NAME@> will therefore check if the file has been changed on the " "the server before it uploads a new version. If it finds it impossible to " @@ -628,7 +648,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:303 +#: mount.davfs.8:313 msgid "" "Sometimes locks held by some client on the server will not be released. " "Maybe the client crashes or the network connection fails. When " @@ -640,7 +660,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:310 +#: mount.davfs.8:320 msgid "" "WebDAV allows to lock files that don't exist (to protect the name when a " "client intends to create a new file). This locks will be displayed as files " @@ -651,13 +671,13 @@ msgid "" msgstr "" # type: SH -#: mount.davfs.8:312 +#: mount.davfs.8:322 #, no-wrap msgid "FILE OWNER AND PERMISSIONS" msgstr "" # type: Plain text -#: mount.davfs.8:318 +#: mount.davfs.8:328 msgid "" "B<@PACKAGE@> implements Unix permissions for access control. But changing " "owner and permissions of a file is only B. It is intended as a means " @@ -666,7 +686,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:323 +#: mount.davfs.8:333 msgid "" "The server does not know about this. From the servers point of view there is " "just one user (identified by the credentials) connected. Another WebDAV-" @@ -674,7 +694,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:329 +#: mount.davfs.8:339 msgid "" "There is one exeption: The B on files is stored as a property " "on the sever. You may think of this property as an information about the " @@ -683,7 +703,7 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:335 +#: mount.davfs.8:345 msgid "" "When the file system is unmounted, attributes of cached files (including " "owner and permissions) are stored in cache, as well as the attributs of the " @@ -692,30 +712,30 @@ msgid "" msgstr "" # type: SH -#: mount.davfs.8:337 umount.davfs.8:67 +#: mount.davfs.8:347 umount.davfs.8:67 #, no-wrap msgid "FILES" msgstr "" # type: TP -#: mount.davfs.8:339 +#: mount.davfs.8:349 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CONFIGFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:342 +#: mount.davfs.8:352 msgid "System wide configuration file." msgstr "" # type: TP -#: mount.davfs.8:343 +#: mount.davfs.8:353 #, no-wrap msgid "I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:348 +#: mount.davfs.8:358 msgid "" "Configuration file in the users home directory.The user configuration takes " "precedence over the system wide configuration. If it does not exist, " @@ -723,13 +743,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:349 +#: mount.davfs.8:359 #, no-wrap msgid "I<@SYS_CONF_DIR@/@SECRETSFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:354 +#: mount.davfs.8:364 msgid "" "Holds the credentials for WebDAV servers and the proxy, as well as " "decryption passwords for client certificates. The file must be read-writable " @@ -737,13 +757,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:355 +#: mount.davfs.8:365 #, no-wrap msgid "I<~/.@PACKAGE@/@SECRETSFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:365 +#: mount.davfs.8:375 msgid "" "Holds credentials for WebDAV servers and proxy, as well as decryption " "passwords for client certificates. The file must be read-writable by the " @@ -755,13 +775,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:366 +#: mount.davfs.8:376 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:373 +#: mount.davfs.8:383 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -771,18 +791,18 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:375 mount.davfs.8:384 +#: mount.davfs.8:385 mount.davfs.8:394 msgid "Be sure to verify the certificate." msgstr "" # type: TP -#: mount.davfs.8:376 +#: mount.davfs.8:386 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:382 +#: mount.davfs.8:392 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -791,13 +811,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:385 +#: mount.davfs.8:395 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:391 +#: mount.davfs.8:401 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<@SYS_CONF_DIR@/@CONFIGFILE@> or " @@ -806,13 +826,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:392 +#: mount.davfs.8:402 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:397 +#: mount.davfs.8:407 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<~/.@PACKAGE@/@CONFIGFILE@> to " @@ -820,13 +840,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:398 umount.davfs.8:69 +#: mount.davfs.8:408 umount.davfs.8:69 #, no-wrap msgid "I<@SYS_RUN@>" msgstr "" # type: Plain text -#: mount.davfs.8:404 +#: mount.davfs.8:414 msgid "" "PID-files of running mount.davfs processes are stored there. This directory " "must belong to group B<@USER@> with write permissions for the group and the " @@ -835,13 +855,13 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:405 +#: mount.davfs.8:415 #, no-wrap msgid "I<@SYS_CACHE_DIR@>" msgstr "" # type: Plain text -#: mount.davfs.8:412 +#: mount.davfs.8:422 msgid "" "System wide directory for cached files. Used when the file system is mounted " "by root. It must belong do group B<@USER@> and read, write and execute bits " @@ -851,39 +871,39 @@ msgid "" msgstr "" # type: TP -#: mount.davfs.8:413 +#: mount.davfs.8:423 #, no-wrap msgid "I<~/.@PACKAGE@/cache>" msgstr "" # type: Plain text -#: mount.davfs.8:417 +#: mount.davfs.8:427 msgid "" "Cache directory in the mounting users home directory. For every mounted " "WebDAV resource a subdirectory is created." msgstr "" # type: Plain text -#: mount.davfs.8:421 +#: mount.davfs.8:431 msgid "" "B<@PROGRAM_NAME@> will try to create missing directories, but it will B " "touch I<@SYS_CONF_DIR@>." msgstr "" # type: SH -#: mount.davfs.8:422 +#: mount.davfs.8:432 #, no-wrap msgid "ENVIRONMENT" msgstr "" # type: TP -#: mount.davfs.8:424 +#: mount.davfs.8:434 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:429 +#: mount.davfs.8:439 msgid "" "If no proxy is defined in the configuration file the value is taken from " "this environment variables. The proxy may be given with or without scheme " @@ -891,23 +911,23 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:431 +#: mount.davfs.8:441 msgid "http_proxy=[http://]foo.bar[:3218]" msgstr "" # type: Plain text -#: mount.davfs.8:433 mount.davfs.8:441 +#: mount.davfs.8:443 mount.davfs.8:451 msgid "Only used when the mounting user is root." msgstr "" # type: TP -#: mount.davfs.8:434 +#: mount.davfs.8:444 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:439 +#: mount.davfs.8:449 msgid "" "A comma separated list of domain names that shall be accessed directly. " "B<*> matches any domain name. A domain name starting with B<.> (period) " @@ -915,85 +935,85 @@ msgid "" msgstr "" # type: Plain text -#: mount.davfs.8:443 +#: mount.davfs.8:453 msgid "Not applied when the proxy is defined in I<@SYS_CONF_DIR@>." msgstr "" # type: SH -#: mount.davfs.8:445 +#: mount.davfs.8:455 #, no-wrap msgid "EXAMPLES" msgstr "" # type: Plain text -#: mount.davfs.8:448 +#: mount.davfs.8:458 msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:451 +#: mount.davfs.8:461 msgid "To allow an ordinary user to mount there must be an entry in I" msgstr "" # type: Plain text -#: mount.davfs.8:453 +#: mount.davfs.8:463 msgid "http://webdav.org/dav /media/dav davfs noauto,user 0 0" msgstr "" # type: Plain text -#: mount.davfs.8:458 +#: mount.davfs.8:468 msgid "" "If a proxy must be used this should be configured in I<@SYS_CONF_DIR@/" "@CONFIGFILE@>" msgstr "" # type: Plain text -#: mount.davfs.8:460 +#: mount.davfs.8:470 msgid "proxy proxy.mycompany.com:8080" msgstr "" # type: Plain text -#: mount.davfs.8:464 +#: mount.davfs.8:474 msgid "Credentials are stored in I" msgstr "" # type: Plain text -#: mount.davfs.8:466 +#: mount.davfs.8:476 msgid "proxy.mycompany.com filomena \"my secret\"" msgstr "" # type: Plain text -#: mount.davfs.8:468 +#: mount.davfs.8:478 msgid "/media/dav webdav-username password" msgstr "" # type: Plain text -#: mount.davfs.8:472 +#: mount.davfs.8:482 msgid "Now the WebDAV resource may be mounted by user filomena invoking" msgstr "" # type: Plain text -#: mount.davfs.8:474 +#: mount.davfs.8:484 msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:478 +#: mount.davfs.8:488 msgid "and unmounted by user filomena invoking" msgstr "" # type: Plain text -#: mount.davfs.8:480 +#: mount.davfs.8:490 msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:484 +#: mount.davfs.8:494 msgid "B" msgstr "" # type: Plain text -#: mount.davfs.8:490 +#: mount.davfs.8:500 msgid "" "Mounts the resource I at mount point I, encrypting all traffic with SSL. Credentials for I" msgstr "" # type: Plain text -#: mount.davfs.8:496 +#: mount.davfs.8:506 msgid "Mounts the resource I at I." msgstr "" # type: Plain text -#: mount.davfs.8:498 +#: mount.davfs.8:508 msgid "" "B" msgstr "" # type: SH -#: mount.davfs.8:501 umount.davfs.8:74 +#: mount.davfs.8:511 umount.davfs.8:74 #, no-wrap msgid "BUGS" msgstr "" # type: Plain text -#: mount.davfs.8:504 +#: mount.davfs.8:514 msgid "B<@PACKAGE@> does not support links." msgstr "" # type: Plain text -#: mount.davfs.8:506 +#: mount.davfs.8:516 msgid "A B<@PACKAGE@> file system cannot be moved with I." msgstr "" # type: Plain text -#: mount.davfs.8:512 +#: mount.davfs.8:522 msgid "" "This man page was written by Luciano Bello Eluciano@linux.org.arE " "for Debian, for version 0.2.3 of davfs2." msgstr "" # type: Plain text -#: mount.davfs.8:516 +#: mount.davfs.8:526 msgid "" "It has been updated for this version by Werner Baumann Ewerner." "baumann@onlinhome.deE." msgstr "" # type: Plain text -#: mount.davfs.8:519 +#: mount.davfs.8:529 msgid "@PACKAGE@ is developed by Sung Kim Ehunkim@gmail.comE." msgstr "" # type: Plain text -#: mount.davfs.8:523 +#: mount.davfs.8:533 msgid "" "Version 1.0.0 (and later) of @PACKAGE@ is a complete rewrite by Werner " "Baumann." msgstr "" # type: Plain text -#: mount.davfs.8:536 +#: mount.davfs.8:546 msgid "" "B(8), B<@CONFIGFILE@>(5), B(8), B(8), " "B(5)" diff --git a/po/cs.po b/po/cs.po index 27a165a..4d4bbb4 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-04-27 20:29+0200\n" +"POT-Creation-Date: 2009-04-29 20:18+0200\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -72,9 +72,9 @@ msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" #: src/cache.c:2688 src/mount_davfs.c:591 src/mount_davfs.c:593 -#: src/mount_davfs.c:765 src/mount_davfs.c:767 src/mount_davfs.c:773 -#: src/mount_davfs.c:813 src/mount_davfs.c:815 src/mount_davfs.c:832 -#: src/mount_davfs.c:834 src/mount_davfs.c:1672 src/mount_davfs.c:1674 +#: src/mount_davfs.c:772 src/mount_davfs.c:774 src/mount_davfs.c:780 +#: src/mount_davfs.c:820 src/mount_davfs.c:822 src/mount_davfs.c:839 +#: src/mount_davfs.c:841 src/mount_davfs.c:1684 src/mount_davfs.c:1686 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" @@ -200,7 +200,7 @@ msgid "unmounting failed" msgstr "odpojení selhalo" #: src/mount_davfs.c:431 src/mount_davfs.c:494 src/mount_davfs.c:577 -#: src/mount_davfs.c:837 +#: src/mount_davfs.c:844 #, c-format msgid "group %s does not exist" msgstr "skupina %s neexistuje" @@ -235,7 +235,7 @@ msgstr "nemohu změnit oprávnění (mode) adresáře %s" msgid "can't change group of directory %s" msgstr "nemohu změnit skupinu adresáře %s" -#: src/mount_davfs.c:610 src/mount_davfs.c:818 +#: src/mount_davfs.c:610 src/mount_davfs.c:825 msgid "can't read group data base" msgstr "nemohu přečíst údaje o skupinách" @@ -280,61 +280,71 @@ msgstr "v %s je jiný souborový systém" msgid "different config file in %s" msgstr "v %s je jiný konfigurační soubor" -#: src/mount_davfs.c:703 -#, c-format -msgid "option `user' not set in %s" +#: src/mount_davfs.c:704 +#, 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:707 +#, fuzzy, c-format +msgid "different option `user' in %s" +msgstr "v %s jsou jiné parametry připojení" + +#: src/mount_davfs.c:709 +#, fuzzy, c-format +msgid "different option `users' in %s" +msgstr "v %s jsou jiné parametry připojení" + +#: src/mount_davfs.c:712 #, c-format msgid "different mount options in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:708 +#: src/mount_davfs.c:715 #, c-format msgid "different uid in %s" msgstr "v %s je odlišné uid" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:717 #, c-format msgid "different gid in %s" msgstr "v %s je odlišné gid" -#: src/mount_davfs.c:712 +#: src/mount_davfs.c:719 #, c-format msgid "different dir_mode in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:721 #, c-format msgid "different file_mode in %s" msgstr "v %s je odlišný file_mode" -#: src/mount_davfs.c:742 +#: src/mount_davfs.c:749 #, 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:747 +#: src/mount_davfs.c:754 #, c-format msgid "can't get home directory for uid %i" msgstr "nemohu zjistit domovský adresář pro uid %i" -#: src/mount_davfs.c:749 +#: src/mount_davfs.c:756 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:757 +#: src/mount_davfs.c:764 #, c-format msgid "invalid mount point %s" msgstr "neplatný přípojný bod %s" -#: src/mount_davfs.c:760 +#: src/mount_davfs.c:767 #, c-format msgid "mount point %s does not exist" msgstr "přípojný bod %s neexistuje" -#: src/mount_davfs.c:778 +#: src/mount_davfs.c:785 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -343,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:806 +#: src/mount_davfs.c:813 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:824 +#: src/mount_davfs.c:831 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:844 +#: src/mount_davfs.c:851 #, 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:867 +#: src/mount_davfs.c:874 #, c-format msgid "can't mount %s on %s" msgstr "není možno připojit %s do %s" -#: src/mount_davfs.c:869 +#: src/mount_davfs.c:876 #, c-format msgid "kernel does not know file system %s" msgstr "kernel nezná souborový systém %s" -#: src/mount_davfs.c:871 +#: src/mount_davfs.c:878 msgid "mount point is busy" msgstr "přípojný bod je zaneprázdněn" -#: src/mount_davfs.c:933 src/umount_davfs.c:88 +#: src/mount_davfs.c:940 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -381,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:949 src/umount_davfs.c:113 +#: src/mount_davfs.c:956 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:958 src/umount_davfs.c:119 +#: src/mount_davfs.c:965 src/umount_davfs.c:119 msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:971 src/umount_davfs.c:121 +#: src/mount_davfs.c:978 src/umount_davfs.c:121 msgid "too many arguments" msgstr "příliš mnoho argumentů" -#: src/mount_davfs.c:977 +#: src/mount_davfs.c:984 msgid "no mountpoint specified" msgstr "nebyl zadán žádný přípojný bod" -#: src/mount_davfs.c:982 +#: src/mount_davfs.c:989 msgid "no WebDAV-server specified" msgstr "nebyl zadán žádný WebDAV server" -#: src/mount_davfs.c:985 +#: src/mount_davfs.c:992 msgid "invalid URL" msgstr "neplatné URL" -#: src/mount_davfs.c:1004 +#: src/mount_davfs.c:1011 msgid "can't determine home directory" msgstr "nelze určit domovský adresář" -#: src/mount_davfs.c:1082 src/webdav.c:387 +#: src/mount_davfs.c:1089 src/webdav.c:387 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:1087 +#: src/mount_davfs.c:1094 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:1093 +#: src/mount_davfs.c:1100 #, 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:1136 +#: src/mount_davfs.c:1143 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -434,11 +444,11 @@ msgstr "" "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1138 src/mount_davfs.c:1154 +#: src/mount_davfs.c:1145 src/mount_davfs.c:1161 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1142 +#: src/mount_davfs.c:1149 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -447,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:1144 src/mount_davfs.c:1160 src/webdav.c:394 +#: src/mount_davfs.c:1151 src/mount_davfs.c:1167 src/webdav.c:394 msgid "Password: " msgstr "Heslo: " -#: src/mount_davfs.c:1152 +#: src/mount_davfs.c:1159 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -461,7 +471,7 @@ msgstr "" "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1158 +#: src/mount_davfs.c:1165 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -470,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:1207 +#: src/mount_davfs.c:1214 #, c-format msgid "pid %i, got signal %i" msgstr "pid %i dostal signál %i" -#: src/mount_davfs.c:1239 +#: src/mount_davfs.c:1246 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -483,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:1256 +#: src/mount_davfs.c:1263 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:1282 +#: src/mount_davfs.c:1289 #, 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:1285 +#: src/mount_davfs.c:1292 #, 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:1288 +#: src/mount_davfs.c:1295 #, 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:1546 +#: src/mount_davfs.c:1555 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1634 +#: src/mount_davfs.c:1646 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2087 src/mount_davfs.c:2308 src/mount_davfs.c:2320 +#: src/mount_davfs.c:2100 src/mount_davfs.c:2321 src/mount_davfs.c:2333 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:2108 src/mount_davfs.c:2148 src/mount_davfs.c:2235 -#: src/mount_davfs.c:2336 src/mount_davfs.c:2401 +#: src/mount_davfs.c:2121 src/mount_davfs.c:2161 src/mount_davfs.c:2248 +#: src/mount_davfs.c:2349 src/mount_davfs.c:2414 msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2216 src/mount_davfs.c:2229 +#: src/mount_davfs.c:2229 src/mount_davfs.c:2242 msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2312 +#: src/mount_davfs.c:2325 #, c-format msgid "file %s has wrong owner" msgstr "soubor %s má chybného vlastníka" -#: src/mount_davfs.c:2315 +#: src/mount_davfs.c:2328 #, c-format msgid "file %s has wrong permissions" msgstr "soubor %s má chybná oprávnění" -#: src/mount_davfs.c:2539 +#: src/mount_davfs.c:2552 #, c-format msgid "" "Usage:\n" @@ -551,7 +561,7 @@ msgstr "" " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2543 +#: src/mount_davfs.c:2556 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -560,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:2545 +#: src/mount_davfs.c:2558 #, c-format msgid "" " mount : or\n" @@ -571,7 +581,7 @@ msgstr "" " mount : připojí zdroj WebDAV tak, jak je zadáno\n" " v /etc/fstab.\n" -#: src/mount_davfs.c:2548 +#: src/mount_davfs.c:2561 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -588,7 +598,7 @@ msgstr "" " označuje seznam voleb oddělených čárkou.\n" "\n" -#: src/mount_davfs.c:2553 +#: src/mount_davfs.c:2566 #, c-format msgid "" "Recognised options:\n" @@ -607,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:2559 +#: src/mount_davfs.c:2572 #, c-format msgid "" " ro : mount read-only\n" diff --git a/po/davfs2.pot b/po/davfs2.pot index 86d49de..26e08a6 100644 --- a/po/davfs2.pot +++ b/po/davfs2.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-04-27 20:29+0200\n" +"POT-Creation-Date: 2009-04-29 20:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,9 +67,9 @@ msgid "error writing directory %s" msgstr "" #: src/cache.c:2688 src/mount_davfs.c:591 src/mount_davfs.c:593 -#: src/mount_davfs.c:765 src/mount_davfs.c:767 src/mount_davfs.c:773 -#: src/mount_davfs.c:813 src/mount_davfs.c:815 src/mount_davfs.c:832 -#: src/mount_davfs.c:834 src/mount_davfs.c:1672 src/mount_davfs.c:1674 +#: src/mount_davfs.c:772 src/mount_davfs.c:774 src/mount_davfs.c:780 +#: src/mount_davfs.c:820 src/mount_davfs.c:822 src/mount_davfs.c:839 +#: src/mount_davfs.c:841 src/mount_davfs.c:1684 src/mount_davfs.c:1686 msgid "can't read user data base" msgstr "" @@ -194,7 +194,7 @@ msgid "unmounting failed" msgstr "" #: src/mount_davfs.c:431 src/mount_davfs.c:494 src/mount_davfs.c:577 -#: src/mount_davfs.c:837 +#: src/mount_davfs.c:844 #, c-format msgid "group %s does not exist" msgstr "" @@ -229,7 +229,7 @@ msgstr "" msgid "can't change group of directory %s" msgstr "" -#: src/mount_davfs.c:610 src/mount_davfs.c:818 +#: src/mount_davfs.c:610 src/mount_davfs.c:825 msgid "can't read group data base" msgstr "" @@ -271,246 +271,256 @@ msgstr "" msgid "different config file in %s" msgstr "" -#: src/mount_davfs.c:703 +#: src/mount_davfs.c:704 #, c-format -msgid "option `user' not set in %s" +msgid "neither option `user' nor option `users' set in %s" msgstr "" -#: src/mount_davfs.c:705 +#: src/mount_davfs.c:707 #, c-format -msgid "different mount options in %s" +msgid "different option `user' in %s" msgstr "" -#: src/mount_davfs.c:708 +#: src/mount_davfs.c:709 #, c-format -msgid "different uid in %s" -msgstr "" - -#: src/mount_davfs.c:710 -#, c-format -msgid "different gid in %s" +msgid "different option `users' in %s" msgstr "" #: src/mount_davfs.c:712 #, c-format +msgid "different mount options in %s" +msgstr "" + +#: src/mount_davfs.c:715 +#, c-format +msgid "different uid in %s" +msgstr "" + +#: src/mount_davfs.c:717 +#, c-format +msgid "different gid in %s" +msgstr "" + +#: src/mount_davfs.c:719 +#, c-format msgid "different dir_mode in %s" msgstr "" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:721 #, c-format msgid "different file_mode in %s" msgstr "" -#: src/mount_davfs.c:742 +#: src/mount_davfs.c:749 #, c-format msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:747 +#: src/mount_davfs.c:754 #, c-format msgid "can't get home directory for uid %i" msgstr "" -#: src/mount_davfs.c:749 +#: src/mount_davfs.c:756 msgid "A relative mount point must lie within your home directory" msgstr "" -#: src/mount_davfs.c:757 +#: src/mount_davfs.c:764 #, c-format msgid "invalid mount point %s" msgstr "" -#: src/mount_davfs.c:760 +#: src/mount_davfs.c:767 #, c-format msgid "mount point %s does not exist" msgstr "" -#: src/mount_davfs.c:778 +#: src/mount_davfs.c:785 #, 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:806 +#: src/mount_davfs.c:813 msgid "you can't set file owner different from your uid" msgstr "" -#: src/mount_davfs.c:824 +#: src/mount_davfs.c:831 msgid "you must be member of the group of the file system" msgstr "" -#: src/mount_davfs.c:844 +#: src/mount_davfs.c:851 #, c-format msgid "user %s must be member of group %s" msgstr "" -#: src/mount_davfs.c:867 +#: src/mount_davfs.c:874 #, c-format msgid "can't mount %s on %s" msgstr "" -#: src/mount_davfs.c:869 +#: src/mount_davfs.c:876 #, c-format msgid "kernel does not know file system %s" msgstr "" -#: src/mount_davfs.c:871 +#: src/mount_davfs.c:878 msgid "mount point is busy" msgstr "" -#: src/mount_davfs.c:933 src/umount_davfs.c:88 +#: src/mount_davfs.c:940 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:949 src/umount_davfs.c:113 +#: src/mount_davfs.c:956 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:958 src/umount_davfs.c:119 +#: src/mount_davfs.c:965 src/umount_davfs.c:119 msgid "missing argument" msgstr "" -#: src/mount_davfs.c:971 src/umount_davfs.c:121 +#: src/mount_davfs.c:978 src/umount_davfs.c:121 msgid "too many arguments" msgstr "" -#: src/mount_davfs.c:977 +#: src/mount_davfs.c:984 msgid "no mountpoint specified" msgstr "" -#: src/mount_davfs.c:982 +#: src/mount_davfs.c:989 msgid "no WebDAV-server specified" msgstr "" -#: src/mount_davfs.c:985 +#: src/mount_davfs.c:992 msgid "invalid URL" msgstr "" -#: src/mount_davfs.c:1004 +#: src/mount_davfs.c:1011 msgid "can't determine home directory" msgstr "" -#: src/mount_davfs.c:1082 src/webdav.c:387 +#: src/mount_davfs.c:1089 src/webdav.c:387 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:1087 +#: src/mount_davfs.c:1094 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:1093 +#: src/mount_davfs.c:1100 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:1136 +#: src/mount_davfs.c:1143 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1138 src/mount_davfs.c:1154 +#: src/mount_davfs.c:1145 src/mount_davfs.c:1161 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1142 +#: src/mount_davfs.c:1149 #, 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:1144 src/mount_davfs.c:1160 src/webdav.c:394 +#: src/mount_davfs.c:1151 src/mount_davfs.c:1167 src/webdav.c:394 msgid "Password: " msgstr "" -#: src/mount_davfs.c:1152 +#: src/mount_davfs.c:1159 #, c-format msgid "" "Please enter the username to authenticate with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1158 +#: src/mount_davfs.c:1165 #, 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:1207 +#: src/mount_davfs.c:1214 #, c-format msgid "pid %i, got signal %i" msgstr "" -#: src/mount_davfs.c:1239 +#: src/mount_davfs.c:1246 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." msgstr "" -#: src/mount_davfs.c:1256 +#: src/mount_davfs.c:1263 msgid "" "Warning: can't write entry into mtab, but will mount the file system anyway" msgstr "" -#: src/mount_davfs.c:1282 +#: src/mount_davfs.c:1289 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "" -#: src/mount_davfs.c:1285 +#: src/mount_davfs.c:1292 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "" -#: src/mount_davfs.c:1288 +#: src/mount_davfs.c:1295 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "" -#: src/mount_davfs.c:1546 +#: src/mount_davfs.c:1555 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1634 +#: src/mount_davfs.c:1646 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2087 src/mount_davfs.c:2308 src/mount_davfs.c:2320 +#: src/mount_davfs.c:2100 src/mount_davfs.c:2321 src/mount_davfs.c:2333 #, c-format msgid "opening %s failed" msgstr "" -#: src/mount_davfs.c:2108 src/mount_davfs.c:2148 src/mount_davfs.c:2235 -#: src/mount_davfs.c:2336 src/mount_davfs.c:2401 +#: src/mount_davfs.c:2121 src/mount_davfs.c:2161 src/mount_davfs.c:2248 +#: src/mount_davfs.c:2349 src/mount_davfs.c:2414 msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2216 src/mount_davfs.c:2229 +#: src/mount_davfs.c:2229 src/mount_davfs.c:2242 msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2312 +#: src/mount_davfs.c:2325 #, c-format msgid "file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:2315 +#: src/mount_davfs.c:2328 #, c-format msgid "file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2539 +#: src/mount_davfs.c:2552 #, c-format msgid "" "Usage:\n" @@ -519,14 +529,14 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2543 +#: src/mount_davfs.c:2556 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2545 +#: src/mount_davfs.c:2558 #, c-format msgid "" " mount : or\n" @@ -534,7 +544,7 @@ msgid "" " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2548 +#: src/mount_davfs.c:2561 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -545,7 +555,7 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2553 +#: src/mount_davfs.c:2566 #, c-format msgid "" "Recognised options:\n" @@ -556,7 +566,7 @@ msgid "" " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2559 +#: src/mount_davfs.c:2572 #, c-format msgid "" " ro : mount read-only\n" diff --git a/po/de.po b/po/de.po index ccf4830..616324e 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: davfs2 1.3.3\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2009-04-27 20:29+0200\n" +"POT-Creation-Date: 2009-04-29 20:18+0200\n" "PO-Revision-Date: 2009-01-02 12:26+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -72,9 +72,9 @@ msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" #: src/cache.c:2688 src/mount_davfs.c:591 src/mount_davfs.c:593 -#: src/mount_davfs.c:765 src/mount_davfs.c:767 src/mount_davfs.c:773 -#: src/mount_davfs.c:813 src/mount_davfs.c:815 src/mount_davfs.c:832 -#: src/mount_davfs.c:834 src/mount_davfs.c:1672 src/mount_davfs.c:1674 +#: src/mount_davfs.c:772 src/mount_davfs.c:774 src/mount_davfs.c:780 +#: src/mount_davfs.c:820 src/mount_davfs.c:822 src/mount_davfs.c:839 +#: src/mount_davfs.c:841 src/mount_davfs.c:1684 src/mount_davfs.c:1686 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" @@ -202,7 +202,7 @@ msgid "unmounting failed" msgstr "das Aushängen schlug fehl" #: src/mount_davfs.c:431 src/mount_davfs.c:494 src/mount_davfs.c:577 -#: src/mount_davfs.c:837 +#: src/mount_davfs.c:844 #, c-format msgid "group %s does not exist" msgstr "die Gruppe %s existiert nicht" @@ -237,7 +237,7 @@ msgstr "kann die Rechte des Verzeichnisses %s nicht ändern" msgid "can't change group of directory %s" msgstr "kann die Gruppenkennung des Verneichnisses %s nicht ändern" -#: src/mount_davfs.c:610 src/mount_davfs.c:818 +#: src/mount_davfs.c:610 src/mount_davfs.c:825 msgid "can't read group data base" msgstr "kann die Gruppendatenbank nicht lesen" @@ -282,61 +282,71 @@ msgstr "in %s ist ein anderer Dateisystemtyp angegeben" msgid "different config file in %s" msgstr "in %s ist eine andere Konfigurationsdatei angegeben" -#: src/mount_davfs.c:703 +#: src/mount_davfs.c:704 #, c-format -msgid "option `user' not set in %s" -msgstr "in %s ist die Option „user” nicht angegeben" +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:707 +#, c-format +msgid "different option `user' in %s" +msgstr "in %s ist die Option „user” anders gesetzt" + +#: src/mount_davfs.c:709 +#, c-format +msgid "different option `users' in %s" +msgstr "in %s ist die Option „users” anders gesetzt" + +#: src/mount_davfs.c:712 #, c-format msgid "different mount options in %s" msgstr "in %s sind andere Mount-Optionen angegeben" -#: src/mount_davfs.c:708 +#: src/mount_davfs.c:715 #, c-format msgid "different uid in %s" msgstr "in %s ist eine andere uid angegeben" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:717 #, c-format msgid "different gid in %s" msgstr "in %s ist eine andere gid angegeben" -#: src/mount_davfs.c:712 +#: src/mount_davfs.c:719 #, c-format msgid "different dir_mode in %s" msgstr "in %s ist ein anderer dir_mode angegeben" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:721 #, c-format msgid "different file_mode in %s" msgstr "in %s ist ein anderer file_mode angegeben" -#: src/mount_davfs.c:742 +#: src/mount_davfs.c:749 #, 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:747 +#: src/mount_davfs.c:754 #, 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:749 +#: src/mount_davfs.c:756 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:757 +#: src/mount_davfs.c:764 #, c-format msgid "invalid mount point %s" msgstr "der Einhängepunkt %s ist nicht erlaubt" -#: src/mount_davfs.c:760 +#: src/mount_davfs.c:767 #, c-format msgid "mount point %s does not exist" msgstr "der Einhängepunkt %s existiert nicht" -#: src/mount_davfs.c:778 +#: src/mount_davfs.c:785 #, c-format msgid "" "%s is the home directory of user %s.\n" @@ -345,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:806 +#: src/mount_davfs.c:813 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:824 +#: src/mount_davfs.c:831 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:844 +#: src/mount_davfs.c:851 #, 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:867 +#: src/mount_davfs.c:874 #, c-format msgid "can't mount %s on %s" msgstr "kann %s nicht auf %s einhängen" -#: src/mount_davfs.c:869 +#: src/mount_davfs.c:876 #, c-format msgid "kernel does not know file system %s" msgstr "der Kernel kenn das Dateisystem %s nicht" -#: src/mount_davfs.c:871 +#: src/mount_davfs.c:878 msgid "mount point is busy" msgstr "das Einhängepunkt wird anderweitig benutzt" -#: src/mount_davfs.c:933 src/umount_davfs.c:88 +#: src/mount_davfs.c:940 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -385,54 +395,54 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:949 src/umount_davfs.c:113 +#: src/mount_davfs.c:956 src/umount_davfs.c:113 msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:958 src/umount_davfs.c:119 +#: src/mount_davfs.c:965 src/umount_davfs.c:119 msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:971 src/umount_davfs.c:121 +#: src/mount_davfs.c:978 src/umount_davfs.c:121 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/mount_davfs.c:977 +#: src/mount_davfs.c:984 msgid "no mountpoint specified" msgstr "es wurde kein Einhängepunkt angegeben" -#: src/mount_davfs.c:982 +#: src/mount_davfs.c:989 msgid "no WebDAV-server specified" msgstr "es wurde kein WebDAV-Server angegeben" -#: src/mount_davfs.c:985 +#: src/mount_davfs.c:992 msgid "invalid URL" msgstr "die URL ist ungültig" -#: src/mount_davfs.c:1004 +#: src/mount_davfs.c:1011 msgid "can't determine home directory" msgstr "kann das Home-Verzeichnis nicht ermitteln" -#: src/mount_davfs.c:1082 src/webdav.c:387 +#: src/mount_davfs.c:1089 src/webdav.c:387 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:1087 +#: src/mount_davfs.c:1094 #, 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:1093 +#: src/mount_davfs.c:1100 #, 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:1136 +#: src/mount_davfs.c:1143 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -441,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:1138 src/mount_davfs.c:1154 +#: src/mount_davfs.c:1145 src/mount_davfs.c:1161 msgid "Username:" msgstr "Benutzername:" -#: src/mount_davfs.c:1142 +#: src/mount_davfs.c:1149 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -454,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:1144 src/mount_davfs.c:1160 src/webdav.c:394 +#: src/mount_davfs.c:1151 src/mount_davfs.c:1167 src/webdav.c:394 msgid "Password: " msgstr "Passwort:" -#: src/mount_davfs.c:1152 +#: src/mount_davfs.c:1159 #, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -467,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:1158 +#: src/mount_davfs.c:1165 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -476,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:1207 +#: src/mount_davfs.c:1214 #, c-format msgid "pid %i, got signal %i" msgstr "PID %i, erhielt Signal %i" -#: src/mount_davfs.c:1239 +#: src/mount_davfs.c:1246 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -489,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:1256 +#: src/mount_davfs.c:1263 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:1282 +#: src/mount_davfs.c:1289 #, 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:1285 +#: src/mount_davfs.c:1292 #, 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:1288 +#: src/mount_davfs.c:1295 #, 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:1546 +#: src/mount_davfs.c:1555 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1634 +#: src/mount_davfs.c:1646 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2087 src/mount_davfs.c:2308 src/mount_davfs.c:2320 +#: src/mount_davfs.c:2100 src/mount_davfs.c:2321 src/mount_davfs.c:2333 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: src/mount_davfs.c:2108 src/mount_davfs.c:2148 src/mount_davfs.c:2235 -#: src/mount_davfs.c:2336 src/mount_davfs.c:2401 +#: src/mount_davfs.c:2121 src/mount_davfs.c:2161 src/mount_davfs.c:2248 +#: src/mount_davfs.c:2349 src/mount_davfs.c:2414 msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2216 src/mount_davfs.c:2229 +#: src/mount_davfs.c:2229 src/mount_davfs.c:2242 msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2312 +#: src/mount_davfs.c:2325 #, c-format msgid "file %s has wrong owner" msgstr "die Datei %s hat den falschen Besitzer" -#: src/mount_davfs.c:2315 +#: src/mount_davfs.c:2328 #, c-format msgid "file %s has wrong permissions" msgstr "die Dateirechte für %s sind falsch" -#: src/mount_davfs.c:2539 +#: src/mount_davfs.c:2552 #, c-format msgid "" "Usage:\n" @@ -558,7 +568,7 @@ msgstr "" " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2543 +#: src/mount_davfs.c:2556 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -567,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:2545 +#: src/mount_davfs.c:2558 #, c-format msgid "" " mount : or\n" @@ -578,7 +588,7 @@ msgstr "" " mount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab ein.\n" -#: src/mount_davfs.c:2548 +#: src/mount_davfs.c:2561 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -595,7 +605,7 @@ msgstr "" " Kommas unterteilte Liste von Optionen.\n" "\n" -#: src/mount_davfs.c:2553 +#: src/mount_davfs.c:2566 #, c-format msgid "" "Recognised options:\n" @@ -612,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:2559 +#: src/mount_davfs.c:2572 #, c-format msgid "" " ro : mount read-only\n" diff --git a/src/mount_davfs.c b/src/mount_davfs.c index c4f5093..d7394c6 100644 --- a/src/mount_davfs.c +++ b/src/mount_davfs.c @@ -669,9 +669,7 @@ check_double_mounts(dav_args *args) /* Checks fstab whether there is an entry for the mountpoint specified in args and compares the values in args with the values in fstab. If there is no such entry, or this entry does not allow user-mount, or the - values differ, an error message is printed and the program terminates. - Option useproxy, askauth and locks are not checked. The mounting user is - free to choose them. They should be configured in davfs2.conf anyway. */ + values differ, an error message is printed and the program terminates. */ static void check_fstab(const dav_args *args) { @@ -699,8 +697,15 @@ check_fstab(const dav_args *args) _PATH_FSTAB); if (strcmp(args->conf, n_args->conf) != 0) error(EXIT_FAILURE, 0, _("different config file in %s"), _PATH_FSTAB); - if (n_args->user != 1) - error(EXIT_FAILURE, 0, _("option `user' not set in %s"), _PATH_FSTAB); + if (!n_args->user && !n_args->users) + error(EXIT_FAILURE, 0, + _("neither option `user' nor option `users' set in %s"), + _PATH_FSTAB); + if (args->user != n_args->user) + error(EXIT_FAILURE, 0, _("different option `user' in %s"), _PATH_FSTAB); + if (args->users != n_args->users) + error(EXIT_FAILURE, 0, _("different option `users' in %s"), + _PATH_FSTAB); if (args->mopts != n_args->mopts) error(EXIT_FAILURE, 0, _("different mount options in %s"), _PATH_FSTAB); @@ -1492,6 +1497,7 @@ get_options(dav_args *args, char *option) DIR_MODE, USER, NOUSER, + USERS, NETDEV, NONETDEV, RW, @@ -1516,6 +1522,7 @@ get_options(dav_args *args, char *option) [DIR_MODE] = "dir_mode", [USER] = "user", [NOUSER] = "nouser", + [USERS] = "users", [NETDEV] = "_netdev", [NONETDEV] = "no_netdev", [RW] = "rw", @@ -1594,6 +1601,9 @@ get_options(dav_args *args, char *option) case NOUSER: args->user = 0; break; + case USERS: + args->users = 1; + break; case NETDEV: args->netdev = 1; break; @@ -1688,6 +1698,7 @@ new_args(void) } args->user = 0; + args->users = 0; args->netdev = 1; args->mopts = DAV_MOPTS; args->add_mopts = NULL; diff --git a/src/mount_davfs.h b/src/mount_davfs.h index 1d3cb08..6e440c0 100644 --- a/src/mount_davfs.h +++ b/src/mount_davfs.h @@ -37,6 +37,7 @@ typedef struct { char *conf; /* Command line */ /* Mount options */ int user; /* Command line */ + int users; /* Command line */ int netdev; /* Command line */ unsigned long int mopts; /* Command line */ char *add_mopts;