From eec9c5b5c918dd036f6becf58743e3eb9e45ec30 Mon Sep 17 00:00:00 2001 From: wbaumann Date: Sun, 8 Dec 2019 16:45:32 +0000 Subject: [PATCH] Adjust message --- ChangeLog | 4 ++ po/cs.po | 120 +++++++++++++++++++++--------------------- po/davfs2.pot | 126 ++++++++++++++++++++++----------------------- po/de.po | 125 ++++++++++++++++++++++---------------------- src/umount_davfs.c | 2 +- 5 files changed, 190 insertions(+), 187 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40e6e7c..2d8c83a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ ChangeLog for davfs2 -------------------- +2019-12-08 Werner Baumann (werner.baumann@onlinehome.de) + * umount_davfs.c: + Adjust message. + 2019-11-26 Werner Baumann (werner.baumann@onlinehome.de) * umount_davfs.c: Remove call to setuid and setgid. diff --git a/po/cs.po b/po/cs.po index 85ed61b..b940e0a 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: 2016-05-16 12:09+0200\n" +"POT-Creation-Date: 2019-12-08 17:34+0100\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -72,61 +72,61 @@ msgid "" "conf." msgstr "" -#: src/cache.c:2448 src/cache.c:2481 +#: src/cache.c:2449 src/cache.c:2482 #, c-format msgid "can't create cache file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/cache.c:2496 +#: src/cache.c:2497 #, c-format msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2660 src/mount_davfs.c:1034 +#: src/cache.c:2661 src/mount_davfs.c:1034 #, c-format msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" -#: src/cache.c:2672 +#: src/cache.c:2673 #, c-format msgid "can't open cache directory %s" msgstr "nemohu otevřít kešovací adresář %s" -#: src/cache.c:2687 +#: src/cache.c:2688 #, c-format msgid "can't create cache directory %s" msgstr "nemohu vytvořit kešovací adresář %s" -#: src/cache.c:2694 +#: src/cache.c:2695 #, c-format msgid "can't access cache directory %s" msgstr "nemohu přistoupit ke kešovacímu adresáři %s" -#: src/cache.c:2697 +#: src/cache.c:2698 #, c-format msgid "wrong owner of cache directory %s" msgstr "chybný vlastník kešovacího adresáře %s" -#: src/cache.c:2701 +#: src/cache.c:2702 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "pro kešovací adresář %s nastaveno chybné oprávnění" -#: src/cache.c:2731 +#: src/cache.c:2732 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2804 +#: src/cache.c:2805 #, c-format msgid "error parsing %s" msgstr "chyba při zpracování %s" -#: src/cache.c:2805 +#: src/cache.c:2806 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2850 +#: src/cache.c:2851 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -328,7 +328,7 @@ msgstr "uživatel %s musí být členem skupiny %s" msgid "can't change effective user id" msgstr "nemohu změnit identifikátor efektivního uživatele" -#: src/mount_davfs.c:864 src/umount_davfs.c:92 +#: src/mount_davfs.c:864 src/umount_davfs.c:89 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -339,12 +339,12 @@ 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:880 src/umount_davfs.c:118 +#: src/mount_davfs.c:880 src/umount_davfs.c:115 #, c-format msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:889 src/umount_davfs.c:124 +#: src/mount_davfs.c:889 src/umount_davfs.c:121 #, c-format msgid "missing argument" msgstr "chybějící argument" @@ -354,7 +354,7 @@ msgstr "chybějící argument" msgid "can't evaluate path of mount point %s" msgstr "nemohu vyhodnotit cestu k přípojnému bodu %s" -#: src/mount_davfs.c:905 src/umount_davfs.c:126 +#: src/mount_davfs.c:905 src/umount_davfs.c:123 #, c-format msgid "too many arguments" msgstr "příliš mnoho argumentů" @@ -497,53 +497,53 @@ msgstr "volba %s má neplatný argument; musí to být číslo" msgid "error writing to file %s" msgstr "chyba při zápisu nového indexového souboru %s" -#: src/mount_davfs.c:1591 +#: src/mount_davfs.c:1593 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1678 +#: src/mount_davfs.c:1681 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2068 +#: src/mount_davfs.c:2071 #, fuzzy, c-format msgid "can't read certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:2100 src/mount_davfs.c:2113 +#: src/mount_davfs.c:2103 src/mount_davfs.c:2116 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:2104 +#: src/mount_davfs.c:2107 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:2108 +#: src/mount_davfs.c:2111 #, 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:2130 src/mount_davfs.c:2363 +#: src/mount_davfs.c:2133 src/mount_davfs.c:2366 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:2151 src/mount_davfs.c:2195 src/mount_davfs.c:2293 -#: src/mount_davfs.c:2390 src/mount_davfs.c:2448 src/mount_davfs.c:2461 +#: src/mount_davfs.c:2154 src/mount_davfs.c:2198 src/mount_davfs.c:2296 +#: src/mount_davfs.c:2393 src/mount_davfs.c:2451 src/mount_davfs.c:2464 #, c-format msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2271 src/mount_davfs.c:2287 +#: src/mount_davfs.c:2274 src/mount_davfs.c:2290 #, c-format msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2593 +#: src/mount_davfs.c:2596 #, c-format msgid "" "Usage:\n" @@ -556,7 +556,7 @@ msgstr "" " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2597 +#: src/mount_davfs.c:2600 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -565,7 +565,7 @@ msgstr "" "Pro připojení zdroje WebDAV nevolejte přímo %s, ale\n" "použijte místo toho `mount'.\n" -#: src/mount_davfs.c:2599 +#: src/mount_davfs.c:2602 #, c-format msgid "" " mount : or\n" @@ -576,7 +576,7 @@ msgstr "" " mount : připojí zdroj WebDAV tak, jak je zadáno\n" " v /etc/fstab.\n" -#: src/mount_davfs.c:2602 +#: src/mount_davfs.c:2605 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -593,7 +593,7 @@ msgstr "" " označuje seznam voleb oddělených čárkou.\n" "\n" -#: src/mount_davfs.c:2607 +#: src/mount_davfs.c:2610 #, c-format msgid "" "Recognised options:\n" @@ -612,7 +612,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:2613 +#: src/mount_davfs.c:2616 #, fuzzy, c-format msgid "" " ro : mount read-only\n" @@ -629,7 +629,7 @@ msgstr "" " [no]suid : (ne)povolit účinnost suid a sgid bitů\n" " [no]_netdev : (není) třeba síťové spojení\n" -#: src/umount_davfs.c:98 +#: src/umount_davfs.c:95 #, c-format msgid "" "Usage:\n" @@ -642,7 +642,7 @@ msgstr "" " u%s -h,--help : vypsat tuto zprávu\n" "\n" -#: src/umount_davfs.c:102 +#: src/umount_davfs.c:99 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" @@ -651,7 +651,7 @@ msgstr "" "Pro odpojení zdroje WebDAV nevolejte přímo u%s, ale použijte\n" "místo toho `umount'.\n" -#: src/umount_davfs.c:105 +#: src/umount_davfs.c:102 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" @@ -660,7 +660,7 @@ msgstr "" " umount : odpojit zdroj WebDAV tak, jak je určeno\n" " v /etc/fstab.\n" -#: src/umount_davfs.c:136 +#: src/umount_davfs.c:133 #, fuzzy, c-format msgid "" "\n" @@ -673,7 +673,7 @@ msgstr "" " přesto se pokouším odpojit;\n" " čekejte prosím, až %s skončí" -#: src/umount_davfs.c:159 +#: src/umount_davfs.c:156 #, c-format msgid "" "\n" @@ -686,7 +686,7 @@ msgstr "" " přesto se pokouším odpojit;\n" " čekejte prosím, až %s skončí" -#: src/umount_davfs.c:171 +#: src/umount_davfs.c:168 #, c-format msgid "" "\n" @@ -699,7 +699,7 @@ msgstr "" " přesto se pokouším odpojit;\n" " čekejte prosím, až %s skončí" -#: src/umount_davfs.c:187 +#: src/umount_davfs.c:184 #, c-format msgid "" "\n" @@ -712,12 +712,12 @@ msgstr "" " přesto se pokouším odpojit.\n" " pravděpodobně budete muset odstranit %s ručně" -#: src/umount_davfs.c:198 -#, c-format -msgid "%s: waiting while %s (pid %s) synchronizes the cache ." +#: src/umount_davfs.c:195 +#, fuzzy, c-format +msgid "%s: waiting for %s (pid %s) to terminate gracefully ." msgstr "%s: čekám, než si %s (pid %s) sesynchronizuje vyrovnávací paměť." -#: src/umount_davfs.c:211 +#: src/umount_davfs.c:208 #, fuzzy, c-format msgid "an error occurred while waiting; please wait for %s to terminate" msgstr "při čekání došlo k chybě; čekejte prosím až %s skončí" @@ -761,57 +761,57 @@ msgstr "%i nemůže otevřít soubor vyrovnávací paměti" msgid "%i error writing to cache file" msgstr "%i chyba při zápisu do souboru vyrovnávací paměti" -#: src/webdav.c:1804 src/webdav.c:1833 src/webdav.c:1870 +#: src/webdav.c:1799 src/webdav.c:1828 src/webdav.c:1865 #, c-format msgid "the server certificate is not trusted" msgstr "certifikát serveru je nedůvěryhodný" -#: src/webdav.c:1813 src/webdav.c:1816 +#: src/webdav.c:1808 src/webdav.c:1811 #, c-format msgid "error processing server certificate" msgstr "chyba při zpracování certifikátu serveru" -#: src/webdav.c:1827 src/webdav.c:1861 +#: src/webdav.c:1822 src/webdav.c:1856 #, c-format msgid "the server certificate is not yet valid" msgstr "certifikát serveru zatím není platný" -#: src/webdav.c:1829 src/webdav.c:1864 +#: src/webdav.c:1824 src/webdav.c:1859 #, c-format msgid "the server certificate has expired" msgstr "platnost certifikátu serveru vypršela" -#: src/webdav.c:1831 src/webdav.c:1867 +#: src/webdav.c:1826 src/webdav.c:1862 #, c-format msgid "the server certificate does not match the server name" msgstr "certifikát serveru nedopovídá jménu serveru" -#: src/webdav.c:1835 src/webdav.c:1873 +#: src/webdav.c:1830 src/webdav.c:1868 #, c-format msgid "unknown certificate error" msgstr "neznámá chyba certifikátu" -#: src/webdav.c:1836 +#: src/webdav.c:1831 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1838 +#: src/webdav.c:1833 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1840 +#: src/webdav.c:1835 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1842 +#: src/webdav.c:1837 #, c-format msgid " fingerprint: %s" msgstr " otisk: %s" -#: src/webdav.c:1844 +#: src/webdav.c:1839 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -822,27 +822,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:1847 +#: src/webdav.c:1842 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Přijmout certifikát pro toto sezení? [y,N] " -#: src/webdav.c:1874 +#: src/webdav.c:1869 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:1875 +#: src/webdav.c:1870 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:1876 +#: src/webdav.c:1871 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:1879 +#: src/webdav.c:1874 msgid " accepted by user" msgstr " přijat uživatelem" diff --git a/po/davfs2.pot b/po/davfs2.pot index d1bd5cb..09c4b88 100644 --- a/po/davfs2.pot +++ b/po/davfs2.pot @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Werner Baumann -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the davfs2 package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: davfs2 1.4.6\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2016-05-16 12:09+0200\n" +"POT-Creation-Date: 2019-12-08 17:34+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,61 +67,61 @@ msgid "" "conf." msgstr "" -#: src/cache.c:2448 src/cache.c:2481 +#: src/cache.c:2449 src/cache.c:2482 #, c-format msgid "can't create cache file %s" msgstr "" -#: src/cache.c:2496 +#: src/cache.c:2497 #, c-format msgid "error writing directory %s" msgstr "" -#: src/cache.c:2660 src/mount_davfs.c:1034 +#: src/cache.c:2661 src/mount_davfs.c:1034 #, c-format msgid "can't read user data base" msgstr "" -#: src/cache.c:2672 +#: src/cache.c:2673 #, c-format msgid "can't open cache directory %s" msgstr "" -#: src/cache.c:2687 +#: src/cache.c:2688 #, c-format msgid "can't create cache directory %s" msgstr "" -#: src/cache.c:2694 +#: src/cache.c:2695 #, c-format msgid "can't access cache directory %s" msgstr "" -#: src/cache.c:2697 +#: src/cache.c:2698 #, c-format msgid "wrong owner of cache directory %s" msgstr "" -#: src/cache.c:2701 +#: src/cache.c:2702 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "" -#: src/cache.c:2731 +#: src/cache.c:2732 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2804 -#, c-format -msgid "error parsing %s" -msgstr "" - #: src/cache.c:2805 #, c-format +msgid "error parsing %s" +msgstr "" + +#: src/cache.c:2806 +#, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2850 +#: src/cache.c:2851 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -319,19 +319,19 @@ msgstr "" msgid "can't change effective user id" msgstr "" -#: src/mount_davfs.c:864 src/umount_davfs.c:92 +#: src/mount_davfs.c:864 src/umount_davfs.c:89 #, 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:880 src/umount_davfs.c:118 +#: src/mount_davfs.c:880 src/umount_davfs.c:115 #, c-format msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:889 src/umount_davfs.c:124 +#: src/mount_davfs.c:889 src/umount_davfs.c:121 #, c-format msgid "missing argument" msgstr "" @@ -341,7 +341,7 @@ msgstr "" msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:905 src/umount_davfs.c:126 +#: src/mount_davfs.c:905 src/umount_davfs.c:123 #, c-format msgid "too many arguments" msgstr "" @@ -471,53 +471,53 @@ msgstr "" msgid "error writing to file %s" msgstr "" -#: src/mount_davfs.c:1591 +#: src/mount_davfs.c:1593 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1678 +#: src/mount_davfs.c:1681 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2068 +#: src/mount_davfs.c:2071 #, c-format msgid "can't read certificate %s" msgstr "" -#: src/mount_davfs.c:2100 src/mount_davfs.c:2113 +#: src/mount_davfs.c:2103 src/mount_davfs.c:2116 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:2104 +#: src/mount_davfs.c:2107 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:2108 +#: src/mount_davfs.c:2111 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2130 src/mount_davfs.c:2363 +#: src/mount_davfs.c:2133 src/mount_davfs.c:2366 #, c-format msgid "opening %s failed" msgstr "" -#: src/mount_davfs.c:2151 src/mount_davfs.c:2195 src/mount_davfs.c:2293 -#: src/mount_davfs.c:2390 src/mount_davfs.c:2448 src/mount_davfs.c:2461 +#: src/mount_davfs.c:2154 src/mount_davfs.c:2198 src/mount_davfs.c:2296 +#: src/mount_davfs.c:2393 src/mount_davfs.c:2451 src/mount_davfs.c:2464 #, c-format msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2271 src/mount_davfs.c:2287 +#: src/mount_davfs.c:2274 src/mount_davfs.c:2290 #, c-format msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2593 +#: src/mount_davfs.c:2596 #, c-format msgid "" "Usage:\n" @@ -526,14 +526,14 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2597 +#: src/mount_davfs.c:2600 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2599 +#: src/mount_davfs.c:2602 #, c-format msgid "" " mount : or\n" @@ -541,7 +541,7 @@ msgid "" " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2602 +#: src/mount_davfs.c:2605 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -552,7 +552,7 @@ msgid "" "\n" msgstr "" -#: src/mount_davfs.c:2607 +#: src/mount_davfs.c:2610 #, c-format msgid "" "Recognised options:\n" @@ -563,7 +563,7 @@ msgid "" " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2613 +#: src/mount_davfs.c:2616 #, c-format msgid "" " ro : mount read-only\n" @@ -575,7 +575,7 @@ msgid "" " [no]_netdev : (no) network connection needed\n" msgstr "" -#: src/umount_davfs.c:98 +#: src/umount_davfs.c:95 #, c-format msgid "" "Usage:\n" @@ -584,21 +584,21 @@ msgid "" "\n" msgstr "" -#: src/umount_davfs.c:102 +#: src/umount_davfs.c:99 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" "`umount' instead.\n" msgstr "" -#: src/umount_davfs.c:105 +#: src/umount_davfs.c:102 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" " /etc/fstab.\n" msgstr "" -#: src/umount_davfs.c:136 +#: src/umount_davfs.c:133 #, c-format msgid "" "\n" @@ -607,7 +607,7 @@ msgid "" " please wait for %s to terminate" msgstr "" -#: src/umount_davfs.c:159 +#: src/umount_davfs.c:156 #, c-format msgid "" "\n" @@ -616,7 +616,7 @@ msgid "" " please wait for %s to terminate" msgstr "" -#: src/umount_davfs.c:171 +#: src/umount_davfs.c:168 #, c-format msgid "" "\n" @@ -625,7 +625,7 @@ msgid "" " please wait for %s to terminate" msgstr "" -#: src/umount_davfs.c:187 +#: src/umount_davfs.c:184 #, c-format msgid "" "\n" @@ -634,12 +634,12 @@ msgid "" " you propably have to remove %s manually" msgstr "" -#: src/umount_davfs.c:198 +#: src/umount_davfs.c:195 #, c-format -msgid "%s: waiting while %s (pid %s) synchronizes the cache ." +msgid "%s: waiting for %s (pid %s) to terminate gracefully ." msgstr "" -#: src/umount_davfs.c:211 +#: src/umount_davfs.c:208 #, c-format msgid "an error occurred while waiting; please wait for %s to terminate" msgstr "" @@ -683,57 +683,57 @@ msgstr "" msgid "%i error writing to cache file" msgstr "" -#: src/webdav.c:1804 src/webdav.c:1833 src/webdav.c:1870 +#: src/webdav.c:1799 src/webdav.c:1828 src/webdav.c:1865 #, c-format msgid "the server certificate is not trusted" msgstr "" -#: src/webdav.c:1813 src/webdav.c:1816 +#: src/webdav.c:1808 src/webdav.c:1811 #, c-format msgid "error processing server certificate" msgstr "" -#: src/webdav.c:1827 src/webdav.c:1861 +#: src/webdav.c:1822 src/webdav.c:1856 #, c-format msgid "the server certificate is not yet valid" msgstr "" -#: src/webdav.c:1829 src/webdav.c:1864 +#: src/webdav.c:1824 src/webdav.c:1859 #, c-format msgid "the server certificate has expired" msgstr "" -#: src/webdav.c:1831 src/webdav.c:1867 +#: src/webdav.c:1826 src/webdav.c:1862 #, c-format msgid "the server certificate does not match the server name" msgstr "" -#: src/webdav.c:1835 src/webdav.c:1873 +#: src/webdav.c:1830 src/webdav.c:1868 #, c-format msgid "unknown certificate error" msgstr "" -#: src/webdav.c:1836 +#: src/webdav.c:1831 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1838 +#: src/webdav.c:1833 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1840 +#: src/webdav.c:1835 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1842 +#: src/webdav.c:1837 #, c-format msgid " fingerprint: %s" msgstr "" -#: src/webdav.c:1844 +#: src/webdav.c:1839 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -741,26 +741,26 @@ msgid "" "or there might be a man-in-the-middle-attack.\n" msgstr "" -#: src/webdav.c:1847 +#: src/webdav.c:1842 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "" -#: src/webdav.c:1874 +#: src/webdav.c:1869 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:1875 +#: src/webdav.c:1870 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:1876 +#: src/webdav.c:1871 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:1879 +#: src/webdav.c:1874 msgid " accepted by user" msgstr "" diff --git a/po/de.po b/po/de.po index acbe2aa..822eb3b 100644 --- a/po/de.po +++ b/po/de.po @@ -1,5 +1,5 @@ # davfs2 messages de. -# Copyright (C) 2008, 2009, 2013, 2014 Werner Baumann +# Copyright (C) 2008, 2009, 2013, 2014, 2019 Werner Baumann # This file is distributed under the same license as the PACKAGE package. # Werner Baumann , 2009. # @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: davfs2 1.5.0\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2016-05-16 12:09+0200\n" -"PO-Revision-Date: 2016-05-16 12:11+0200\n" +"POT-Creation-Date: 2019-12-08 17:34+0100\n" +"PO-Revision-Date: 2019-12-08 17:39+0100\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" "Language: de\n" @@ -75,61 +75,61 @@ msgstr "" "behandelt der Server LOCK-Requests fehlerhaft. Du kannst es mit der Option " "'use_locks 0' in davfs2.conf versuchen." -#: src/cache.c:2448 src/cache.c:2481 +#: src/cache.c:2449 src/cache.c:2482 #, c-format msgid "can't create cache file %s" msgstr "kann die Cachedatei %s nicht erzeugen" -#: src/cache.c:2496 +#: src/cache.c:2497 #, c-format msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2660 src/mount_davfs.c:1034 +#: src/cache.c:2661 src/mount_davfs.c:1034 #, c-format msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" -#: src/cache.c:2672 +#: src/cache.c:2673 #, c-format msgid "can't open cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht öffnen" -#: src/cache.c:2687 +#: src/cache.c:2688 #, c-format msgid "can't create cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht erzeugen" -#: src/cache.c:2694 +#: src/cache.c:2695 #, c-format msgid "can't access cache directory %s" msgstr "Zugriff auf das Cachverzeichnis %s verweigert" -#: src/cache.c:2697 +#: src/cache.c:2698 #, c-format msgid "wrong owner of cache directory %s" msgstr "das Cacheverzeichnis %s hat den falschen Besitzer" -#: src/cache.c:2701 +#: src/cache.c:2702 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "das Cachverzeichnis %s hat die falschen Dateirechte" -#: src/cache.c:2731 +#: src/cache.c:2732 msgid "found orphaned file in cache:" msgstr "fand verwaiste Datei im Cache:" -#: src/cache.c:2804 +#: src/cache.c:2805 #, c-format msgid "error parsing %s" msgstr "Syntaxfehler in %s" -#: src/cache.c:2805 +#: src/cache.c:2806 #, c-format msgid " at line %i" msgstr " in Zeile %i" -#: src/cache.c:2850 +#: src/cache.c:2851 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" @@ -334,7 +334,7 @@ msgstr "der Benutzer %s muss Mitglied der Gruppe %s sein" msgid "can't change effective user id" msgstr "kann die effektive Benutzer-ID nicht ändern" -#: src/mount_davfs.c:864 src/umount_davfs.c:92 +#: src/mount_davfs.c:864 src/umount_davfs.c:89 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -345,12 +345,12 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:880 src/umount_davfs.c:118 +#: src/mount_davfs.c:880 src/umount_davfs.c:115 #, c-format msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:889 src/umount_davfs.c:124 +#: src/mount_davfs.c:889 src/umount_davfs.c:121 #, c-format msgid "missing argument" msgstr "zu wenig Argumente" @@ -360,7 +360,7 @@ msgstr "zu wenig Argumente" msgid "can't evaluate path of mount point %s" msgstr "kann den eindeutigen Pfad des Einhängepunktes %s nicht ermitteln" -#: src/mount_davfs.c:905 src/umount_davfs.c:126 +#: src/mount_davfs.c:905 src/umount_davfs.c:123 #, c-format msgid "too many arguments" msgstr "zu viele Argumente" @@ -502,57 +502,57 @@ msgstr "das Argument der Option %s ist ungültig; es muss eine Zahl sein" msgid "error writing to file %s" msgstr "Fehler beim Schreiben der neuen Indexdatei %s" -#: src/mount_davfs.c:1591 +#: src/mount_davfs.c:1593 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1678 +#: src/mount_davfs.c:1681 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2068 +#: src/mount_davfs.c:2071 #, c-format msgid "can't read certificate %s" msgstr "kann das Zertifikat %s nicht lesen" -#: src/mount_davfs.c:2100 src/mount_davfs.c:2113 +#: src/mount_davfs.c:2103 src/mount_davfs.c:2116 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:2104 +#: src/mount_davfs.c:2107 #, 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:2108 +#: src/mount_davfs.c:2111 #, 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:2130 src/mount_davfs.c:2363 +#: src/mount_davfs.c:2133 src/mount_davfs.c:2366 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: src/mount_davfs.c:2151 src/mount_davfs.c:2195 src/mount_davfs.c:2293 -#: src/mount_davfs.c:2390 src/mount_davfs.c:2448 src/mount_davfs.c:2461 +#: src/mount_davfs.c:2154 src/mount_davfs.c:2198 src/mount_davfs.c:2296 +#: src/mount_davfs.c:2393 src/mount_davfs.c:2451 src/mount_davfs.c:2464 #, c-format msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2271 src/mount_davfs.c:2287 +#: src/mount_davfs.c:2274 src/mount_davfs.c:2290 #, c-format msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2593 +#: src/mount_davfs.c:2596 #, c-format msgid "" "Usage:\n" @@ -565,7 +565,7 @@ msgstr "" " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2597 +#: src/mount_davfs.c:2600 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -574,7 +574,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:2599 +#: src/mount_davfs.c:2602 #, c-format msgid "" " mount : or\n" @@ -585,7 +585,7 @@ msgstr "" " mount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab ein.\n" -#: src/mount_davfs.c:2602 +#: src/mount_davfs.c:2605 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -602,7 +602,7 @@ msgstr "" " Kommas unterteilte Liste von Optionen.\n" "\n" -#: src/mount_davfs.c:2607 +#: src/mount_davfs.c:2610 #, c-format msgid "" "Recognised options:\n" @@ -619,7 +619,7 @@ msgstr "" " file_mode= : Standard-Rechte für Dateien (oktal)\n" " dir_mode= : Standard-Rechte für Verzeichnisse (oktal)\n" -#: src/mount_davfs.c:2613 +#: src/mount_davfs.c:2616 #, c-format msgid "" " ro : mount read-only\n" @@ -638,7 +638,7 @@ msgstr "" " Verzeichnisses\n" " [no]_nedev : benötigt (keine) Netzwerkverbindung\n" -#: src/umount_davfs.c:98 +#: src/umount_davfs.c:95 #, c-format msgid "" "Usage:\n" @@ -651,7 +651,7 @@ msgstr "" " u%s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/umount_davfs.c:102 +#: src/umount_davfs.c:99 #, c-format msgid "" "To umount a WebDAV-resource don't call u%s directly, but use\n" @@ -660,7 +660,7 @@ msgstr "" "Um eine WebDAV-Resource auszuhängen, sollte u%s nicht direkt aufgerufen " "werden; stattdessen sollte „umount” benutzt werden.\n" -#: src/umount_davfs.c:105 +#: src/umount_davfs.c:102 #, c-format msgid "" " umount : umount the WebDAV-resource as specified in\n" @@ -669,7 +669,7 @@ msgstr "" " umount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab aus.\n" -#: src/umount_davfs.c:136 +#: src/umount_davfs.c:133 #, c-format msgid "" "\n" @@ -682,7 +682,7 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " bitte warte bis der %s-Prozess endet" -#: src/umount_davfs.c:159 +#: src/umount_davfs.c:156 #, c-format msgid "" "\n" @@ -695,7 +695,7 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " bitte warte bis der %s-Prozess endet" -#: src/umount_davfs.c:171 +#: src/umount_davfs.c:168 #, c-format msgid "" "\n" @@ -708,7 +708,7 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " bitte warte bis der %s-Prozess endet" -#: src/umount_davfs.c:187 +#: src/umount_davfs.c:184 #, c-format msgid "" "\n" @@ -721,14 +721,13 @@ msgstr "" " versuche trotzdem das Dateisystem auszuhängen;\n" " %s muss wahrscheinlich von Hand gelöscht werden" -#: src/umount_davfs.c:198 +#: src/umount_davfs.c:195 #, c-format -msgid "%s: waiting while %s (pid %s) synchronizes the cache ." +msgid "%s: waiting for %s (pid %s) to terminate gracefully ." msgstr "" -"%s: warte bis %s (PID %s) die Dateien im Cache\n" -"gesichert hat ." +"%s: warte bis %s (PID %s) ordentlich endet ." -#: src/umount_davfs.c:211 +#: src/umount_davfs.c:208 #, c-format msgid "an error occurred while waiting; please wait for %s to terminate" msgstr "" @@ -773,57 +772,57 @@ msgstr "%i kann die Cache-Datei nicht öffnen" msgid "%i error writing to cache file" msgstr "%i Fehler beim Schreiben der Cache-Datei" -#: src/webdav.c:1804 src/webdav.c:1833 src/webdav.c:1870 +#: src/webdav.c:1799 src/webdav.c:1828 src/webdav.c:1865 #, c-format msgid "the server certificate is not trusted" msgstr "wir trauen dem Zertifikat nicht" -#: src/webdav.c:1813 src/webdav.c:1816 +#: src/webdav.c:1808 src/webdav.c:1811 #, c-format msgid "error processing server certificate" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1827 src/webdav.c:1861 +#: src/webdav.c:1822 src/webdav.c:1856 #, c-format msgid "the server certificate is not yet valid" msgstr "das Server-Zertifikat ist noch nicht gültig" -#: src/webdav.c:1829 src/webdav.c:1864 +#: src/webdav.c:1824 src/webdav.c:1859 #, c-format msgid "the server certificate has expired" msgstr "das Server-Zertifikat ist nicht mehr gültig" -#: src/webdav.c:1831 src/webdav.c:1867 +#: src/webdav.c:1826 src/webdav.c:1862 #, c-format msgid "the server certificate does not match the server name" msgstr "das Server-Zertifikat passt nicht zum Namen des Servers" -#: src/webdav.c:1835 src/webdav.c:1873 +#: src/webdav.c:1830 src/webdav.c:1868 #, c-format msgid "unknown certificate error" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:1836 +#: src/webdav.c:1831 #, c-format msgid " issuer: %s" msgstr " Aussteller: %s" -#: src/webdav.c:1838 +#: src/webdav.c:1833 #, c-format msgid " subject: %s" msgstr " Inhaber: %s" -#: src/webdav.c:1840 +#: src/webdav.c:1835 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1842 +#: src/webdav.c:1837 #, c-format msgid " fingerprint: %s" msgstr " Fingerabdruck: %s" -#: src/webdav.c:1844 +#: src/webdav.c:1839 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -834,26 +833,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:1847 +#: src/webdav.c:1842 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Ich akzeptiere das Zertifikat für diese Sitzung [j,N]: " -#: src/webdav.c:1874 +#: src/webdav.c:1869 #, c-format msgid " issuer: %s" msgstr " Aussteller des Zertifikats: %s" -#: src/webdav.c:1875 +#: src/webdav.c:1870 #, c-format msgid " subject: %s" msgstr " Inhaber des Zertifikats: %s" -#: src/webdav.c:1876 +#: src/webdav.c:1871 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:1879 +#: src/webdav.c:1874 msgid " accepted by user" msgstr " durch den Benutzer akzeptiert" diff --git a/src/umount_davfs.c b/src/umount_davfs.c index 4c7f0b8..fb89fc2 100644 --- a/src/umount_davfs.c +++ b/src/umount_davfs.c @@ -192,7 +192,7 @@ main(int argc, char *argv[]) if (system(umount_command) != 0) exit(EXIT_FAILURE); - printf(_("%s: waiting while %s (pid %s) synchronizes the cache ."), + printf(_("%s: waiting for %s (pid %s) to terminate gracefully ."), argv[0], PROGRAM_NAME, pid); fflush(stdout);