From 2b412668900201fe2d202475d285332d04996e24 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 12 Mar 2004 13:59:39 +0000 Subject: [PATCH] . --- po/af.po | 504 ++++++++++++++++++++++++++++++++-------------------- po/be.po | 204 +++++++++++---------- po/ca.po | 219 ++++++++++++----------- po/cs.po | 204 +++++++++++---------- po/da.po | 204 +++++++++++---------- po/de.po | 216 +++++++++++----------- po/el.po | 208 ++++++++++++---------- po/es.po | 245 +++++++++++++------------ po/et.po | 213 +++++++++++----------- po/fi.po | 219 ++++++++++++----------- po/fr.po | 219 ++++++++++++----------- po/ga.po | 220 ++++++++++++----------- po/gl.po | 204 +++++++++++---------- po/hu.po | 203 +++++++++++---------- po/it.po | 203 +++++++++++---------- po/ja.po | 204 +++++++++++---------- po/ko.po | 204 +++++++++++---------- po/lg.po | 199 +++++++++++---------- po/ms.po | 204 +++++++++++---------- po/nb.po | 204 +++++++++++---------- po/nl.po | 202 +++++++++++---------- po/no.po | 204 +++++++++++---------- po/pl.po | 223 ++++++++++++----------- po/pt.po | 203 +++++++++++---------- po/pt_BR.po | 204 +++++++++++---------- po/ru.po | 204 +++++++++++---------- po/sk.po | 204 +++++++++++---------- po/sl.po | 206 +++++++++++---------- po/sv.po | 239 +++++++++++++------------ po/tr.po | 204 +++++++++++---------- po/zh_CN.po | 203 +++++++++++---------- po/zh_TW.po | 204 +++++++++++---------- 32 files changed, 3780 insertions(+), 3220 deletions(-) diff --git a/po/af.po b/po/af.po index 38f8183041..23db4b49c0 100644 --- a/po/af.po +++ b/po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2004-02-25 14:47+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans \n" @@ -151,7 +151,7 @@ msgstr "blokgrootte" msgid "failed to return to initial working directory" msgstr "kon nie na aanvanklike werkgids terugkeer nie" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "Kan nie lêergids %s skep nie." @@ -232,19 +232,19 @@ msgstr "kan nie U+%04X omskakel na 'n plaaslike karakterstel nie" msgid "cannot convert U+%04X to local character set: %s" msgstr "kan nie U+%04X omskakel na 'n plaaslike karakterstel nie: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "ongeldige gebruiker" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "ongeldige groep " -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "kan nie die aantekengroep van 'n numeriese UID verkry nie" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie" @@ -369,23 +369,25 @@ 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 "" -"Hierdie is vry sagteware; kyk in die bronkode vir kopieërvoorwaardes. Daar is GEEN\n" -"waarborg nie; selfs nie vir VERKOOPBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL nie.\n" +"Hierdie is vry sagteware; kyk in die bronkode vir kopieërvoorwaardes. Daar " +"is GEEN\n" +"waarborg nie; selfs nie vir VERKOOPBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE " +"DOEL nie.\n" #: lib/xfts.c:60 #, c-format msgid "invalid argument: %s" msgstr "ongeldige parameter: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "stringvergelyking het gefaal" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Stel LC_ALL='C' om die probleem te systap" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Die stringe wat vergelyk is, is %s en %s." @@ -399,7 +401,7 @@ msgstr "Die stringe wat vergelyk is, is %s en %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -433,15 +435,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -460,9 +462,9 @@ msgstr "" "Rapporteer foute aan <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -511,7 +513,8 @@ msgstr "" " -t ekwivalent aan -vT\n" " -T, --show-tabs wys keepkarakters as ^I\n" " -u (ignored)\n" -" -v, --show-nonprinting gebruik ^ and M- notasie, behalwe vir LFD and TAB\n" +" -v, --show-nonprinting gebruik ^ and M- notasie, behalwe vir LFD and " +"TAB\n" #: src/cat.c:113 src/fmt.c:293 src/sum.c:71 msgid "" @@ -592,7 +595,8 @@ msgstr "" #: src/chgrp.c:132 src/chown.c:108 msgid "" -" -h, --no-dereference affect each symbolic link instead of any referenced\n" +" -h, --no-dereference affect each symbolic link instead of any " +"referenced\n" " file (useful only on systems that can change the\n" " ownership of a symlink)\n" msgstr "" @@ -602,7 +606,8 @@ msgid "" " --no-preserve-root do not treat `/' specially (the default)\n" " --preserve-root fail to operate recursively on `/'\n" msgstr "" -" --no-preserve-root moenie `/' spesiaal anders hanteer nie (by verstek)\n" +" --no-preserve-root moenie `/' spesiaal anders hanteer nie (by " +"verstek)\n" " --preserve-root moenie rekursief te werk gaan met `/' nie\n" #: src/chgrp.c:141 @@ -655,17 +660,17 @@ msgstr "modus %s kon nie na %04lo (%s) verander word nie\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "modus van %s is behou as %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "kan nie toegang verkry na %s nie" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "kan nie gids %s lees nie" @@ -675,7 +680,7 @@ msgstr "kan nie gids %s lees nie" msgid "changing permissions of %s" msgstr "toegangsregte van %s word verander" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "fts_read het misluk" @@ -691,7 +696,8 @@ msgstr "" msgid "" "Change the mode of each FILE to MODE.\n" "\n" -" -c, --changes like verbose but report only when a change is made\n" +" -c, --changes like verbose but report only when a change is " +"made\n" msgstr "" #: src/chmod.c:281 @@ -699,7 +705,8 @@ msgid "" " --no-preserve-root do not treat `/' specially (the default)\n" " --preserve-root fail to operate recursively on `/'\n" msgstr "" -" --no-preserve-root moenie `/' spesiaal anders hanteer nie (by verstek)\n" +" --no-preserve-root moenie `/' spesiaal anders hanteer nie (by " +"verstek)\n" " --preserve-root moenie rekursief te werk gaan met `/' nie\n" #: src/chmod.c:285 @@ -783,7 +790,8 @@ msgstr "" #: src/chown.c:100 msgid "" "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n" -"With --reference, change the owner and group of each FILE to those of RFILE.\n" +"With --reference, change the owner and group of each FILE to those of " +"RFILE.\n" "\n" " -c, --changes like verbose but report only when a change is made\n" " --dereference affect the referent of each symbolic link, rather\n" @@ -794,8 +802,10 @@ msgstr "" msgid "" " --from=CURRENT_OWNER:CURRENT_GROUP\n" " change the owner and/or group of each file only if\n" -" its current owner and/or group match those specified\n" -" here. Either may be omitted, in which case a match\n" +" its current owner and/or group match those " +"specified\n" +" here. Either may be omitted, in which case a " +"match\n" " is not required for the omitted attribute.\n" msgstr "" @@ -847,7 +857,7 @@ msgstr "kan nie wortelgids verander na %s toe nie" msgid "cannot chdir to root directory" msgstr "kan nie chdir uitvoer na wortelgids toe nie" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "kan nie bevel %s uitvoer nie" @@ -872,17 +882,28 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Gebruik so: %s [OPSIE]... LINKERLÊER REGTERLÊER\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Gebruik so: %s [OPSIE]... LÊER1 LÊER2 \n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 +msgid "" +"\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" @@ -891,7 +912,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "kan nie %s oopmaak om te lees nie" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -902,7 +923,7 @@ msgstr "kan nie fstat op %s uitvoer nie" msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -913,207 +934,210 @@ msgstr "kan nie %s verwyder nie" msgid "cannot create regular file %s" msgstr "kan nie 'n gewone lêer %s skep nie" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "besig om %s te lees" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "kan nie lseek op %s doen nie" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "besig om %s te skryf" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "besig om %s toe te maak" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: oorskryf %s, moet modus %04lo ter syde gestel word? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: oorskryf %s?" -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "kan nie stat %s uitvoer nie" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "lêergids %s word oorgeslaan" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s en %s is dieselfde lêer" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "kan nie die gids %s oorskryf nie" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "kan nie rugsteun neem van %s nie" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr "(rugsteun: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kan nie 'n lêergids, %s, na homself kopieer nie, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "sal nie 'n vaste skakel %s skep na gids %s nie" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "kon nie vaste skakel %s na %s skep nie" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "kan nie 'n gids %s skuif na 'n kind van dieselfde gids nie, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "kan nie %s skuif na %s nie" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" -msgstr "inter-toestel verskuiwing het misluk: %s na %s; die bestemming kan nie verwyder word nie" +msgstr "" +"inter-toestel verskuiwing het misluk: %s na %s; die bestemming kan nie " +"verwyder word nie" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "sikliese simboliese skakel %s kan nie gekopieer word nie" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" -msgstr "%s: relatiewe simboliese skakels kan slegs in die huidige gids gemaak word" +msgstr "" +"%s: relatiewe simboliese skakels kan slegs in die huidige gids gemaak word" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kon nie simboliese skakel %s na %s skep nie" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "kan nie die skakel %s skep nie" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "kan nie die pyp %s skep nie" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "kan nie spesiale lêer %s skep nie" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "simboliese skakel %s kan nie gelees word nie" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "kon nie simboliese skakel %s skep nie" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "eienaarskap van %s kon nie behou word nie" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s het 'n onbekende lêertipe" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "lêertye van %s word behou" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "kon nie lêer %s opspoor nie" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "outeurskap van %s kon nie behou word nie" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "toegangsregte vir %s word gestel" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "kan nie %s ont-rugsteun nie" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -1139,15 +1163,19 @@ msgstr "" #: src/pr.c:2761 src/ptx.c:1882 src/shred.c:165 src/sort.c:286 src/split.c:109 #: src/tac.c:135 src/tail.c:248 src/touch.c:253 src/unexpand.c:386 #: src/uniq.c:143 -msgid "Mandatory arguments to long options are mandatory for short options too.\n" +msgid "" +"Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" #: src/cp.c:171 msgid "" " -a, --archive same as -dpR\n" -" --backup[=CONTROL] make a backup of each existing destination file\n" -" -b like --backup but does not accept an argument\n" -" --copy-contents copy contents of special files when recursive\n" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" +" -b like --backup but does not accept an " +"argument\n" +" --copy-contents copy contents of special files when " +"recursive\n" " -d same as --no-dereference --preserve=link\n" msgstr "" @@ -1181,7 +1209,8 @@ msgstr "" msgid "" " -R, -r, --recursive copy directories recursively\n" " --remove-destination remove each existing destination file before\n" -" attempting to open it (contrast with --force)\n" +" attempting to open it (contrast with --" +"force)\n" msgstr "" #: src/cp.c:203 @@ -1197,7 +1226,8 @@ msgstr "" msgid "" " -s, --symbolic-link make symbolic links instead of copying\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" -" --target-directory=DIRECTORY move all SOURCE arguments into DIRECTORY\n" +" --target-directory=DIRECTORY move all SOURCE arguments into " +"DIRECTORY\n" msgstr "" #: src/cp.c:215 @@ -1215,7 +1245,8 @@ msgid "" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" "corresponding DEST file is made sparse as well. That is the behavior\n" "selected by --sparse=auto. Specify --sparse=always to create a sparse DEST\n" -"file whenever the SOURCE file contains a long enough sequence of zero bytes.\n" +"file whenever the SOURCE file contains a long enough sequence of zero " +"bytes.\n" "Use --sparse=never to inhibit creation of sparse files.\n" "\n" msgstr "" @@ -1223,7 +1254,8 @@ msgstr "" #: src/cp.c:233 msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" -"The version control method may be selected via the --backup option or through\n" +"The version control method may be selected via the --backup option or " +"through\n" "the VERSION_CONTROL environment variable. Here are the values:\n" "\n" msgstr "" @@ -1711,7 +1743,8 @@ msgstr "die opsies om drukdatums te spesifiseer is onderling uitsluitend" #: src/date.c:372 msgid "the options to print and set the time may not be used together" -msgstr "die opsies om die tyd te vertoon en te stel kan nie saam gebruik word nie" +msgstr "" +"die opsies om die tyd te vertoon en te stel kan nie saam gebruik word nie" #: src/date.c:378 #, c-format @@ -1727,7 +1760,8 @@ msgid "" msgstr "" #: src/date.c:398 -msgid "a format string may not be specified when using the --rfc-2822 (-R) option" +msgid "" +"a format string may not be specified when using the --rfc-2822 (-R) option" msgstr "" #: src/date.c:434 @@ -1774,8 +1808,10 @@ msgstr "" " if=LÊER lees vanaf LÊER in plaas van stdin\n" " obs=GREPE skryf GREPE(aantal) grepe op 'n slag\n" " of=LÊER skryf na LÊER in plaas van na stdout\n" -" seek=BLOKKE slaan BLOKKE(aantal) obs-grootte blokke oor aan die begin van afvoer\n" -" skip=BLOKKE slaan BLOKKE(aantal) ibs-grootte blokke oor aan die begin van toevoer\n" +" seek=BLOKKE slaan BLOKKE(aantal) obs-grootte blokke oor aan die begin " +"van afvoer\n" +" skip=BLOKKE slaan BLOKKE(aantal) ibs-grootte blokke oor aan die begin " +"van toevoer\n" #: src/dd.c:306 msgid "" @@ -1961,7 +1997,8 @@ msgstr "" msgid "" " -a, --all include filesystems having 0 blocks\n" " -B, --block-size=SIZE use SIZE-byte blocks\n" -" -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\n" +" -h, --human-readable print sizes in human readable format (e.g., 1K 234M " +"2G)\n" " -H, --si likewise, but use powers of 1000 not 1024\n" msgstr "" @@ -1970,7 +2007,8 @@ msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" " -l, --local limit listing to local filesystems\n" -" --no-sync do not invoke sync before getting usage info (default)\n" +" --no-sync do not invoke sync before getting usage info " +"(default)\n" msgstr "" #: src/df.c:748 @@ -1983,7 +2021,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2082,7 +2120,8 @@ msgstr "" #: src/du.c:175 msgid "" " -a, --all write counts for all files, not just directories\n" -" --apparent-size print apparent sizes, rather than disk usage; although\n" +" --apparent-size print apparent sizes, rather than disk usage; " +"although\n" " the apparent size is usually smaller, it may be\n" " larger due to holes in (`sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" @@ -2094,56 +2133,63 @@ msgstr "" #: src/du.c:186 msgid "" -" -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 (deprecated)\n" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" +" -h, --human-readable print sizes in human readable format (e.g., 1K 234M " +"2G)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" -" -P, --no-dereference don't follow any symbolic links (this is the default)\n" -" -0, --null end each output line with 0 byte rather than newline\n" +" -P, --no-dereference don't follow any symbolic links (this is the " +"default)\n" +" -0, --null end each output line with 0 byte rather than " +"newline\n" " -S, --separate-dirs do not include size of subdirectories\n" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" -" -X FILE, --exclude-from=FILE Exclude files that match any pattern in FILE.\n" +" -X FILE, --exclude-from=FILE Exclude files that match any pattern in " +"FILE.\n" " --exclude=PATTERN Exclude files that match PATTERN.\n" -" --max-depth=N print the total for a directory (or file, with --all)\n" +" --max-depth=N print the total for a directory (or file, with --" +"all)\n" " only if it is N or fewer levels below the command\n" " line argument; --max-depth=0 is the same as\n" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "totaal" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "ongeldige maksimum diepte %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "" @@ -2217,7 +2263,8 @@ msgid "" msgstr "" #: src/expand.c:124 -msgid " -t, --tabs=LIST use comma separated list of explicit tab positions\n" +msgid "" +" -t, --tabs=LIST use comma separated list of explicit tab positions\n" msgstr "" #: src/expand.c:180 @@ -2314,25 +2361,26 @@ msgid "" "Beware that many operators need to be escaped or quoted for shells.\n" "Comparisons are arithmetic if both ARGs are numbers, else lexicographical.\n" "Pattern matches return the string matched between \\( and \\) or null; if\n" -"\\( and \\) are not used, they return the number of characters matched or 0.\n" +"\\( and \\) are not used, they return the number of characters matched or " +"0.\n" msgstr "" #: src/expr.c:170 msgid "syntax error" msgstr "sintaksfout" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "nie-numeriese parameter" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "deling deur nul" @@ -2354,7 +2402,8 @@ msgstr "" #: src/factor.c:84 msgid "" "\n" -" Print the prime factors of all specified integer NUMBERs. If no arguments\n" +" Print the prime factors of all specified integer NUMBERs. If no " +"arguments\n" " are specified on the command line, they are read from standard input.\n" msgstr "" @@ -2723,16 +2772,20 @@ msgstr "" #: src/install.c:614 msgid "" -" -D create all leading components of DEST except the last,\n" +" -D create all leading components of DEST except the " +"last,\n" " then copy SOURCE to DEST; useful in the 1st format\n" -" -g, --group=GROUP set group ownership, instead of process' current group\n" -" -m, --mode=MODE set permission mode (as in chmod), instead of rwxr-xr-x\n" +" -g, --group=GROUP set group ownership, instead of process' current " +"group\n" +" -m, --mode=MODE set permission mode (as in chmod), instead of rwxr-xr-" +"x\n" " -o, --owner=OWNER set ownership (super-user only)\n" msgstr "" #: src/install.c:621 msgid "" -" -p, --preserve-timestamps apply access/modification times of SOURCE files\n" +" -p, --preserve-timestamps apply access/modification times of SOURCE " +"files\n" " to corresponding destination files\n" " -s, --strip strip symbol tables, only for 1st and 2nd formats\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" @@ -2743,16 +2796,12 @@ msgstr "" msgid "" "\n" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" -"The version control method may be selected via the --backup option or through\n" +"The version control method may be selected via the --backup option or " +"through\n" "the VERSION_CONTROL environment variable. Here are the values:\n" "\n" msgstr "" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Gebruik so: %s [OPSIE]... LÊER1 LÊER2 \n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -2860,7 +2909,8 @@ msgstr "" msgid "" " -s, --signal=SIGNAL, -SIGNAL\n" " specify the name or number of the signal to be sent\n" -" -l, --list list signal names, or convert signal names to/from numbers\n" +" -l, --list list signal names, or convert signal names to/from " +"numbers\n" " -t, --table print a table of signal information\n" msgstr "" @@ -2990,11 +3040,14 @@ msgstr "" #: src/ln.c:363 msgid "" -" --backup[=CONTROL] make a backup of each existing destination file\n" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" " -b like --backup but does not accept an argument\n" " -d, -F, --directory allow the superuser to attempt to hard link\n" -" directories (note: will probably fail due to\n" -" system restrictions, even for the superuser)\n" +" directories (note: will probably fail due " +"to\n" +" system restrictions, even for the " +"superuser)\n" " -f, --force remove existing destination files\n" msgstr "" @@ -3009,7 +3062,8 @@ msgstr "" #: src/ln.c:377 msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" -" --target-directory=DIRECTORY specify the DIRECTORY in which to create\n" +" --target-directory=DIRECTORY specify the DIRECTORY in which to " +"create\n" " the links\n" " -v, --verbose print name of each file before linking\n" msgstr "" @@ -3134,7 +3188,8 @@ msgstr "" msgid "" " --block-size=SIZE use SIZE-byte blocks\n" " -B, --ignore-backups do not list implied entries ending with ~\n" -" -c with -lt: sort by, and show, ctime (time of last\n" +" -c with -lt: sort by, and show, ctime (time of " +"last\n" " modification of file status information)\n" " with -l: show ctime and sort by name\n" " otherwise: sort by ctime\n" @@ -3143,8 +3198,10 @@ msgstr "" #: src/ls.c:3928 msgid "" " -C list entries by columns\n" -" --color[=WHEN] control whether color is used to distinguish file\n" -" types. WHEN may be `never', `always', or `auto'\n" +" --color[=WHEN] control whether color is used to distinguish " +"file\n" +" types. WHEN may be `never', `always', or " +"`auto'\n" " -d, --directory list directory entries instead of contents,\n" " and do not dereference symbolic links\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -3163,10 +3220,12 @@ msgstr "" msgid "" " -g like -l, but do not list owner\n" " -G, --no-group inhibit display of group information\n" -" -h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\n" +" -h, --human-readable print sizes in human readable format (e.g., 1K 234M " +"2G)\n" " --si likewise, but use powers of 1000 not 1024\n" " -H, --dereference-command-line\n" -" follow symbolic links listed on the command line\n" +" follow symbolic links listed on the command " +"line\n" " --dereference-command-line-symlink-to-dir\n" " follow each command line symbolic link\n" " that points to a directory\n" @@ -3174,10 +3233,13 @@ msgstr "" #: src/ls.c:3954 msgid "" -" --indicator-style=WORD append indicator with style WORD to entry names:\n" -" none (default), classify (-F), file-type (-p)\n" +" --indicator-style=WORD append indicator with style WORD to entry " +"names:\n" +" none (default), classify (-F), file-type (-" +"p)\n" " -i, --inode print index number of each file\n" -" -I, --ignore=PATTERN do not list implied entries matching shell PATTERN\n" +" -I, --ignore=PATTERN do not list implied entries matching shell " +"PATTERN\n" " -k like --block-size=1K\n" msgstr "" @@ -3187,13 +3249,15 @@ msgid "" " -L, --dereference when showing file information for a symbolic\n" " link, show information for the file the link\n" " references rather than for the link itself\n" -" -m fill width with a comma separated list of entries\n" +" -m fill width with a comma separated list of " +"entries\n" msgstr "" #: src/ls.c:3968 msgid "" " -n, --numeric-uid-gid like -l, but list numeric UIDs and GIDs\n" -" -N, --literal print raw entry names (don't treat e.g. control\n" +" -N, --literal print raw entry names (don't treat e.g. " +"control\n" " characters specially)\n" " -o like -l, but do not list group information\n" " -p, --file-type append indicator (one of /=@|) to entries\n" @@ -3203,10 +3267,12 @@ msgstr "" msgid "" " -q, --hide-control-chars print ? instead of non graphic characters\n" " --show-control-chars show non graphic characters as-is (default\n" -" unless program is `ls' and output is a terminal)\n" +" unless program is `ls' and output is a " +"terminal)\n" " -Q, --quote-name enclose entry names in double quotes\n" " --quoting-style=WORD use quoting style WORD for entry names:\n" -" literal, locale, shell, shell-always, c, escape\n" +" literal, locale, shell, shell-always, c, " +"escape\n" msgstr "" #: src/ls.c:3983 @@ -3221,8 +3287,10 @@ msgid "" " -S sort by file size\n" " --sort=WORD extension -X, none -U, size -S, time -t,\n" " version -v\n" -" status -c, time -t, atime -u, access -u, use -u\n" -" --time=WORD show time as WORD instead of modification time:\n" +" status -c, time -t, atime -u, access -u, use -" +"u\n" +" --time=WORD show time as WORD instead of modification " +"time:\n" " atime, access, use, ctime or status; use\n" " specified time as sort key if --sort=time\n" msgstr "" @@ -3231,7 +3299,8 @@ msgstr "" msgid "" " --time-style=STYLE show times using style STYLE:\n" " full-iso, long-iso, iso, locale, +FORMAT\n" -" FORMAT is interpreted like `date'; if FORMAT is\n" +" FORMAT is interpreted like `date'; if FORMAT " +"is\n" " FORMAT1FORMAT2, FORMAT1 applies to\n" " non-recent files and FORMAT2 to recent files;\n" " if STYLE is prefixed with `posix-', STYLE\n" @@ -3280,7 +3349,8 @@ msgstr "" #, c-format msgid "" "\n" -" -b, --binary read files in binary mode (default on DOS/Windows)\n" +" -b, --binary read files in binary mode (default on DOS/" +"Windows)\n" " -c, --check check %s sums against given list\n" " -t, --text read files in text mode (default)\n" "\n" @@ -3359,7 +3429,8 @@ msgid "checksums" msgstr "toetssomme" #: src/md5sum.c:615 -msgid "the --binary and --text options are meaningless when verifying checksums" +msgid "" +"the --binary and --text options are meaningless when verifying checksums" msgstr "" #: src/md5sum.c:623 @@ -3397,7 +3468,8 @@ msgstr "" #: src/mkdir.c:69 msgid "" -" -m, --mode=MODE set permission mode (as in chmod), not rwxrwxrwx - umask\n" +" -m, --mode=MODE set permission mode (as in chmod), not rwxrwxrwx - " +"umask\n" " -p, --parents no error if existing, make parent directories as needed\n" " -v, --verbose print a message for each created directory\n" msgstr "" @@ -3424,7 +3496,8 @@ msgid "" msgstr "" #: src/mkfifo.c:63 src/mknod.c:64 -msgid " -m, --mode=MODE set permission mode (as in chmod), not a=rw - umask\n" +msgid "" +" -m, --mode=MODE set permission mode (as in chmod), not a=rw - umask\n" msgstr "" #: src/mkfifo.c:94 src/mknod.c:207 @@ -3523,8 +3596,10 @@ msgstr "" #: src/mv.c:318 msgid "" -" --backup[=CONTROL] make a backup of each existing destination file\n" -" -b like --backup but does not accept an argument\n" +" --backup[=CONTROL] make a backup of each existing destination " +"file\n" +" -b like --backup but does not accept an " +"argument\n" " -f, --force do not prompt before overwriting\n" " (equivalent to --reply=yes)\n" " -i, --interactive prompt before overwrite\n" @@ -3542,7 +3617,8 @@ msgstr "" #: src/mv.c:333 msgid "" -" --target-directory=DIRECTORY move all SOURCE arguments into DIRECTORY\n" +" --target-directory=DIRECTORY move all SOURCE arguments into " +"DIRECTORY\n" " -u, --update move only when the SOURCE file is newer\n" " than the destination file or when the\n" " destination file is missing\n" @@ -3612,9 +3688,11 @@ msgstr "" msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --page-increment=NUMBER line number increment at each line\n" -" -l, --join-blank-lines=NUMBER group of NUMBER empty lines counted as one\n" +" -l, --join-blank-lines=NUMBER group of NUMBER empty lines counted as " +"one\n" " -n, --number-format=FORMAT insert line numbers according to FORMAT\n" -" -p, --no-renumber do not reset line numbers at logical pages\n" +" -p, --no-renumber do not reset line numbers at logical " +"pages\n" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" @@ -3688,7 +3766,7 @@ msgstr "ongeldige wydte vir re msgid "invalid line numbering format: %s" msgstr "ongeldige reëlnommeringformaat: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -3697,27 +3775,31 @@ msgstr "" "Gebruik so: %s BEVEL [ARG]...\n" " of: %s OPSIE\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "kon nie %s oopmaak nie" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "herleiding van standaardafvoer het misluk" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "afvoer word bygevoeg by %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "kon nie standaardfoutafvoer herlei nie" @@ -3751,7 +3833,8 @@ msgstr "" #: src/od.c:305 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" -" -s, --strings[=BYTES] output strings of at least BYTES graphic chars\n" +" -s, --strings[=BYTES] output strings of at least BYTES graphic " +"chars\n" " -t, --format=TYPE select output format or formats\n" " -v, --output-duplicates do not use * to mark line suppression\n" " -w, --width[=BYTES] output BYTES bytes per output line\n" @@ -4189,11 +4272,13 @@ msgstr "" #: src/pr.c:2790 msgid "" " -h HEADER, --header=HEADER\n" -" use a centered HEADER instead of filename in page header,\n" +" use a centered HEADER instead of filename in page " +"header,\n" " -h \"\" prints a blank line, don't use -h\"\"\n" " -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]\n" " replace spaces with CHARs (TABs) to tab WIDTH (8)\n" -" -J, --join-lines merge full lines, turns off -W line truncation, no column\n" +" -J, --join-lines merge full lines, turns off -W line truncation, no " +"column\n" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" @@ -4228,7 +4313,8 @@ msgstr "" #: src/pr.c:2821 msgid "" " -s[CHAR],--separator[=CHAR]\n" -" separate columns by a single character, default for CHAR\n" +" separate columns by a single character, default for " +"CHAR\n" " is the character without -w and 'no char' with -w\n" " -s[CHAR] turns off line truncation of all 3 column\n" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" @@ -4242,27 +4328,31 @@ msgstr " -SSTRING, --sep-string[=STRING]\n" msgid "" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" -" otherwise (same as -S\" \"), no effect on column options\n" +" otherwise (same as -S\" \"), no effect on column " +"options\n" " -t, --omit-header omit page headers and trailers\n" msgstr "" #: src/pr.c:2837 msgid "" " -T, --omit-pagination\n" -" omit page headers and trailers, eliminate any pagination\n" +" omit page headers and trailers, eliminate any " +"pagination\n" " by form feeds set in input files\n" " -v, --show-nonprinting\n" " use octal backslash notation\n" " -w PAGE_WIDTH, --width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters for\n" -" multiple text-column output only, -s[char] turns off (72)\n" +" multiple text-column output only, -s[char] turns off " +"(72)\n" msgstr "" #: src/pr.c:2847 msgid "" " -W PAGE_WIDTH, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" -" truncate lines, except -J option is set, no interference\n" +" truncate lines, except -J option is set, no " +"interference\n" " with -S or -s\n" msgstr "" @@ -4284,7 +4374,8 @@ msgstr "" #: src/printf.c:82 #, c-format -msgid "warning: %s: character(s) following character constant have been ignored" +msgid "" +"warning: %s: character(s) following character constant have been ignored" msgstr "" #: src/printf.c:95 @@ -4408,7 +4499,8 @@ msgstr "" #: src/ptx.c:1878 msgid "" -"Output a permuted index, including context, of the words in the input files.\n" +"Output a permuted index, including context, of the words in the input " +"files.\n" "\n" msgstr "" @@ -4443,7 +4535,8 @@ msgstr "" msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" -" -w, --width=NUMBER output width in columns, reference excluded\n" +" -w, --width=NUMBER output width in columns, reference " +"excluded\n" msgstr "" #: src/ptx.c:1913 @@ -4626,7 +4719,8 @@ msgstr "" msgid "" "\n" "Note that if you use rm to remove a file, it is usually possible to recover\n" -"the contents of that file. If you want more assurance that the contents are\n" +"the contents of that file. If you want more assurance that the contents " +"are\n" "truly unrecoverable, consider using shred.\n" msgstr "" @@ -4670,7 +4764,8 @@ msgstr "" msgid "" "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" "\n" -" -f, --format=FORMAT use printf style floating-point FORMAT (default: %g)\n" +" -f, --format=FORMAT use printf style floating-point FORMAT (default: %" +"g)\n" " -s, --separator=STRING use STRING to separate numbers (default: \\n)\n" " -w, --equal-width equalize width by padding with leading zeroes\n" msgstr "" @@ -4681,7 +4776,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -4898,7 +4993,8 @@ msgid "" "Usage: %s NUMBER[SUFFIX]...\n" " or: %s OPTION\n" "Pause for NUMBER seconds. SUFFIX may be `s' for seconds (the default),\n" -"`m' for minutes, `h' for hours or `d' for days. Unlike most implementations\n" +"`m' for minutes, `h' for hours or `d' for days. Unlike most " +"implementations\n" "that require NUMBER be an integer, here NUMBER may be an arbitrary floating\n" "point number.\n" "\n" @@ -4924,7 +5020,8 @@ msgstr "" #: src/sort.c:289 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" -" -d, --dictionary-order consider only blanks and alphanumeric characters\n" +" -d, --dictionary-order consider only blanks and alphanumeric " +"characters\n" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" @@ -4946,18 +5043,22 @@ msgid "" " -k, --key=POS1[,POS2] start a key at POS1, end it at POS 2 (origin 1)\n" " -m, --merge merge already sorted files; do not sort\n" " -o, --output=FILE write result to FILE instead of standard output\n" -" -s, --stable stabilize sort by disabling last-resort comparison\n" +" -s, --stable stabilize sort by disabling last-resort " +"comparison\n" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" #: src/sort.c:312 #, c-format msgid "" -" -t, --field-separator=SEP use SEP instead of non-blank to blank transition\n" -" -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or %s;\n" +" -t, --field-separator=SEP use SEP instead of non-blank to blank " +"transition\n" +" -T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or %" +"s;\n" " multiple options specify multiple directories\n" " -u, --unique with -c, check for strict ordering;\n" -" without -c, output only the first of an equal run\n" +" without -c, output only the first of an equal " +"run\n" msgstr "" #: src/sort.c:319 @@ -4967,7 +5068,8 @@ msgstr "" #: src/sort.c:324 msgid "" "\n" -"POS is F[.C][OPTS], where F is the field number and C the character position\n" +"POS is F[.C][OPTS], where F is the field number and C the character " +"position\n" "in the field. OPTS is one or more single-letter ordering options, which\n" "override global ordering options for that key. If no key is given, use the\n" "entire line as the key.\n" @@ -5327,14 +5429,16 @@ msgstr "" msgid "" " ispeed N set the input speed to N\n" " * line N use line discipline N\n" -" min N with -icanon, set N characters minimum for a completed read\n" +" min N with -icanon, set N characters minimum for a completed " +"read\n" " ospeed N set the output speed to N\n" msgstr "" #: src/stty.c:547 msgid "" " * rows N tell the kernel that the terminal has N rows\n" -" * size print the number of rows and columns according to the kernel\n" +" * size print the number of rows and columns according to the " +"kernel\n" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -5354,7 +5458,8 @@ msgid "" " [-]cstopb use two stop bits per character (one with `-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" " [-]hupcl same as [-]hup\n" -" [-]parenb generate parity bit in output and expect parity bit in input\n" +" [-]parenb generate parity bit in output and expect parity bit in " +"input\n" " [-]parodd set odd parity (even with `-')\n" msgstr "" @@ -5447,7 +5552,8 @@ msgstr "" #: src/stty.c:636 msgid "" " [-]isig enable interrupt, quit, and suspend special characters\n" -" [-]noflsh disable flushing after interrupt and quit special characters\n" +" [-]noflsh disable flushing after interrupt and quit special " +"characters\n" " * [-]prterase same as [-]echoprt\n" " * [-]tostop stop background jobs that try to write to the terminal\n" " * [-]xcase with icanon, escape with `\\' for uppercase characters\n" @@ -6073,7 +6179,8 @@ msgstr "" #: src/test.c:1038 msgid "" " -S FILE FILE exists and is a socket\n" -" -t [FD] file descriptor FD (stdout by default) is opened on a terminal\n" +" -t [FD] file descriptor FD (stdout by default) is opened on a " +"terminal\n" " -u FILE FILE exists and its set-user-ID bit is set\n" " -w FILE FILE exists and is writable\n" " -x FILE FILE exists and is executable\n" @@ -6082,7 +6189,8 @@ msgstr "" #: src/test.c:1045 msgid "" "\n" -"Beware that parentheses need to be escaped (e.g., by backslashes) for shells.\n" +"Beware that parentheses need to be escaped (e.g., by backslashes) for " +"shells.\n" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" @@ -6133,7 +6241,8 @@ msgstr "" msgid "" " -r, --reference=FILE use this file's times instead of current time\n" " -t STAMP use [[CC]YY]MMDDhhmm[.ss] instead of current time\n" -" --time=WORD set time given by WORD: access atime use (same as -a)\n" +" --time=WORD set time given by WORD: access atime use (same as -" +"a)\n" " modify mtime (same as -m)\n" msgstr "" @@ -6149,7 +6258,8 @@ msgstr "" #: src/touch.c:397 #, c-format -msgid "warning: `touch %s' is obsolete; use `touch -t %04d%02d%02d%02d%02d.%02d'" +msgid "" +"warning: `touch %s' is obsolete; use `touch -t %04d%02d%02d%02d%02d.%02d'" msgstr "" #: src/touch.c:431 @@ -6168,7 +6278,8 @@ msgid "" "\n" " -c, --complement first complement SET1\n" " -d, --delete delete characters in SET1, do not translate\n" -" -s, --squeeze-repeats replace each input sequence of a repeated character\n" +" -s, --squeeze-repeats replace each input sequence of a repeated " +"character\n" " that is listed in SET1 with a single occurrence\n" " of that character\n" " -t, --truncate-set1 first truncate SET1 to length of SET2\n" @@ -6422,8 +6533,10 @@ msgstr "" #: src/unexpand.c:389 msgid "" -" -a, --all convert all whitespace, instead of just initial whitespace\n" -" --first-only convert only leading sequences of whitespace (overrides -a)\n" +" -a, --all convert all whitespace, instead of just initial " +"whitespace\n" +" --first-only convert only leading sequences of whitespace (overrides -" +"a)\n" " -t, --tabs=N have tabs N characters apart instead of 8 (enables -a)\n" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" @@ -6745,3 +6858,6 @@ msgid "" "Repeatedly output a line with all specified STRING(s), or `y'.\n" "\n" msgstr "" + +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Gebruik so: %s [OPSIE]... LINKERLÊER REGTERLÊER\n" diff --git a/po/be.po b/po/be.po index 0db8615a85..9075921c9e 100644 --- a/po/be.po +++ b/po/be.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0.91\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2003-10-30 01:10+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -154,7 +154,7 @@ msgstr "памер кавалку" msgid "failed to return to initial working directory" msgstr "немагчыма вярнуцца ў пачатковую працоўную тэчку" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "немагчыма стварыць тэчку %s" @@ -235,19 +235,19 @@ msgstr "немагчыма пераўтварыць U+%04X у мясцовы н msgid "cannot convert U+%04X to local character set: %s" msgstr "немагчыма пераўтварыць U+%04X у мясцовы набор знакаў: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "нерэчаісны карыстальнік" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "нерэчаісная група" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "немагчыма атрымаць уліковую групу лічбавага UID" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "немагчыма абмінуць разам карыстальніка й групу" @@ -356,15 +356,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "нерэчаісны довад \"%s\"" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "памылка параўнаньня радку" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Усталюйце LC_ALL='C' каб працаваць без пытаньняў." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Радкі былі параўнаны тут %s і тут %s." @@ -378,7 +378,7 @@ msgstr "Радкі былі параўнаны тут %s і тут %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -412,15 +412,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -439,9 +439,9 @@ msgstr "" "Паведамляйце пра памылкі на <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -651,17 +651,17 @@ msgstr "немагчыма зьмяніць рэжым %s на %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "рэжым %s утрыманы як %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "немагчыма атрымаць доступ да %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "немагчыма прачытаць тэчку %s" @@ -671,7 +671,7 @@ msgstr "немагчыма прачытаць тэчку %s" msgid "changing permissions of %s" msgstr "зьмяненьне правоў %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "памылка чытаньня" @@ -900,7 +900,7 @@ msgstr "немагчыма зьмяніць каранёвую тэчку на % msgid "cannot chdir to root directory" msgstr "немачыма перайсьці да каранёвае тэчкі" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "немагчыма выканаць загад %s" @@ -927,18 +927,29 @@ msgstr "" "Друкуе CRC падлік і колькасьць байтаў кожнага ФАЙЛу.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Выкарыстаньне: %s [ВЫБАР]... ЛЕВЫ_ФАЙЛ ПРАВЫ_ФАЙЛ\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Парановае упарадкаваныя файлы ЛЕВЫ_ФАЙЛ і ПРАВЫ_ФАЙЛ радок за радком.\n" @@ -952,7 +963,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "немагыма адчыніць %s для чытаньня" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -963,7 +974,7 @@ msgstr "немагчыма выканаць fstat %s" msgid "skipping file %s, as it was replaced while being copied" msgstr "файл %s мінаецца, таму што ён быў заменены пад час капіяваньня" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -974,207 +985,207 @@ msgstr "немагчыма выдаліць %s" msgid "cannot create regular file %s" msgstr "немагчыма стварыць звычайны файл %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "чытаецца %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "немагчыма зрабіць lseek %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "пішацца %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "зачыняецца %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: перазапісаць %s, рэжым перазапісу %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: перазапісаць %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "немагчыма зрабіць stat %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "мінаецца тэчка %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "увага: зыходны файл %s зададзены больш за адзін раз" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s і %s адзін і той жа ж файл" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "немагчыма перазапісаць ня тэчку %s тэчкай %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "толькі што створаны %s з %s ня будзе перазапісаны" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "немагчыма перазапісаць тэчку %s ня тэчкай" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "немагчыма перазапісаць тэчку %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "немагчыма перамясьціць тэчку ў ня тэчку: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "стварэньне запасной копіі %s зьнішчыць крыніцу; %s не перанесен" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "стварэньне запасной копіі %s зьнішчыць крыніцу; %s не скапіяван" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "немагчыма стварыць запасную копію %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (запасны: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "немагчыма скапіяваць тэчку, %s, саму ў сябе, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "жорсткае лучыва %s на тэчку %s ня будзе створана" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "немагчыма стварыць жорсткае лучыва %s на %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "немагчыма перамясьціць %s ва ўласную падтэчку, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "немагчыма перамясьціць %s у %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "збой міжпрыладнага перамяшчэньня: %s у %s; немагчыма выдаліць мэту" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "немагчыма скапіяваць цыклічнае знакавае лучыва %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: можа стварыць адноснае знакавае лучыва толькі ў бягучае тэчцы" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "немагчыма стварыць знакавае лучыва %s на %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "немагчыма стварыць лучыва %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "немагчыма стварыць fifo %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "немагчыма стварыць асаблівы файл %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "немагчыма прачытаць знакавае лучыва %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "немагчыма стварыць знакавае лучыва %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "памылка пры захаваньні ўладальніку для %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s мае невядомы від файлу" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "захоўвае час для %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "немагчыма адшукаць файл %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "збой пры захаваньні аўтарства для %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "усталяваньне правоў для %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "немагчыма вастанавіць %s з запасное копіі" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (вастанаўленьне)\n" @@ -2261,7 +2272,7 @@ msgstr "" " абмежаваць вывад файлавымі сыстэмамі ня гэтага віду\n" " -v (незаўважаецца)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2380,15 +2391,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2399,7 +2411,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2412,30 +2424,30 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "усяго" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "незразумелая найбольшая глыбіня %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "немагчыма адначасова й падлічыць і паказаць усе пункты" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "" @@ -2617,18 +2629,18 @@ msgstr "" msgid "syntax error" msgstr "сынтаксічная памылка" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "ня лічбавы довад" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "дзяленьне на нуль" @@ -3058,11 +3070,6 @@ msgid "" "\n" msgstr "" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4097,7 +4104,7 @@ msgstr "недзеяздольная шырыня поля нумара радк msgid "invalid line numbering format: %s" msgstr "нерэчаісны фармат нумараваньня радкоў: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4106,7 +4113,7 @@ msgstr "" "Выкарыстаньне: %s ЗАГАД [ДОВАД]...\n" " ці: %s ВЫБАР\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -4114,21 +4121,25 @@ msgstr "" " Выконвае загад, незаўважаючы сыгналы HUP.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "немагчыма адчыніць %s" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "немагчыма перанакіраваць стандартны вывад" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "далучэньне вываду да %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "немагчыма перанакіраваць стандартны вывад памылак" @@ -5148,7 +5159,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7276,6 +7287,9 @@ msgstr "" "Бесперапынна выводзіць РАДОК(і), ці літару \"y\".\n" "\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Выкарыстаньне: %s [ВЫБАР]... ЛЕВЫ_ФАЙЛ ПРАВЫ_ФАЙЛ\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** нерэчаісная дата/час ***" diff --git a/po/ca.po b/po/ca.po index bde0f5c281..ad47e836f7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -37,10 +37,10 @@ # bonic, excepte quan quede realment horrend o porte a confusió). msgid "" msgstr "" -"Project-Id-Version: coreutils 5.1.3\n" +"Project-Id-Version: coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-02-11 12:35+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-02-21 16:27+0100\n" "Last-Translator: Ivan Vilata i Balaguer \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -190,7 +190,7 @@ msgid "failed to return to initial working directory" msgstr "no s'ha pogut tornar al directori inicial de treball" # Els 3 usen quote(). ivb -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "no s'ha pogut crear el directori %s" @@ -277,19 +277,19 @@ msgstr "no s'ha pogut convertir U+%04X al joc de caràcters local" msgid "cannot convert U+%04X to local character set: %s" msgstr "no s'ha pogut convertir U+%04X al joc de caràcters local: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "l'usuari no és vàlid" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "el grup no és vàlid" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "no s'ha pogut obtenir el grup d'entrada d'un UID numèric" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "no es poden ometre l'usuari i el grup alhora" @@ -416,16 +416,16 @@ msgstr "" msgid "invalid argument: %s" msgstr "l'argument no és vàlid: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "ha fallat la comparació de cadenes" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Establiu la variable LC_ALL a «C» per evitar el problema." # Usa quote() en les 2. ivb -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Les cadenes comparades eren %s i %s." @@ -439,7 +439,7 @@ msgstr "Les cadenes comparades eren %s i %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -473,15 +473,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -500,9 +500,9 @@ msgstr "" "Informeu dels errors a <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -743,19 +743,19 @@ msgid "mode of %s retained as %04lo (%s)\n" msgstr "el mode de %s es manté en %04lo (%s)\n" # Usa quote(). ivb -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "no s'ha pogut accedir a %s" # En les 3 és nom de fitxer amb quote(). ivb -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" # Usa quote(). ivb -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "no s'ha pogut llegir el directori %s" @@ -768,7 +768,7 @@ msgid "changing permissions of %s" msgstr "en canviar els permissos de %s" # És una funció. ivb -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "ha fallat fts_read()" @@ -1008,7 +1008,7 @@ msgid "cannot chdir to root directory" msgstr "no s'ha pogut canviar al directori arrel" # Els 2 usen quote(). ivb -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "no s'ha pogut executar l'ordre %s" @@ -1035,17 +1035,29 @@ msgstr "" "Mostra la suma CRC i el tamany en octets de cada FITXER.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Forma d'ús: %s [OPCIÓ]... FITXER1 FITXER2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 +#, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Compara els fitxers ordenats FITXER1 i FITXER2 línia per línia.\n" @@ -1064,7 +1076,7 @@ msgid "cannot open %s for reading" msgstr "no s'ha pogut obrir %s per llegir" # Els 4 usen quote(). ivb -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -1077,7 +1089,7 @@ msgid "skipping file %s, as it was replaced while being copied" msgstr "es salta el fitxer %s, que va ser reemplaçat en ser copiat" # Els 6 usen quote(). ivb -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -1090,27 +1102,27 @@ msgid "cannot create regular file %s" msgstr "no s'ha pogut crear el fitxer ordinari %s" # Els 3 usen quote(). ivb -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "s'està llegint %s" # Usa quote(). ivb -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "ha fallat lseek() sobre %s" # Els 4 usen quote(). ivb # En els 4 indica condició d'error. ivb -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "en escriure %s" # Els 2 usen quote(). ivb # En els 2 indica condició d'error. ivb -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "en tancar %s" @@ -1123,128 +1135,128 @@ msgstr "en tancar %s" # a punt" :) I encara no tindrà fileutils traduït... jm # Aiii senyor, com passa el temps, ja ni hi ha fileutils (2003-1). ivb # Usa quote() en el 1r arg. ivb -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: voleu sobreescriure %s, reemplaçant el mode %04lo? " # Usa quote(). ivb -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: voleu sobreescriure %s? " # Els 3 usen quote(). ivb -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "ha fallat stat() sobre %s" # Usa quote(). ivb -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "es descarta el directori %s" # Usa quote(). ivb -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "avís: s'ha especificat el fitxer origen %s més d'una vegada" # Els 2 usen quote() en els 2 args. ivb -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s i %s són el mateix fitxer" # Usa quote() en els 2 args. ivb -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "no es pot sobreescriure el no-directori %s amb el directori %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "no es sobreescriurà %s, tot just creat, amb %s" # Usa quote(). ivb -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "no es pot sobreescriure el directori %s amb un no-directori" # Usa quote(). ivb -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "no es pot sobreescriure el directori %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "no es pot moure un directori sobre un no-directori: %s -> %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "una còpia de seguretat de %s destruiria el fitxer origen; no es mou %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "una còpia de seguretat de %s destruiria el fitxer origen; no es còpia %s" # Els 2 usen quote(). ivb -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "no sha pogut crear una còpia de seguretat de %s" # Usa quote(). ivb -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (còpia de seguretat: %s)" # Usa quote() en els 2 args. ivb -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "no es pot copiar un directori, %s, dins d'ell mateix, %s" # Un quote() en els 2 args. ivb -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "no es crearà l'enllaç fort %s cap al directori %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "no s'ha pogut crear l'enllaç fort %s cap a %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "no es pot moure %s a un subdirectori d'ell mateix, %s" # Usa quote() en els dos args. ivb -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "no s'ha pogut moure %s a %s" # Usa quote() en es 2 args. ivb -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" @@ -1252,100 +1264,100 @@ msgstr "" "destí" # Usa quote(). ivb -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "no es pot copiar l'enllaç simbòlic cíclic %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: només es poden fer enllaços simbòlics relatius en el directori actual" # Usa quote() en els 2 arguments. ivb -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "no s'ha pogut crear l'enllaç simbòlic %s cap a %s" # Usa quote(). ivb -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "no s'ha pogut crear l'enllaç %s" # Els 2 usen quote(). ivb -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "no s'ha pogut crear la cua FIFO %s" # Usa quote(). ivb -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "no s'ha pogut crear el fitxer especial %s" # Els 3 usen quote(). ivb -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" # Usa quote(). ivb -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "no s'ha pogut crear l'enllaç simbòlic %s" # Els 3 usen quote(). ivb -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "no s'ha pogut preservar el propietari de %s" # Usa quote(). ivb -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s és d'un tipus de fitxer desconegut" # Usa quote(). ivb # Indica condició d'error. ivb -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "en preservar les dates de %s" # Usa quote(). ivb -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "no s'ha pogut cercar el fitxer %s" # Usa quote(). ivb -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "no s'ha pogut preservar l'autoria de %s" # Usa quote(). ivb # Indica condició d'error. ivb -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "en establir els permissos de %s" # Els 2 usen quote(). ivb # L'argument és el nom original. ivb -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "no s'ha pogut recuperar la còpia de seguretat de %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (recuperació de la còpia de seguretat)\n" @@ -2606,7 +2618,7 @@ msgstr "" " del TIPUS especificat.\n" " -v (No es té en compte.)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2764,11 +2776,13 @@ msgstr "" " Segueix cada FITXER que siga un enllaç simbòlic.\n" #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2782,7 +2796,7 @@ msgstr "" "d'enllaços\n" " forts.\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2800,7 +2814,7 @@ msgstr "" " -S, --separate-dirs No inclou el tamany dels subdirectoris.\n" " -s, --summarize Només mostra un total per cada argument.\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2824,11 +2838,11 @@ msgstr "" " equival a «--summarize».\n" # Els 3 fan el mateix ús. ivb -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "total" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2837,21 +2851,21 @@ msgstr "" "mateix que «--dereference-args» (-D)" # Usa quote(). ivb -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "la profunditat màxima %s no és vàlida" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "no es pot resumir les entrades i mostrar-ne els continguts alhora" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "avís: resumir equival a utilitzar «--max-depth=0»" # conflicts -> no compatible? jm -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "avís: resumir no és compatible amb «--max-depth=%d»" @@ -3132,7 +3146,7 @@ msgstr "" msgid "syntax error" msgstr "error de sintaxi" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -3142,11 +3156,11 @@ msgstr "" "expressió regular bàsica no és portable; es descarta" # És un missatge d'error (expr a + 3). ivb -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "l'argument no és numèric" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "divisió entre zero" @@ -3712,11 +3726,6 @@ msgstr "" "VERSION_CONTROL. Es poden usar aquests valors:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Forma d'ús: %s [OPCIÓ]... FITXER1 FITXER2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -5067,7 +5076,7 @@ msgstr "l'amplada del camp de números de línia no és vàlida: %s" msgid "invalid line numbering format: %s" msgstr "l'estil de numeració de línia no és vàlid: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -5076,7 +5085,7 @@ msgstr "" "Forma d'ús: %s ORDRE [ARGUMENT]...\n" " o bé: %s OPCIÓ\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -5085,23 +5094,27 @@ msgstr "" "\n" # Els 2 usen quote(). ivb -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "no s'ha pogut obrir %s" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "no s'ha pogut redirigir l'eixida estàndard" # Missatge informatiu. ivb # Usa quote(). ivb -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "s'afegeix l'eixida a %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "no s'ha pogut redirigir l'eixida estàndard d'errors" @@ -6532,12 +6545,12 @@ msgstr "" " -w, --equal-width Iguala l'amplària replenant amb zeros al davant.\n" #: src/seq.c:96 -#, c-format +#, fuzzy, c-format msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -6935,7 +6948,7 @@ msgstr "" " Defineix el TAMANY de l'avantmemòria principal.\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -6950,9 +6963,10 @@ msgstr "" " Usa SEP com a separador de camp, en lloc de la\n" " transició de caràcter no-blanc a blanc.\n" " -T, --temporary-directory=DIR\n" -" Usa DIR com a directori temporal (se'n poden indicar\n" -" més repetint l'opció), en lloc de $TMPDIR o «%s».\n" -" -u, --unique Amb «-c» comprova que l'ordenació és estricta, en " +" Usa DIR com a directori temporal, en lloc de $TMPDIR " +"o\n" +" «%s»; se'n poden indicar més repetint l'opció.\n" +" -u, --unique Amb «-c» comprova que l'ordenació és estricta; en " "cas\n" " contrari només escriu la primera d'aquelles entrades\n" " que resulten iguals.\n" @@ -9486,3 +9500,6 @@ msgid "" msgstr "" "Mostra repetidament una línia amb totes les cadenes indicades, o «y».\n" "\n" + +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Forma d'ús: %s [OPCIÓ]... FITXER1 FITXER2\n" diff --git a/po/cs.po b/po/cs.po index f0ee6b8c93..ae0fb071b2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: textutils 2.0.14\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2001-08-18 15:01+0200\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" @@ -154,7 +154,7 @@ msgstr "velikost bloku" msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "adresáø %s nelze vytvoøit" @@ -238,19 +238,19 @@ msgstr "znak U+%04X nelze p msgid "cannot convert U+%04X to local character set: %s" msgstr "znak U+%04X nelze pøevést do lokální znakové sady" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "neplatný u¾ivatel" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "neplatná skupina" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "k UID nelze zjistit pøihla¹ovací skupinu" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "nemù¾ete vynechat jak u¾ivatele tak skupinu" @@ -360,15 +360,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "argument %s je pro `%s' neplatný" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "" @@ -382,7 +382,7 @@ msgstr "" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -420,15 +420,15 @@ msgstr "" " --version vypí¹e oznaèení verze a skonèí\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -448,9 +448,9 @@ msgstr "" "anglicky), pøipomínky k pøekladu zasílejte na adresu (èesky)." #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -667,17 +667,17 @@ msgstr "pr msgid "mode of %s retained as %04lo (%s)\n" msgstr "práva souboru %s zùstala %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "%s nelze provést" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "adresáø %s nelze vytvoøit" @@ -687,7 +687,7 @@ msgstr "adres msgid "changing permissions of %s" msgstr "práva %s nelze zmìnit" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "ètení ze souboru se nezdaøilo" @@ -884,7 +884,7 @@ msgstr "do adres msgid "cannot chdir to root directory" msgstr "do adresáøe `%s' nelze vejít" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "ioctl na `%s' není mo¾né vykonat" @@ -909,18 +909,29 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Pou¾ití: %s [PØEPÍNAÈ]... LEVÝ_SOUBOR PRAVÝ_SOUBOR\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR1 SOUBOR2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" " Porovnává soubory LEVÝ_SOUBOR a PRAVÝ_SOUBOR, jejich¾ øádky jsou " @@ -942,7 +953,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "`%s' nelze do `%s' pøemístit" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -953,7 +964,7 @@ msgstr "datum nelze nastavit" msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -964,207 +975,207 @@ msgstr "adres msgid "cannot create regular file %s" msgstr "nelze vytvoøit doèasný soubor" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "chyba pøi ètení %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "%s nelze provést" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "chyba pøi zápisu %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "uzavírání %s (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, fuzzy, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: pøepsat `%s', pøehlédnout práva %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: pøepsat `%s'? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "`%s' a `%s' jsou jeden a tentý¾ soubor" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "do adresáøe `%s' nelze vejít" -#: src/copy.c:927 +#: src/copy.c:932 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: adresáø nelze pøepsat souborem, který není adresáøem" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "do adresáøe `%s' nelze vejít" -#: src/copy.c:1031 +#: src/copy.c:1036 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "vytvoøení zálohy souboru `%s' mù¾e znièit zdroj; `%s' nepøejmenován" -#: src/copy.c:1032 +#: src/copy.c:1037 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "vytvoøení zálohy souboru `%s' mù¾e znièit zdroj; `%s' nekopírován" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "pøíkaz %s nelze provést" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (záloha: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "do adresáøe `%s' nelze vejít" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "do adresáøe `%s' nelze vejít" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "ioctl na `%s' není mo¾né vykonat" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: zacyklené symbolické odkazy nelze kopírovat" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: relativní symbolický odkaz lze vytvoøit pouze v aktuálním adresáøi" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "posun znaku je nula" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "ioctl na `%s' není mo¾né vykonat" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "adresáø %s nelze vytvoøit" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "zachování vlastnictví souboru %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: neznámý typ souboru" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "zachování èasù souboru %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "zachování èasù souboru %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "zachování vlastnictví souboru %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "práva %s nelze zmìnit" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "pøíkaz %s nelze provést" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (obnoven ze zálohy)\n" @@ -2211,7 +2222,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2343,15 +2354,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2362,7 +2374,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2375,32 +2387,32 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "celkem" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "chybné èíslo polo¾ky: `%s'" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "" "není mo¾né oboje, poèítat celkové souèty pro ka¾dý argument a ukázat\n" "v¹echny polo¾ky" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "varování: sumarizace je stejná jako pou¾ití --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "varování: sumarizace je v rozporu s --max-depth=%d" @@ -2604,7 +2616,7 @@ msgstr "" msgid "syntax error" msgstr "standardní chybový výstup" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2613,12 +2625,12 @@ msgstr "" "upozornìní: nepøenositelné : '%s': pou¾ití '^' jako prvního znaku\n" "základního regulárního výrazu není pøenositelné; bude ignorováno" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "argument oøezán" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3159,11 +3171,6 @@ msgstr "" " jinak jednoduché\n" " simple, never jednoduché zálo¾ní kopie\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR1 SOUBOR2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4293,7 +4300,7 @@ msgstr "chybn msgid "invalid line numbering format: %s" msgstr "chybná hodnota pøírùstku èísla øádku: `%s'" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4302,28 +4309,32 @@ msgstr "" "Pou¾ití: %s [SOUBOR]...\n" " nebo: %s [PØEPÍNAÈ]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "zachování èasù souboru %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "standardní výstup" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "vlastníka a/nebo skupinu %s nelze zmìnit" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5410,7 +5421,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7921,6 +7932,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Pou¾ití: %s [PØEPÍNAÈ]... LEVÝ_SOUBOR PRAVÝ_SOUBOR\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "chybné èíslo polo¾ky: `%s'" diff --git a/po/da.po b/po/da.po index aa9f08d676..84999d758a 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 4.5.11\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2003-03-30 19:53+0200\n" "Last-Translator: Keld Jørn Simonsen \n" "Language-Team: Danish \n" @@ -153,7 +153,7 @@ msgstr "blokst msgid "failed to return to initial working directory" msgstr "Mislykkedes med at returnere til oprindeligt arbejdskatalog" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "kan ikke oprette katalog %s" @@ -234,19 +234,19 @@ msgstr "kan ikke konvertere U+%04X til lokalt tegns msgid "cannot convert U+%04X to local character set: %s" msgstr "Kan ikke konvertere U+%04X til lokalt tegnsæt: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "ugyldig bruger" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "ugyldig gruppe" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "kan ikke finde logind-gruppen for en numerisk bruger-ID" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "kan ikke undlade både bruger *og* gruppe" @@ -355,15 +355,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "ugyldigt argument '%s'" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "strengsammenligning mislykkedes" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Sæt LC_ALL='C' for at omgå problemet." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "De sammenlignede strenge var '%s' og '%s'." @@ -377,7 +377,7 @@ msgstr "De sammenlignede strenge var '%s' og '%s'." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -411,15 +411,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -438,9 +438,9 @@ msgstr "" "Rapportér fejl til <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -651,17 +651,17 @@ msgstr "kunne ikke msgid "mode of %s retained as %04lo (%s)\n" msgstr "tilstand for %s beholdt som %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "kan ikke tilgå %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "kan ikke læse katalog %s" @@ -671,7 +671,7 @@ msgstr "kan ikke l msgid "changing permissions of %s" msgstr "ændrer rettigheder på %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "læsefejl" @@ -895,7 +895,7 @@ msgstr "kan ikke msgid "cannot chdir to root directory" msgstr "kan ikke ændre til rod-katalog" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "kan ikke aflænke %s" @@ -922,18 +922,29 @@ msgstr "" "Udskriv CRC-kontrolsum og byteantal for hver FIL.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Brug: %s [FLAG]... VENSTRE_FIL HØJRE_FIL\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Brug: %s [FLAG]... FIL1 FIL2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Sammenlign de sorterede filer VENSTRE_FIL og HØJRE_FIL linje for linje.\n" @@ -947,7 +958,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "kan ikke åbne %s til læsning" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -958,7 +969,7 @@ msgstr "kan ikke udf msgid "skipping file %s, as it was replaced while being copied" msgstr "overspringer fil %s, da den blev erstattet mens den blev kopieret" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -969,207 +980,207 @@ msgstr "kan ikke fjerne %s" msgid "cannot create regular file %s" msgstr "kan ikke oprette almindelig fil %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "læser %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "kan ikke udføre lseek() %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "skriver %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "lukker %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: overskriv %s, uden hensyn til tilstand %04lo?" -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: overskriv %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "kan ikke udføre stat() %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "udelader katalog %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "advarsel: kildefil %s er angivet mere end én gang" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s og %s er den samme fil" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan ikke overskrive ikke-katalog %s med katalog %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "vil ikke overskrive netop oprettet %s med %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan ikke overskrive katalog %s med ikke-katalog" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "kan ikke overskrive katalog %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan ikke flytte katalog til ikke-katalog: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "sikkerhedskopi af %s vil overskrive kildefil; %s er ikke flyttet" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "sikkerhedskopi af %s vil overskrive kildefil; %s er ikke kopieret" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "kan ikke sikkerhedskopiere %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (sikkerhedskopi: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kan ikke kopiere et katalog %s til sig selv %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "vil ikke oprette hård lænke %s til katalog %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "kan ikke oprette hård lænke %s til %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "kan ikke flytte %s til et underkatalog af sig selv, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "kan ikke flytte %s til %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "flytning mellem enheder mislykkedes: %s til %s; kan ikke fjerne målet" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kan ikke kopiere cyklisk symbolsk lænke %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: kan kun oprette relative symbolske lænker i aktuelt katalog" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan ikke oprette symbolsk lænke %s til %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "kan ikke oprette lænke %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "kan ikke oprette fifo %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "kan ikke oprette specialfil %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "kan ikke læse symbolsk lænke %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "kan ikke oprette symbolsk lænke %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "kunne ikke bevare ejerskab for %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s har ukendt filtype" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "beholder tider for %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "kunne ikke beholde tider for %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "kunne ikke bevare forfatter af %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "sætter adgangsrettigheder på %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "kan ikke genoprette sikkerhedskopi af %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (genopret sikkerhedskopi)\n" @@ -2309,7 +2320,7 @@ msgstr "" " -x, --exclude-type=TYPE vis kun filsystemer som ikke er af typen TYPE\n" " -v (ignoreret)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 #, fuzzy msgid "" "\n" @@ -2461,10 +2472,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2474,7 +2486,7 @@ msgstr "" " -k, --kilobytes ligesom --block-size=1024\n" " -l, --count-links tæl størrelsen med flere gange for hårde lænker\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2489,7 +2501,7 @@ msgstr "" " -S, --separate-dirs medtag ikke størrelsen på underkataloger\n" " -s, --summarize vis kun sum for hvert argument\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2512,30 +2524,30 @@ msgstr "" " argumentet; --max-depth=0 er det samme som\n" " --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "totalt" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "ugyldig største dybde %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "kan ikke både summere og vise alle størrelser" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "advarsel: summering er det samme som at bruge --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "advarsel: summering er i konflikt med --max-depth=%d" @@ -2786,7 +2798,7 @@ msgstr "" msgid "syntax error" msgstr "syntaksfejl" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2796,11 +2808,11 @@ msgstr "" "brug af '^' som første tegn af et almindelig regulært udtryk er ikke\n" "portabelt; '^' ignoreres" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "ikke-numerisk argument" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "deling med nul" @@ -3313,11 +3325,6 @@ msgstr "" "er:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Brug: %s [FLAG]... FIL1 FIL2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4563,7 +4570,7 @@ msgstr "ugyldig bredde p msgid "invalid line numbering format: %s" msgstr "ugyldig øgning af linjenummer: \"%s\"" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4572,28 +4579,32 @@ msgstr "" "Brug: %s FORMAT [ARGUMENT]...\n" " eller: %s FLAG\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "kunne ikke beholde tider for %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "lukker standard-ud" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "ændrer gruppe for %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5870,7 +5881,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8621,6 +8632,9 @@ msgstr "" "Skriv gentagne gange en linje med alle specificerede STRENG'e, eller \"y\"\n" "\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Brug: %s [FLAG]... VENSTRE_FIL HØJRE_FIL\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** ugyldig datoi/klokkeslæt ***" diff --git a/po/de.po b/po/de.po index 72aead0dd1..07cec703f3 100644 --- a/po/de.po +++ b/po/de.po @@ -37,10 +37,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU coreutils 5.1.3\n" +"Project-Id-Version: GNU coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-02-09 10:45 +0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-03-02 13:08 +0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -184,7 +184,7 @@ msgstr "Blockgröße" msgid "failed to return to initial working directory" msgstr "konnte nicht in ursprüngliches Arbeitsverzeichnis zurückkehren" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "kann Verzeichnis %s nicht anlegen" @@ -266,19 +266,19 @@ msgstr "kann U+%04X nicht in lokalen Zeichensatz konvertieren" msgid "cannot convert U+%04X to local character set: %s" msgstr "kann U+%04X nicht in lokalen Zeichensatz konvertieren: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "ungültiger Benutzer" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "ungültige Gruppe" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "kann die Login-Gruppe einer numerischen UID nicht ermitteln" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "kann nicht sowohl Benutzer als auch Gruppe weglassen" @@ -405,15 +405,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "ungültiges Argument: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "Zeichenkettenvergleich fehlgeschlagen" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Setzen Sie LC_ALL=C, um das Problem zu umgehen." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Die verglichenen Zeichenketten waren %s und %s." @@ -427,7 +427,7 @@ msgstr "Die verglichenen Zeichenketten waren %s und %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -461,15 +461,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -488,9 +488,9 @@ msgstr "" "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -716,17 +716,17 @@ msgstr "Änderung des Modus von %s nach %04lo (%s) fehlgeschlagen\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "Modus von %s als %04lo (%s) erhalten\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "Zugriff auf %s nicht möglich" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "kann Verzeichnis %s nicht lesen" @@ -736,7 +736,7 @@ msgstr "kann Verzeichnis %s nicht lesen" msgid "changing permissions of %s" msgstr "Beim Setzen der Zugriffsrechte für %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "fts_read fehlgeschlagen" @@ -966,7 +966,7 @@ msgstr "Es ist nicht möglich, das Wurzelverzeichnis in %s zu ändern" msgid "cannot chdir to root directory" msgstr "Es ist nicht möglich, in das Wurzelverzeichnis zu wechseln" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "es ist nicht möglich, %s auszuführen" @@ -993,18 +993,29 @@ msgstr "" "CRC-Checksumme und Byteanzahl für jede DATEI ausgeben.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Aufruf: %s [OPTION]... LINKE_DATEI RECHTE_DATEI\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Aufruf: %s [OPTION]... DATEI1 DATEI2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Sortierte Dateien LINKE_DATEI und RECHTE_DATEI Zeile für Zeile vergleichen.\n" @@ -1018,7 +1029,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "%s kann nicht zum Lesen geöffnet werden" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -1029,7 +1040,7 @@ msgstr "Aufruf von fstat für %s nicht möglich" msgid "skipping file %s, as it was replaced while being copied" msgstr "überspringe Datei %s, da sie während des Kopierens ersetzt wurde" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -1041,216 +1052,216 @@ msgid "cannot create regular file %s" msgstr "reguläre Datei %s kann nicht angelegt werden" # XLATE_REMARK: Check this out! is the %s replaced by the name of the directory? -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "Lesen von %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "Aufruf von lseek für %s nicht möglich" # XLATE_REMARK: Check this out! is the %s replaced by the name of the directory? -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "Schreiben von %s" # XLATE_REMARK: Check this out! is the %s replaced by the name of the directory? -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "Schließen von %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: Überschreiben von %s, über Modus %04lo hinwegsetzen? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s überschreiben? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "Aufruf von stat für %s nicht möglich" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "Verzeichnis %s ausgelassen" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "Warnung: Quelldatei %s mehr als einmal angegeben" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s und %s sind die gleiche Datei" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" "Überschreiben des Nicht-Verzeichnisses %s mit Verzeichnis %s nicht möglich." -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "Neu erstelltes %s wird nicht mit %s überschrieben." -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" "Überschreiben des Verzeichnisses %s mit Nicht-Verzeichnis nicht möglich." -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "Überschreiben des Verzeichnisses %s nicht möglich" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "Verschieben von Verzeichnis auf ein Nicht-Verzeichnis nicht möglich: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "Sicherung von %s würde Quelle zerstören; %s nicht verschoben" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "Sicherung von %s würde Quelle zerstören; %s nicht kopiert" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "Sicherung von %s nicht möglich" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (Sicherung: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "Kopieren eines Verzeichnisses, %s, in sich selbst (%s) nicht möglich" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "Harte Verknüpfung %s zu Verzeichnis %s wird nicht erzeugt" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "Erzeugen von harter Verknüpfung %s zu Verzeichnis %s nicht möglich" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "Verschieben von %s in eigenes Unterverzeichnis (%s) nicht möglich" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "Verschieben von %s nach %s nicht möglich" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "Verschieben zwischen Geräten fehlgeschlagen: %s zu %s; kann Ziel nicht " "entfernen" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "Kopieren von zyklischer symbolischer Verknüpfung %s nicht möglich" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: Erzeugen relativer symbolischer Verknüpfungen nur in momentanem " "Verzeichnis möglich" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "Erzeugen der symbolischen Verknüpfung %s nach %s nicht möglich" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "Erzeugen von Verknüpfung %s nicht möglich" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "Erzeugen von FIFO %s nicht möglich" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "Erzeugen der Spezialdatei %s nicht möglich" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "Lesen der symbolischen Verknüpfung %s nicht möglich" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "Erzeugen der symbolischen Verknüpfung %s nicht möglich" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "konnte den Eigentümer für %s nicht erhalten" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s hat einen unbekannten Dateityp" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "Erhalten der Zeiten für %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "konnte die Datei %s nicht finden" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "konnte den Urheber für %s nicht erhalten" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "Setzen der Zugriffsrechte für %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "Löschen der Sicherung von %s nicht möglich" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (Löschen der Sicherung)\n" @@ -2422,7 +2433,7 @@ msgstr "" "begrenzen.\n" " -v (ignoriert)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2574,11 +2585,13 @@ msgstr "" " symbolische Verknüpfungen handelt\n" #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2591,7 +2604,7 @@ msgstr "" " -l, --count-links Größe mehrfach zählen, wenn durch harte\n" " Verknüpfungen verbunden\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2610,7 +2623,7 @@ msgstr "" " mitzählen\n" " -s, --summarize nur Summe für jedes Argument anzeigen\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2636,11 +2649,11 @@ msgstr "" " „--max-depth=0“ ist dasselbe wie „--" "summarize“.\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "insgesamt" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2648,21 +2661,21 @@ msgstr "" "WARNUNG: Benutzen Sie --si, nicht -H; die Bedeutung von -H wird sich bald\n" "ändern und dann das gleiche bedeuten wie --dereference-args (-D)." -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "Ungültige maximale Tiefe %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "" "Zusammenfassung und Anzeige aller Einträge ist nicht gleichzeitig möglich" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "Warnung: Zusammenfassen ist das gleiche wie --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "Warnung: Zusammenfassen widerspricht --max-depth=%d" @@ -2923,7 +2936,7 @@ msgstr "" msgid "syntax error" msgstr "Syntaxfehler" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2932,11 +2945,11 @@ msgstr "" "Warnung: nicht portable BRE: „%s“: „^“ als erstes Zeichen eines einfachen\n" "regulären Ausdrucks ist nicht portabel; es wird ignoriert." -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "Argumente, die keine Zahlen sind" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "Teilung durch Null" @@ -3466,11 +3479,6 @@ msgstr "" "--backup oder VERSION_CONTROL gesetzt werden. Mögliche Werte sind:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Aufruf: %s [OPTION]... DATEI1 DATEI2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4773,7 +4781,7 @@ msgstr "ungültige Breite des Feldes für die Zeilennummer: %s" msgid "invalid line numbering format: %s" msgstr "ungültiges Zeilennummerformat: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4782,7 +4790,7 @@ msgstr "" "Aufruf: %s BEFEHL [ARGUMENT]...\n" " oder: %s OPTION\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -4790,21 +4798,25 @@ msgstr "" "BEFEHL ausführen und dabei das Signal HUP ignorieren.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "konnte %s nicht öffnen" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "konnte Standardausgabe nicht umleiten" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "hänge Ausgabe an %s an" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "konnte Standardfehlerausgabe nicht umleiten" @@ -6130,12 +6142,12 @@ msgstr "" " -w, --equal-width gleiche Breite durch führende Nullen herstellen\n" #: src/seq.c:96 -#, c-format +#, fuzzy, c-format msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -6522,7 +6534,7 @@ msgstr "" " -S, --buffer-size=GRÖSSE GRÖSSE für Hauptspeicherpuffer benutzen\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -6540,8 +6552,7 @@ msgstr "" " für temporäre Dateien VERZ statt $TMPDIR oder %" "s;\n" " kann mehrfach gegeben werden\n" -" -u, --unique mit -c: auf strikte Odnung prüfen; anderenfalls: " -"nur\n" +" -u, --unique mit -c: auf strikte Odnung prüfen; ohne -c: nur\n" " das erste von mehreren Gleichen ausgeben\n" #: src/sort.c:319 @@ -8981,6 +8992,9 @@ msgstr "" "Eine Zeile mit allen angegebenen ZEICHENKETTEN oder „y“ wiederholt " "ausgeben.\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Aufruf: %s [OPTION]... LINKE_DATEI RECHTE_DATEI\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** ungültiges Datum/Zeit ***" diff --git a/po/el.po b/po/el.po index 07201b002b..6550fbf823 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: textutils 2.1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-08-11 11:25+0100\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" @@ -180,7 +180,7 @@ msgid "failed to return to initial working directory" msgstr "" # -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, fuzzy, c-format msgid "cannot create directory %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" @@ -277,22 +277,22 @@ msgid "cannot convert U+%04X to local character set: %s" msgstr "" # -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "ìç Ýãêõñïò ÷ñÞóôçò" # -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "ìç Ýãêõñç ïìÜäá" # -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "áäýíáôç ç ëÞøç ôçò ïìÜäáò åéóáãùãÞò óôï óýóôçìá åíüò áñéèìçôéêïý UID" # -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "äåí åßíáé äõíáôü íá ðáñáëçöèåß ÷ñÞóôçò êáé ïìÜäá" @@ -415,17 +415,17 @@ msgid "invalid argument: %s" msgstr "ìç Ýãêõñï üñéóìá %s ãéá %s" # -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "" # -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "ÈÝóôå LC_ALL='C' ãéá íá ðáñáêÜìøåôå ôï ðñüâëçìá." # -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "" @@ -440,7 +440,7 @@ msgstr "" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -477,15 +477,15 @@ msgstr "" # #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -505,9 +505,9 @@ msgstr "" # #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -741,18 +741,18 @@ msgid "mode of %s retained as %04lo (%s)\n" msgstr "ôá äéêáéþìáôá ôïõ %s äéáôçñïýíôáé ùò Ý÷ïõí, äçëáäÞ %04lo (%s)\n" # -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "áäýíáôç ç áëëáãÞ äéêáéùìÜôùí óôï %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" # -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" @@ -764,7 +764,7 @@ msgid "changing permissions of %s" msgstr "áäõíáìßá áëëáãÞò éäéïêôçóßáò óôï %s" # -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "áðïôõ÷ßá áíÜãíùóçò" @@ -970,7 +970,7 @@ msgid "cannot chdir to root directory" msgstr "áäýíáôç ç áëëáãÞ óôï êáôÜëïãï %s" # -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "áäýíáôç ç áëëáãÞ äéêáéùìÜôùí óôï %s" @@ -997,19 +997,30 @@ msgid "" msgstr "" # -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... ÁÑÉÓÔÅѼ_ÁÑ×ÅºÏ ÄÅÎɼ_ÁÑןÏ\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... ÁÑ×ÅÉÏ1 ÁÑ×ÅÉÏ2\n" -# #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +# +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Óýãêñéóç ôáîéíïìçìÝíùí áñ÷åßùí ÁÑÉÓÔÅѼ_ÁÑ×ÅºÏ êáé ÄÅÎɼ_ÁÑןÏ, áíÜ " @@ -1027,7 +1038,7 @@ msgid "cannot open %s for reading" msgstr "áäõíáìßá ìåôáöïñÜò ôïõ `%s' óôï `%s'" # -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -1039,7 +1050,7 @@ msgid "skipping file %s, as it was replaced while being copied" msgstr "" # -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -1052,99 +1063,99 @@ msgid "cannot create regular file %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" # -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "óöÜëìá áíÜãíùóçò %s" # -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "áäýíáôç ç áëëáãÞ äéêáéùìÜôùí óôï %s" # -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "óöÜëìá åããñáöÞò %s" # -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "êëåßóéìï ôïõ %s (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, fuzzy, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: áíôéãñáöÞ ðÜíù óôï `%s', ðáñÜêáìøç äéêáéùìÜôùí %04lo; " # -#: src/copy.c:636 +#: src/copy.c:641 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: óöÜëìá åããñáöÞò" # -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "áäýíáôç ç áëëáãÞ äéêáéùìÜôùí óôï %s" # -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "ôá `%s' êáé `%s' åßíáé ôï ßäéï áñ÷åßï" # -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "áäýíáôç ç áëëáãÞ óôï êáôÜëïãï %s" -#: src/copy.c:927 +#: src/copy.c:932 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: äå ìðïñåß íá ãñáöôåß ìç-êáôÜëïãïò ðÜíù óå êáôÜëïãï" # -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" # -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" # -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "áäýíáôç ç áëëáãÞ óôï êáôÜëïãï %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "ç äçìéïõñãßá áíôéãñÜöïõ áóöáëåßáò ôïõ `%s' èá êáôÝóôñåöå ôç ðçãÞ· ôï `%s' äå " "ìåôáêéíåßôáé" -#: src/copy.c:1032 +#: src/copy.c:1037 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" @@ -1152,57 +1163,57 @@ msgstr "" "äåí áíôéãñÜöåôáé" # -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "áäýíáôç ç áëëáãÞ äéêáéùìÜôùí óôï %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (áíôßãñáöï áóöáëåßáò: %s)" # -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" # -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "áäýíáôç ç áëëáãÞ óôï êáôÜëïãï %s" # -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" # -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "áäýíáôç ç áëëáãÞ óôï êáôÜëïãï %s" # -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "áäýíáôç ç áëëáãÞ äéêáéùìÜôùí óôï %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: áäõíáìßá áíôéãñáöÞò êõêëßêïý óõìâïëéêïý óõíäÝóìïõ" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" @@ -1210,80 +1221,80 @@ msgstr "" "êáôÜëïãï" # -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" # -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" # -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" # -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "åéäéêü áñ÷åßï ÷áñáêôÞñùí" # -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "óõìâïëéêüò óýíäåóìïò" # -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s'" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "äéáôÞñçóç éäéïêôÞôç ãéá ôï %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: Üãíùóôï åßäïò áñ÷åßïõ" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "äéáôÞñçóç ùñþí óôï %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "äéáôÞñçóç ùñþí óôï %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "äéáôÞñçóç éäéïêôÞôç ãéá ôï %s" # -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "áäõíáìßá áëëáãÞò éäéïêôçóßáò óôï %s" # -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "áäýíáôç ç áëëáãÞ äéêáéùìÜôùí óôï %s" # src/copy.c:924 -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (÷ñÞóç áíôéãñÜöïõ áóöáëåßáò)\n" @@ -2428,7 +2439,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2572,15 +2583,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2591,7 +2603,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2605,32 +2617,32 @@ msgid "" msgstr "" # -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "óýíïëï" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" # -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "ìç Ýãêõñïò áñéèìüò ðåäßïõ: `%s'" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "" "äåí åßíáé äõíáôü íá äåé÷ôåß ðåñßëçøç êáé íá åìöáíéóôïýí üëåò ïé êáôá÷ùñßóåéò" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "ðñïåéäïðïßçóç: ç ðåñßëçøç åßíáé üìïéï ìå --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "ðñïåéäïðïßçóç: ç ðåñßëçøç Ýñ÷åôáé óå áíôßöáóç ìå ôï --max-depth=%d" @@ -2839,7 +2851,7 @@ msgstr "" msgid "syntax error" msgstr "êáíïíéêü óöÜëìá" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2850,12 +2862,12 @@ msgstr "" "óõìâáôÞ; Áãíïåßôáé." # -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "üñéï ïñßóìáôïò" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3450,12 +3462,6 @@ msgstr "" " áðëÜ áíôßãñáöá\n" " simple, never ðÜíôá äçìéïõñãßá áðëþí áíôéãñÜöùí\n" -# -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... ÁÑ×ÅÉÏ1 ÁÑ×ÅÉÏ2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4666,37 +4672,41 @@ msgid "invalid line numbering format: %s" msgstr "ìç Ýãêõñç áýîçóç óôïí áñéèìü åíôïëÞò: `%s'" # -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" " or: %s OPTION\n" msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... [ÅÉÓÏÄÏÓ [ÅÎÏÄÏÓ]]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "äéáôÞñçóç ùñþí óôï %s" # -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "êáíïíéêÞ Ýîïäïò" # -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "äåí åßíáé äõíáôü íá ðáñáëçöèåß ÷ñÞóôçò êáé ïìÜäá" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5847,7 +5857,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8478,6 +8488,10 @@ msgid "" "\n" msgstr "" +# +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "×ñÞóç: %s [ÅÐÉËÏÃÇ]... ÁÑÉÓÔÅѼ_ÁÑ×ÅºÏ ÄÅÎɼ_ÁÑןÏ\n" + # #, fuzzy #~ msgid "*** invalid date/time ***" diff --git a/po/es.po b/po/es.po index 73b7459aa7..65e9973335 100644 --- a/po/es.po +++ b/po/es.po @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU coreutils 5.1.1\n" +"Project-Id-Version: GNU coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-01-18 17:30+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-03-02 23:14+0100\n" "Last-Translator: Santiago Vila Doncel \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -155,7 +155,7 @@ msgstr "tama msgid "failed to return to initial working directory" msgstr "no se puede volver al directorio de trabajo inicial" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "no se puede crear el directorio %s" @@ -255,19 +255,19 @@ msgstr "no se puede convertir U+%04X al conjunto de caracteres local: %s" # Eso sí, un día tendré que preguntar a los de GNU en qué se diferencia # "invalid" de "not allowed" de "not recognized" y todo eso... sv # -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "usuario inválido" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "grupo inválido" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "no se puede obtener el grupo de login de un UID numérico" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "no se puede omitir tanto el usuario como el grupo" @@ -393,15 +393,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "argumento inválido: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "la comparación de cadenas falló" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Establezca LC_ALL='C' para solucionar este problema de forma temporal." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Las cadenas comparadas eran %s y %s." @@ -415,7 +415,7 @@ msgstr "Las cadenas comparadas eran %s y %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -451,15 +451,15 @@ msgstr "" # Véase la excelente película "A bug's life". #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -478,9 +478,9 @@ msgstr "" "Comunicar bichos a <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -761,18 +761,18 @@ msgstr "fallo al cambiar el modo de %s a %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "el modo de %s permanece como %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "no se puede acceder a %s" # FIXME: Me lo explique. -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "no se puede leer el directorio %s" @@ -782,7 +782,7 @@ msgstr "no se puede leer el directorio %s" msgid "changing permissions of %s" msgstr "cambiando los permisos de %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "fts_read falló" @@ -1034,7 +1034,7 @@ msgstr "no se puede cambiar el directorio ra msgid "cannot chdir to root directory" msgstr "no se puede cambiar al directorio raíz" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "no se puede ejecutar la orden %s" @@ -1091,20 +1091,31 @@ msgstr "" "Muestra la suma de comprobación CRC y el número de bytes de cada FICHERO.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO1 FICHERO2\n" +#: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + # ¿¿cómo se puede explicar esto mejor?? # A mí me parece que está bien ... :-? ipg -#: src/comm.c:76 +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Compara los ficheros ordenados FICHERO_IZQUIERDO y FICHERO_DERECHO,\n" @@ -1119,7 +1130,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "no se puede abrir %s para lectura" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -1130,7 +1141,7 @@ msgstr "no se puede efectuar `fstat' sobre %s" msgid "skipping file %s, as it was replaced while being copied" msgstr "saltando el fichero %s, ya que fue reemplazado mientras se copiaba" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -1141,131 +1152,131 @@ msgstr "no se puede borrar %s" msgid "cannot create regular file %s" msgstr "no se puede crear el fichero regular %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "leyendo %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "no se puede efectuar `lseek' sobre %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "escribiendo %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "cerrando %s" # SIoNO -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: ¿sobreescribir %s, sustituyendo el modo %04lo? (s/n) " # SIoNO -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: ¿sobreescribir %s? (s/n) " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "no se puede efectuar `stat' sobre %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "se omite el directorio %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "atención: se ha especificado el fichero origen %s más de una vez" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s y %s son el mismo fichero" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "no se puede sobreescribir el no directorio %s con el directorio %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "no se sobreescribirá el fichero %s recién creado con %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "no se puede sobreescribir el directorio %s con un no directorio" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "no se puede sobreescribir el directorio %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "no se puede sobreescribir un directorio con un no directorio: %s -> %s" # Nota: Este backing up *no* es un gerundio. -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "respaldar %s destruiría el original; %s no se mueve" # Nota: Este backing up *tampoco* es un gerundio. -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "respaldar %s destruiría el original; %s no se copia" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "no se puede respaldar %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (respaldo: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "no se puede copiar un directorio, %s, dentro de sí mismo, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "no se crea el enlace duro %s al directorio %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "crea el enlace duro %s a %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "no se puede mover %s a un directorio de sí mismo, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "no se puede mover %s a %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" @@ -1278,24 +1289,24 @@ msgstr "" # mkdir aa # cp -d bb aa # ls -l aa -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "no se puede copiar el enlace simbólico cíclico %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: solamente se pueden crear enlaces simbólicos relativos\n" "en el directorio actual" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "no se puede crear el enlace simbólico %s a %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "no se puede crear el enlace %s" @@ -1334,52 +1345,52 @@ msgstr "no se puede crear el enlace %s" # tu lado :) Déjalo como está :D ipg # # Gracias a los dos. sv -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "no se puede crear el fichero `fifo' %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "no se puede crear el fichero especial %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "no se puede leer el enlace simbólico %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "no se puede crear el enlace simbólico %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "fallo al conservar el propietario de %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s tiene un tipo de fichero desconocido" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "se conserva las fechas de %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "fallo al buscar el fichero %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "fallo al conservar el autor de %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "estableciendo los permisos de %s" @@ -1387,12 +1398,12 @@ msgstr "estableciendo los permisos de %s" # Nota: Asegurarse de que significa eso. # Probablemente quiera decir que "no se puede recuperar `%s'" de la copia # de seguridad. tb -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "no se puede restaurar %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (restauración)\n" @@ -1925,8 +1936,6 @@ msgid "" "A line OFFSET is a required `+' or `-' followed by a positive integer.\n" msgstr "" "\n" -"Lee la entrada estándar si FICHERO es `-'. Cada PLANTILLA puede ser:\n" -"\n" " NÚMERO_LÍNEA copia a partir de este número de línea excluida ella\n" " /EXPREG/[DESPLAZ] copia sin incluir las líneas que coincidan con EXPREG\n" " %%EXPREG%%[DESPLAZ] comienza a partir de la línea que coincida con " @@ -2336,12 +2345,10 @@ msgstr "no se puede obtener la hora del d msgid "cannot set date" msgstr "no se puede establecer la fecha" -# No me acaba de sonar bien lo de fuera de rango. -# Se admiten sugerencias. sv #: src/date.c:529 -#, fuzzy, c-format +#, c-format msgid "time %s is out of range" -msgstr "desplazamiento de fichero fuera de rango" +msgstr "la fecha %s está fuera de rango" #: src/dd.c:287 src/tty.c:68 src/uname.c:109 src/whoami.c:53 #, c-format @@ -2665,7 +2672,7 @@ msgstr "" " no son del tipo TIPO\n" " -v (no tiene efecto)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2832,11 +2839,13 @@ msgstr "" # En esto no os ponéis de acuerdo. # Creo que lo acabaremos preguntando en "spanglish". sv+ #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2849,7 +2858,7 @@ msgstr "" " -l, --count-links cuenta los tamaños varias veces si hay enlaces " "fuertes\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2866,7 +2875,7 @@ msgstr "" " -S, --separate-dirs no incluye el tamaño de los subdirectorios\n" " -s, --summarize muestra solamente un total para cada argumento\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2888,11 +2897,11 @@ msgstr "" " debajo del argumento de la línea de órdenes;\n" " --max-depth=0 es lo mismo que --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "total" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2900,20 +2909,20 @@ msgstr "" "ATENCIÓN: Utilice --si, no -H; el significado de la opción -H cambiará\n" "pronto y será el mismo que el de --dereference-args (-D)" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "profundidad máxima inválida %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "no se puede al mismo tiempo resumir y mostrar todas las entradas" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "atención: resumir es lo mismo que usar --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "atención: resumir entra en conflicto con --max-depth=%d" @@ -3223,7 +3232,7 @@ msgstr "error de sintaxis" # # Al final me convenciste. Ahora estoy intrigado: # ¿Aparecerá en algún sitio más? sv -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -3232,11 +3241,11 @@ msgstr "" "atención: ERB no transportable: `%s': utilizar `^' como el primer carácter\n" "de la expresión regular básica no es transportable; no se tendrá en cuenta" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "argumento no numérico" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "división por cero" @@ -3826,11 +3835,6 @@ msgstr "" "Estos son los valores:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO1 FICHERO2\n" - # Sugerencia: no los dos a la vez -> pero no ambos. sv # ¿Pero no ambos a la vez? em # Eso es repetir el "both". sv @@ -5316,7 +5320,7 @@ msgstr "ancho para el n msgid "invalid line numbering format: %s" msgstr "formato de numeración de líneas inválido: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -5325,7 +5329,7 @@ msgstr "" "Modo de empleo: %s ORDEN [ARGUMENTO]...\n" " o bien: %s OPCIÓN\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -5333,21 +5337,25 @@ msgstr "" "Ejecuta ORDEN, descartando las señales de colgar.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "No se puede abrir %s" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "fallo al redireccionar la salida estándar" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "se añade la salida a %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "fallo al redireccionar la salida de error estándar" @@ -6816,19 +6824,22 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" "the printf-style, floating point output formats %e, %f, %g\n" msgstr "" "\n" -"Si se omiten PRIMERO o INCREMENTO, el valor predeterminado es 1.\n" -"PRIMERO, INCREMENTO y ÚLTIMO se interpretan como valores de coma flotante.\n" -"INCREMENTO debe ser positivo si PRIMERO es menor que ÚLTIMO, de otra " -"manera,\n" -"negativo. Cuando se da el argumento FORMATO, debe contener exactamente uno\n" -"de los formatos estilo printf para coma flotante %e, %f, o %g\n" +"Si se omiten PRIMERO o INCREMENTO, el valor predeterminado es 1. Es decir,\n" +"un INCREMENTO omitido tiene un valor predeterminado de 1 incluso cuando " +"ÚLTIMO\n" +"es más pequeño que PRIMERO. PRIMERO, INCREMENTO y ÚLTIMO se interpretan " +"como\n" +"valores de coma flotante. INCREMENTO es normalmente positivo si PRIMERO es\n" +"menor que ÚLTIMO, y es normalmente negativo si PRIMERO es mayor que ÚLTIMO.\n" +"Cuando se da el argumento FORMATO, debe contener exactamente uno de\n" +"los formatos estilo printf para coma flotante %e, %f, o %g\n" #: src/seq.c:121 #, c-format @@ -7201,7 +7212,7 @@ msgstr "" "principal\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -7215,10 +7226,11 @@ msgstr "" " -t, --field-separator=SEP usa SEP en lugar de la transición de un\n" " no espacio a un espacio\n" " -T, --temporary-directory=DIR usa DIR para los ficheros temporales,\n" -" no $TMPDIR ni %s\n" -" -u, --unique con -c, comprueba estrictamente el orden\n" -" en otro caso; muestra solamente la primera de\n" -" una tanda igual\n" +" no $TMPDIR ni %s; varias opciones\n" +" especifican varios directorios\n" +" -u, --unique con -c, comprueba estrictamente el orden;\n" +" sin -c; muestra solamente la primera de\n" +" una tanda igual\n" #: src/sort.c:319 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" @@ -9546,7 +9558,7 @@ msgstr "PM" #: src/uptime.c:142 #, c-format msgid " ??:???? up " -msgstr "" +msgstr " ??:???? arriba " #: src/uptime.c:144 #, c-format @@ -9861,6 +9873,9 @@ msgstr "" "`y'.\n" "\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO1 FICHERO2\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** fecha/hora inválida ***" diff --git a/po/et.po b/po/et.po index 10e1cb521e..d6a402c2f6 100644 --- a/po/et.po +++ b/po/et.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: coreutils 5.1.3\n" +"Project-Id-Version: coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-02-09 09:32+0200\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-02-21 11:34+0200\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -151,7 +151,7 @@ msgstr "bloki suurus" msgid "failed to return to initial working directory" msgstr "esialgsesse töökataloogi ei õnnestu tagasi minna" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "kataloogi `%s' ei õnnestu luua" @@ -232,19 +232,19 @@ msgstr "U+%04X ei saa lokaalsesse kooditabelisse teisendada" msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04X ei saa lokaalsesse kooditabelisse teisendada: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "vigane kasutaja" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "vigane grupp" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "ei leia numbrilise UID login gruppi" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "ainult kasutajat ja ainult gruppi ei saa trükkida" @@ -370,15 +370,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "vigane argument: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "sõnede võrdlus ebaõnnestus" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Probleemi lahendamiseks seadke LC_ALL=C." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Võrreldi sõnesid %s ja %s." @@ -392,7 +392,7 @@ msgstr "V #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -426,15 +426,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -453,9 +453,9 @@ msgstr "" "Vigadest teatage palun aadressil <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -670,17 +670,17 @@ msgstr "ei msgid "mode of %s retained as %04lo (%s)\n" msgstr "%s õigused jäeti %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "%s ei saa kasutada" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "kataloogi %s ei õnnestu lugeda" @@ -690,7 +690,7 @@ msgstr "kataloogi %s ei msgid "changing permissions of %s" msgstr "muudan %s õigusi" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "fts_read ebaõnnestus" @@ -908,7 +908,7 @@ msgstr "%s ei msgid "cannot chdir to root directory" msgstr "ei saa minna juurkataloogi" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "käsklust %s ei saa käivitada" @@ -935,18 +935,29 @@ msgstr "" "Väljasta iga FAILI kohta CRC kontrollsumma ja baitide arv.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Kasutamine: %s [VÕTI]... VASAK_FAIL PAREM_FAIL\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Kasutamine: %s [VÕTI]... FAIL1 FAIL2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Võrdle ridahaaval järjestatud faile VASAK_FAIL ja PAREM_FAIL.\n" @@ -960,7 +971,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "ei õnnestu avada %s lugemiseks" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -971,7 +982,7 @@ msgstr "fstat %s ei msgid "skipping file %s, as it was replaced while being copied" msgstr "jätan %s vahele, kuna see asendati kopeerimise ajal" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -982,209 +993,209 @@ msgstr "%s ei saa kustutada" msgid "cannot create regular file %s" msgstr "ei õnnestu luua tavalist faili %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "loen %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "lseek %s ei õnnestu" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "kirjutan %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "sulgen %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: kirjutan %s üle, kirjutan üle ka õigused %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: kirjutan %s üle? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "stat %s ei õnnestu" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "jätan kataloogi %s vahele" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "hoiatus: lähtefail %s on esitatur enam kui korra" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s ja %s on üks ja sama fail" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ei saa üle kirjutada mitte-katataloogi %s kataloogiga %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ei kirjuta üle just loodud faili %s failiga %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kataloogi %s ei saa üle kirjutada mitte kataloogiga" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "kataloogi %s ei saa üle kirjutada" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kataloogi ei saa tõsta mitte-kataloogi: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s varundamine hävitaks allika; %s ei teisaldatud" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "%s varundamine hävitaks allika; %s ei kopeeritud" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "ei õnnestu luua %s varukoopiat" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (varukoopia: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kataloogi %s ei saa iseendasse, %s, kopeerida" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ei loo viidet %s kataloogile %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "ei õnnestu luua viidet %s -> %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s ei saa tõsta iseenda alamkataloogi %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "ei õnnestu tõsta %s -> %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "seadmete-vaheline teisaldamine ebaõnnestus: %s -> %s; allikat ei saa " "kustutada" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "tsüklilist nimeviita %s ei õnnestu kopeerida" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: suhtelisi nimeviiteid saab luua ainult jooksvas kataloogis" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ei õnnestu luua nimeviidet %s -> %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "ei õnnestu luua viidet %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "ei õnnestu luua fifot %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "ei õnnestu luua seadmefaili %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "ei õnnestu lugeda nimeviidet %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "ei õnnestu luua nimeviidet %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s omanikku ei õnnestu säilitada" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s on tundmatut tüüpi fail" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "jätan %s ajad muutmata" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "ei õnnestu leida faili %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "%s autorit ei õnnestu säilitada" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "sean %s õigusi" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "%s ei saa taastada" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (taastamine)\n" @@ -2307,7 +2318,7 @@ msgstr "" " -x, --exclude-type=TÜÜP ära väljasta infot antud tüüpi failisüsteemidest\n" " -v (ignoreeritakse)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2455,11 +2466,13 @@ msgstr "" " -D, --dereference-args kasuta nimeviidete korral viidatavaid\n" #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2470,7 +2483,7 @@ msgstr "" " -k, --kilobytes sama, kui --block-size=1K\n" " -l, --count-links loenda viiteid eraldi failidena\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2486,7 +2499,7 @@ msgstr "" " -S, --separate-dirs ära arvesta kataloogide suurusi\n" " -s, --summarize väljasta iga argumendi kohta summa\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2507,11 +2520,11 @@ msgstr "" " kui käsurea argument; --max-depth=0 on sama, kui\n" " --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "kokku" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2519,20 +2532,20 @@ msgstr "" "HOIATUS: kasutage --si mitte -H; -H võtme tähendus muutub varsti samaks,\n" "kui --dereference-args (-D)" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "vigane maksimaalne sügavus %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "korraga ei saa summeerida ja näidata kõiki" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "hoiatus: summeerimine on sama, kui kasutada --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "hoiatus: summeerimine on konfliktne võtmega --max-depth=%d" @@ -2783,7 +2796,7 @@ msgstr "" msgid "syntax error" msgstr "süntaksi viga" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2792,11 +2805,11 @@ msgstr "" "hoiatus: mitteporditav BRE: `%s': `^' kasutamine lihtsa regulaaravaldise\n" "esimese sümbolina ei ole porditav; ignoreerin seda" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "mitte-numbriline argument" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "nulliga jagamine" @@ -3307,11 +3320,6 @@ msgstr "" "väärtused on järgnevad:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Kasutamine: %s [VÕTI]... FAIL1 FAIL2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4538,7 +4546,7 @@ msgstr "vigane rea numbri v msgid "invalid line numbering format: %s" msgstr "vigane rea numbri vorming: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4547,7 +4555,7 @@ msgstr "" "Kasutamine: %s KÄSKLUS [ARGUMENT]...\n" " või: %s VÕTI\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -4555,21 +4563,25 @@ msgstr "" "Käivita KÄSKLUS, ignoreeri hangup signaale.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "%s avamine ebaõnnestus" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "standardväljundi ümbersuunamine ebaõnnestus" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "lisan väljundi %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "standard veavoo ümbersuunamine ebaõnnestus" @@ -5840,12 +5852,12 @@ msgstr "" " -w, --equal-width kasuta võrdse laiusega välju, täida nullidega\n" #: src/seq.c:96 -#, c-format +#, fuzzy, c-format msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -6203,7 +6215,7 @@ msgstr "" " -S, --buffer-size=MAHT määra mälupuhvri suurus\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -8556,3 +8568,6 @@ msgid "" msgstr "" "Väljasta korduvalt rida antud sõnedega või `y'.\n" "\n" + +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Kasutamine: %s [VÕTI]... VASAK_FAIL PAREM_FAIL\n" diff --git a/po/fi.po b/po/fi.po index c87b743afc..e014c6b219 100644 --- a/po/fi.po +++ b/po/fi.po @@ -16,10 +16,10 @@ # msgid "" msgstr "" -"Project-Id-Version: coreutils 5.1.3\n" +"Project-Id-Version: coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-02-09 12:29+0200\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-02-21 23:36+0200\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -167,7 +167,7 @@ msgstr "lohkokoko" msgid "failed to return to initial working directory" msgstr "alkuperäiseen työhakemistoon palaaminen epäonnistui" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "hakemiston %s luominen ei onnistu" @@ -250,19 +250,19 @@ msgstr "merkin U+%04X muunnos paikalliseen merkistöön ei onnistu" msgid "cannot convert U+%04X to local character set: %s" msgstr "merkin U+%04X muunnos paikalliseen merkistöön ei onnistu: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "virheellinen käyttäjä" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "virheellinen ryhmä" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "numeerisen UID:n kirjautumisryhmää ei löydy" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "sekä käyttäjää että ryhmää ei voi jättää antamatta" @@ -392,15 +392,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "virheellinen argumentti: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "merkkijonovertailu epäonnistui" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Aseta LC_ALL='C' ongelman kiertämiseksi." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Vertaillut merkkijonot olivat %s ja %s." @@ -414,7 +414,7 @@ msgstr "Vertaillut merkkijonot olivat %s ja %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -448,15 +448,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -476,9 +476,9 @@ msgstr "" "<%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -702,17 +702,17 @@ msgstr "tiedoston %s oikeuksien muuttaminen arvoon %04lo (%s) epäonnistui\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "tiedoston %s oikeuksina säilytettiin %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "tiedostoa %s ei voi käsitellä" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "hakemistoa %s ei voi lukea" @@ -722,7 +722,7 @@ msgstr "hakemistoa %s ei voi lukea" msgid "changing permissions of %s" msgstr "muutetaan tiedoston %s oikeuksia" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "fts_read epäonnistui" @@ -948,7 +948,7 @@ msgstr "hakemiston %s asettaminen juurihakemistoksi ei onnistu" msgid "cannot chdir to root directory" msgstr "juurihakemistoon siirtyminen ei onnistu" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "komentoa %s ei voi ajaa" @@ -975,18 +975,29 @@ msgstr "" "Tulosta jokaisen TIEDOSTOn CRC-tarkistussumma ja tavumäärä.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Käyttö: %s [VALITSIN]... VASEN_TIEDOSTO OIKEA_TIEDOSTO\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO1 TIEDOSTO2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Vertaa lajiteltuja tiedostoja VASEN_TIEDOSTO ja OIKEA_TIEDOSTO rivi " @@ -1004,7 +1015,7 @@ msgstr "tiedostoa %s ei voi avata lukemista varten" # On sitten ihan turha tehdä suomennoksissa mitään eroa statin, fstatin, ym. # välille, käyttäjää ei kiinnosta. -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -1015,7 +1026,7 @@ msgstr "tiedoston %s tilan lukeminen ei onnistu" msgid "skipping file %s, as it was replaced while being copied" msgstr "ohitetaan tiedosto %s, sillä se korvattiin kopioinnin aikana" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -1026,213 +1037,213 @@ msgstr "tiedostoa %s ei voi poistaa" msgid "cannot create regular file %s" msgstr "tavallisen tiedoston %s luominen ei onnistu" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "luetaan tiedostoa %s" # Onko seek nyt sitten siirtymistä, selaamista, vaiko muuta. # Saa ehdottaa myös vastavaa substantiivia. -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "siirtyminen tiedostossa %s ei onnistu" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "kirjoitetaan tiedostoa %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "suljetaan tiedostoa %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: korvataanko tiedosto %s, ohittaen oikeudet %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: korvataanko tiedosto %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "tiedoston %s tilaa ei voi lukea" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "ohitetaan hakemisto %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s ja %s ovat sama tiedosto" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ei-hakemistoa %s ei voi korvata hakemistolla %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ei korvata juuri luotua tiedostoa %s tiedostolla %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "hakemistoa %s ei voi korvata ei-hakemistolla" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "hakemistoa %s ei voi korvata" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "hakemistoa ei voi siirtää ei-hakemistoon: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "tiedoston %s varmuuskopiointi tuhoaisi lähteen; tiedostoa %s ei siirretty" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "tiedoston %s varmuuskopiointi tuhoaisi lähteen; tiedostoa %s ei kopioitu" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "tiedostoa %s ei voi varmuuskopioida" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (varmuuskopio: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "hakemistoa, %s, ei voi kopioida itseensä, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ei luoda kovaa linkkiä %s hakemistoon %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "hakemistoa %s ei voi siirtää omaan alihakemistoonsa, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "tiedostoa %s ei voi siirtää kohteeseen %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "laitteiden välinen siirto epäonnistui: %s -> %s; kohdetta ei voi poistaa" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kiertävää symbolista linkkiä %s ei voi kopioida" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: suhteellisia symbolisia linkkejä voi tehdä vain nykyisessä hakemistossa" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kohteeseen %2$s ei voi luoda symbolista linkkiä %1$s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "linkkiä %s ei voi luoda" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "nimettyä putkea %s ei voi luoda" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "erikoistiedostoa %s ei voi luoda" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "symbolista linkkiä %s ei voi lukea" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "symbolisen linkin %s luominen ei onnistu" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "tiedoston %s omistajuuden säilytys ei onnistu" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "tiedostolla %s on tuntematon tiedostotyyppi" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "säilytetään tiedoston %s ajat" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "tiedostoa %s ei löytynyt" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "tiedoston %s tekijän tietojen säilytys ei onnistunut" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "asetetaan tiedoston %s oikeudet" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "tiedoston %s varmuuskopion palautus ei onnistu" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (varmuuskopion palautus)\n" @@ -2386,7 +2397,7 @@ msgstr "" "muunTYYPPIsiin\n" " -v (ei huomioida)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2536,11 +2547,13 @@ msgstr "" " mukaan linkkien kohteiden koot\n" #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2551,7 +2564,7 @@ msgstr "" " -k sama kuin --block-size=1K\n" " -l, --count-links laske kovien linkkien koot monta kertaa\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2569,7 +2582,7 @@ msgstr "" " -S, --separate-dirs älä laske mukaan alihakemistojen kokoa\n" " -s, --summarize näytä vain kokonaismäärä jokaiselle argumentille\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2592,11 +2605,11 @@ msgstr "" " tasoa argumenttina annetun alla; --max-depth=0 on\n" " sama kuin --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "yhteensä" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2604,20 +2617,20 @@ msgstr "" "VAROITUS: käytä valitsinta --si, ei -H; valitsimen -H merkitys muuttuu\n" "pian samaksi kuin --dereference-args (-D)" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "virheellinen enimmäissyvyys %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "yhteenvetoa ja kaikkia merkintöjä ei voi näyttää samaan aikaan" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "varoitus: yhteenvedon teko on sama asia kuin --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "" @@ -2877,7 +2890,7 @@ msgstr "" msgid "syntax error" msgstr "syntaksivirhe" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2887,11 +2900,11 @@ msgstr "" "yksinkertaisen säännöllisen lausekkeen alussa ei ole siirrettävää;\n" "se jätetään huomiotta" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "ei-numeerinen argumentti" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "nollalla jako" @@ -3418,11 +3431,6 @@ msgstr "" "ovat seuraavat:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO1 TIEDOSTO2\n" - # *** *** *** *** #: src/join.c:162 msgid "" @@ -4690,7 +4698,7 @@ msgstr "virheellinen rivinumerokentän leveys: %s" msgid "invalid line numbering format: %s" msgstr "virheellinen rivinumerointimuoto: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4699,7 +4707,7 @@ msgstr "" "Käyttö: %s KOMENTO [ARGUMENTTI]...\n" " tai: %s VALITSIN\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -4707,21 +4715,25 @@ msgstr "" "Aja KOMENTO jättäen linjankatkaisusignaalit huomiotta.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "vakiotulosteen uudelleenohjaus epäonnistui" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "kirjoitetaan tuloste tiedoston %s loppuun" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "vakiovirhetulosteen uudelleenohjaus epäonnistui" @@ -6018,12 +6030,12 @@ msgstr "" " -w, --equal-width tasoita leveydet lisäämällä nollia lukujen eteen\n" #: src/seq.c:96 -#, c-format +#, fuzzy, c-format msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -6390,7 +6402,7 @@ msgstr "" " -S, --buffer-size=KOKO käytä KOKOa muistipuskurille\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -6406,11 +6418,11 @@ msgstr "" " ei-tyhjeestä tyhjeeseen\n" " -T, --temporary-directory=HAK käytä HAKemistoa väliaikaistiedostoille, " "ei\n" -" $TMPDIR tai %s. useampi valitsin määrittelee\n" +" $TMPDIR tai %s; useampi valitsin määrittelee\n" " monta hakemistoa\n" " -u, --unique jos -c on annettu: tarkista tarkka järjestys\n" -" muuten: tulosta vain ensimmäinen yhtäläisten\n" -" joukosta\n" +" ilman -c:tä: tulosta vain ensimmäinen\n" +" yhtäläisten joukosta\n" #: src/sort.c:319 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" @@ -8788,6 +8800,9 @@ msgstr "" "Tulosta toistuvasti riviä, jolla on kaikki annetut MERKKIJONO(t) tai \"y\".\n" "\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Käyttö: %s [VALITSIN]... VASEN_TIEDOSTO OIKEA_TIEDOSTO\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** virheellinen päiväys/aika ***" diff --git a/po/fr.po b/po/fr.po index 5119a33bea..49f0d519c6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU coreutils 5.1.3\n" +"Project-Id-Version: GNU coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-02-09 08:00-0500\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-02-21 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -151,7 +151,7 @@ msgstr "taille de bloc" msgid "failed to return to initial working directory" msgstr "échec de retour au répertoire initial de travail" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "Ne peut créer le répertoire %s" @@ -232,21 +232,21 @@ msgstr "ne peut convertir U+%04X msgid "cannot convert U+%04X to local character set: %s" msgstr "ne peut convertir U+%04X au jeu local de caractères: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "usager invalide" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "groupe invalide" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "" "ne peut obtenir le groupe d'établissement de session à partir du UID " "numérique" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "ne peut omettre ensemble l'usager et le groupe" @@ -372,15 +372,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "argument invalide: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "échec de comparaison de chaîne" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Définir LC_ALL=« C » pour contourner le problème." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Les chaînes comparées étaient %s et %s." @@ -394,7 +394,7 @@ msgstr "Les cha #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -428,15 +428,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -455,9 +455,9 @@ msgstr "" "Rapporter toutes anomalies à <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -689,17 +689,17 @@ msgstr " msgid "mode of %s retained as %04lo (%s)\n" msgstr "Le mode d'accès de %s qui a été conservé est: %04lo (%s).\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "ne peut accéder %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "ne peut lire le répertoire %s" @@ -709,7 +709,7 @@ msgstr "ne peut lire le r msgid "changing permissions of %s" msgstr "modification des permissions de %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "Échec de fts_read" @@ -942,7 +942,7 @@ msgstr "ne changer le r msgid "cannot chdir to root directory" msgstr "ne peut aller vers le répertoire root" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "ne peut exécuter la commande %s" @@ -970,18 +970,29 @@ msgstr "" "FICHIER.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Usage: %s [OPTION]... FICHIER_GAUCHE FICHIER_DROIT\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Usage: %s [OPTION]... FICHIER1 FICHIER2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Comparer les fichiers triés GAUCHE et DROITE ligne par ligne.\n" @@ -995,7 +1006,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "Ne peut ouvrir %s en lecture" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -1006,7 +1017,7 @@ msgstr "ne peut msgid "skipping file %s, as it was replaced while being copied" msgstr "escamotage du fichier %s, parce qu %s" msgstr "ne peut déplacer le répertoire dans un non-répertoire: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "L'archivage de %s pourrait détruire la source: %s n'a pas été déplacé." -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "L'archivage de %s pourrait détruire le fichier SOURCE:\n" "%s n'a pas été copié." -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "ne peut archiver %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (archiver: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "ne peut copier un répertoire %s dans lui-même %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ne peut créer un lien direct %s vers le répertoire %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "ne peut créer un lien direct %s vers %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "ne peut déplacer %s vers un sous-répertoire de lui-même %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "ne peut déplacer %s vers %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "échec de déplacement inter-périphérique: %s vers %s; incapable de détruire " "la cible" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ne peut copier des liens symboliques cycliques %s." -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: peut créer des liens symboliques relatifs\n" "seulement que dans le répertoire courant." -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ne peut créer un lien symbolique %s vers %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "ne peut créer le lien %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "ne peut créer le fifo %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "ne peut créer le fichier spécial %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "ne peut lire le lien symbolique %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "ne peut créer le lien symbolique %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "échec de préservation du propriétaire pour %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s possède un type de fichier inconnu." -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "préservation des dates pour %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "échec de repérage du fichier `%s'" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "échec de préservation du propriétaire pour %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "initialisation des permissions de %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "ne peut désarchiver %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (désarchivage)\n" @@ -2417,7 +2428,7 @@ msgstr "" " de système de fichiers\n" " -v (ignorée)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2573,11 +2584,13 @@ msgstr "" " des liens symboliques\n" #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2589,7 +2602,7 @@ msgstr "" " -l, --count-links dénombrer les tailles aussi souvent qu'il y a\n" " de liens directs\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2608,7 +2621,7 @@ msgstr "" " -s, --summarize afficher seulement un total pour chaque type\n" " d'argument\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2635,11 +2648,11 @@ msgstr "" " --max-depth=0 est identique à --summurize\n" " systèmes de fichiers\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "total" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2647,21 +2660,21 @@ msgstr "" "AVERTISSEMENT: utiliser --si, pas -H; la signification de l'option -H\n" "sera bientôt identique à celle de --dereference-args (-D)" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "profondeur maximum invalide %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "Ne peut afficher à la fois un résumé et toutes les entrées." -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" "AVERTISSEMENT: le résumé est identique si l'option --max-dept=0 est utilisée" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "" @@ -2925,7 +2938,7 @@ msgstr "" msgid "syntax error" msgstr "erreur de syntaxe" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2935,11 +2948,11 @@ msgstr "" "premier\n" "caractère d'une expression régulière de base n'est pas portable; ignoré." -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "argument non numérique" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "division par zéro" @@ -3480,11 +3493,6 @@ msgstr "" "d'environnement selon les valeurs suivantes:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Usage: %s [OPTION]... FICHIER1 FICHIER2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4800,7 +4808,7 @@ msgstr "largeur du champ de la num msgid "invalid line numbering format: %s" msgstr "format de numérotation de ligne invalide: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4809,7 +4817,7 @@ msgstr "" "Usage: %s FORMAT [ARGUMENT]...\n" " or: %s OPTION\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -4817,21 +4825,25 @@ msgstr "" "Éxécuter la COMMANDe en ignorant les signaux hangup.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "échec d'ouverture de %s" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "échec de redirection sur la sortie standard" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "ajout à la sortie de %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "échec de redirection vers l'erreur standard" @@ -6171,12 +6183,12 @@ msgstr "" " par des zéros de tête\n" #: src/seq.c:96 -#, c-format +#, fuzzy, c-format msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -6565,7 +6577,7 @@ msgstr "" "principal\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -6577,14 +6589,14 @@ msgid "" "run\n" msgstr "" " -t, --field-separator=SEP utiliser le SÉParateur au lieu de non-blanc " -"par les transitions d'espace blancs\n" +"pour les transitions d'espace\n" " -T, --temporary-directory=RÉP utiliser le RÉPertoire pour les fichiers " "temporaires, non pas $TMPDIR ou %s\n" " options multiples pour spécifier de " "multiples répertoires\n" " -u, --unique avec -c: vérifier l'ordonnancement strict\n" -" autrement: afficher les premiers d'une " -"passe équivalente\n" +" sans -c: afficher les premiers d'une passe " +"équivalente\n" #: src/sort.c:319 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" @@ -9043,6 +9055,9 @@ msgstr "" "Afficher à répétition une ligne de caractères telle que spécifiée\n" "par CHAÎNE ou par « y ».\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Usage: %s [OPTION]... FICHIER_GAUCHE FICHIER_DROIT\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** date/heure invalide ***" diff --git a/po/ga.po b/po/ga.po index a8359f4eda..b9dc4a020d 100644 --- a/po/ga.po +++ b/po/ga.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: coreutils 5.1.3\n" +"Project-Id-Version: coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-02-08 08:24-0500\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-02-21 09:24-0600\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: Irish \n" "MIME-Version: 1.0\n" @@ -155,7 +155,7 @@ msgstr "tomhas bloc" msgid "failed to return to initial working directory" msgstr "níl aon fháil ar an chéad chomhadlann oibre" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "ní féidir an chomhadlann %s a chruthú" @@ -255,19 +255,19 @@ msgstr "n msgid "cannot convert U+%04X to local character set: %s" msgstr "ní féidir U+%04X a thiontú chuig an fhoireann carachtar áitiúil: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "úsáideoir neamhbhailí" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "grúpa neamhbhailí" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "níl aon fháil ar an ghrúpa don UID uimhriúil seo" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "ní féidir an t-úsáideoir agus an grúpa araon a fhágáil ar lár" @@ -393,15 +393,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "argóint neamhbhailí: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "Teipeadh comparáid idir teaghráin" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Cuir LC_ALL='C' ionas gur féidir an fhadhb seo a sheachaint." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Rinneadh comparáid idir na teaghráin %s agus %s." @@ -415,7 +415,7 @@ msgstr "Rinneadh compar #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -449,15 +449,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -476,9 +476,9 @@ msgstr "" "Seol tuairiscí fabhtanna chuig <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -697,17 +697,17 @@ msgstr "n msgid "mode of %s retained as %04lo (%s)\n" msgstr "coimeádadh an mhodh de %s mar %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "níl %s ar fáil" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "ní féidir an chomhadlann %s a léamh" @@ -717,7 +717,7 @@ msgstr "n msgid "changing permissions of %s" msgstr "ag athrú na ceadanna ar %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "teipeadh ar fts_read" @@ -942,7 +942,7 @@ msgstr "n msgid "cannot chdir to root directory" msgstr "ní féidir chdir a dhéanamh go dtí an fhréamhchomhadlann" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "ní féidir an t-ordú %s a rith" @@ -969,18 +969,29 @@ msgstr "" "Taispeáin suim seiceála CRC agus líon bearta di gach COMHAD.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Úsáid: %s [ROGHA]... COMHAD_AR_CLE COMHAD_AR_DHEIS\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Úsáid: %s [ROGHA]... COMHAD1 COMHAD2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Déan comparáid idir COMHAD_AR_CLE agus COMHAD_AR_DHEIS líne ar líne.\n" @@ -994,7 +1005,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "ní féidir %s a oscailt chun léamh" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -1005,7 +1016,7 @@ msgstr "n msgid "skipping file %s, as it was replaced while being copied" msgstr "ag gabháil thar an chomhad %s; bhí sé curtha as áit agus á chóipeáil" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -1016,213 +1027,213 @@ msgstr "n msgid "cannot create regular file %s" msgstr "ní féidir gnáthchomhad %s a chruthú" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "ag léamh %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "ní féidir %s a `lseek'" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "ag scríobh %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "ag dúnadh %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: forscríobh %s agus sáraigh modh %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: forscríobh %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "ní féidir %s a `stat'" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "ag fágáil na comhadlainne %s ar lár" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "rabhadh: comhad foinse %s tugtha níos mó ná uair amháin" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "is iadsan %s agus %s an comhad céanna" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" "ní féidir forscríobh a dhéanamh ar %s (ní comhadlann é) le %s (comhadlann)" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "diúltaíodh forscríobh ar an chomhad nua %s le %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "ní féidir forscríobh a dhéanamh ar %s (comhadlann) le gnáthchomhad" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "ní féidir an chomhadlann %s a fhorscríobh" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "ní féidir comhadlann a aistriú go dtí gnáthchomhad: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "scriosfadh cúltaca de %s an comhad foinse; ní aistríodh %s" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "scriosfadh cúltaca de %s an comhad foinse; ní chóipeáladh %s" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "ní féidir cúltaca a dhéanamh ar %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (cúltaca: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" "ní féidir an chomhadlann %s a chóipeáil isteach sa chomhadlann féin, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ní chruthófar nasc crua %s go dtí comhadlann %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "ní féidir nasc crua %s a chruthú go dtí %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" "ní féidir an chomhadlann %s a aistriú go dtí fochomhadlann dá chuid féin, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "ní féidir %s a aistriú go %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "aistriú idir gléasanna teipthe: %s go %s; ní féidir an sprioc a scriosadh" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ní féidir nasc siombalach ciorclach %s a chóipeáil" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: ní foláir naisc siombalacha coibhneasta a dhéanamh sa chomhadlann oibre" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ní féidir nasc siombalach a dhéanamh ó %s go %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "ní féidir an nasc %s a chruthú" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "ní féidir an `fifo' %s a chruthú" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "ní féidir comhad speisialta %s a chruthú" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "ní féidir nasc siombalach %s a léamh" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "ní féidir an nasc siombalach %s a chruthú" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "níorbh fhéidir an úinéireacht de %s a chaomhnú" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "tá %s de chineál anaithnid" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "ag caomhnú amanna do %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "Theip ar luchtú an chomhaid %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "níorbh fhéidir an t-údar de %s a chaomhnú" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "ag socrú ceadanna ar %s" # bad coinage --KPS -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "ní féidir dí-chúltaca a dhéanamh ar %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (dí-chúltaca)\n" @@ -2358,7 +2369,7 @@ msgstr "" " -x, --exclude-type=CINEÁL ná taispeáin córais comhaid den chineál CINEÁL\n" " -v (as feidhm)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2508,11 +2519,13 @@ msgstr "" " -D, --dereference-args dí-thagair COSÁN más nasc siombalach é\n" #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2523,7 +2536,7 @@ msgstr "" " -k mar `--block-size=1K'\n" " -l, --count-links cuir méid san áireamh gach uair más nasc crua é\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2539,7 +2552,7 @@ msgstr "" " -S, --separate-dirs ná cuir comhadlanna san áireamh\n" " -s, --summarize ná taispeáin ach an tsuim iomlán\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2564,11 +2577,11 @@ msgstr "" "agus\n" " --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "iomlán" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2577,20 +2590,20 @@ msgstr "" "ionann\n" "agus an rogha --dereference-args (-D)" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "doimhneacht uasta neamhbhailí %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "ní féidir coimriú a dhéanamh agus gach iontráil a thaispeáint" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "rabhadh: is ionann iad coimriú agus --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "rabhadh: tagann coimriú agus --max-depth=%d salach ar a chéile" @@ -2846,7 +2859,7 @@ msgstr "" msgid "syntax error" msgstr "earráid chomhréire" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2855,11 +2868,11 @@ msgstr "" "rabhadh: slonn ionadaíochta do-iompartha: `%s': ní iniompartha é `^'\n" "a úsáid ar tosach slonn ionadaíochta bunúsach; ag déanamh neamhshuim air" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "argóint neamhuimhriúil" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "roinnt le nialas" @@ -3375,11 +3388,6 @@ msgstr "" "thimpeallachta VERSION_CONTROL. Seo duit na luachanna bailí:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Úsáid: %s [ROGHA]... COMHAD1 COMHAD2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4617,7 +4625,7 @@ msgstr "r msgid "invalid line numbering format: %s" msgstr "incrimint líne-uimhreach neamhbhailí: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4626,7 +4634,7 @@ msgstr "" "Úsáid: %s ORDÚ [ARGÓINT]...\n" " nó: %s ROGHA\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -4634,21 +4642,25 @@ msgstr "" "Rith ORDÚ agus lig comharthaí HUP thar.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "Ní féidir %s a oscailt" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "níorbh fhéidir aschur caighdeánach a athsheoladh" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "ag ceangal aschur le %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "níorbh fhéidir earráid chaighdeánach a athsheoladh" @@ -5921,12 +5933,12 @@ msgstr "" " -w, --equal-width cothromaigh leithead le nialais ar tosach\n" #: src/seq.c:96 -#, c-format +#, fuzzy, c-format msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -6294,7 +6306,7 @@ msgstr "" " -S, --buffer-size=MÉID maolán príomhchuimhne = MÉID\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -6308,12 +6320,11 @@ msgstr "" " -t, --field-separator=CAR úsáid CAR in ionad athrú ó neamh- go spás bán\n" " -T, --temporary-directory=COMHADLANN cuir comhaid sealadacha i " "gCOMHADLANN\n" -" in ionad $TMPDIR nó %s. Comharthaíonn an " +" in ionad $TMPDIR nó %s; comharthaíonn an " "rogha\n" " seo go leor comhadlanna go leor\n" -" -u, --unique le -c: deimhnigh sórtáil gan dúblaigh\n" -" i ngach cás eile, ná taispeáin ach línte " -"uathúla\n" +" -u, --unique le -c: deimhnigh sórtáil gan dúblaigh;\n" +" gan -c, ná taispeáin ach línte uathúla\n" #: src/sort.c:319 msgid " -z, --zero-terminated end lines with 0 byte, not newline\n" @@ -8680,5 +8691,8 @@ msgstr "" "Priontáil líne arís agus arís le gach TEAGHRÁN ceaptha, nó `y'.\n" "\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Úsáid: %s [ROGHA]... COMHAD_AR_CLE COMHAD_AR_DHEIS\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** dáta/am neamhbhailí ***" diff --git a/po/gl.po b/po/gl.po index 0ef5522590..5932299641 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: textutils 2.0.22\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-07-23 03:07+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -150,7 +150,7 @@ msgstr "tama msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "non se pode crea-lo directorio %s" @@ -231,19 +231,19 @@ msgstr "non se pode converter U+%04X ao xogo de caracteres local" msgid "cannot convert U+%04X to local character set: %s" msgstr "non se pode converter U+%04X ao xogo de caracteres local: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "usuario incorrecto" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "grupo incorrecto" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "non se pode obte-lo grupo de login dun UID numérico" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "non se poden omiti-lo usuario e o grupo" @@ -353,15 +353,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "argumento incorrecto %s para %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "a comparación de cadeas fallou" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Estabreza LC_ALL='C' para palia-lo problema" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "As cadeas que se compararon foron %s e %s" @@ -375,7 +375,7 @@ msgstr "As cadeas que se compararon foron %s e %s" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -412,15 +412,15 @@ msgstr "" " --version amosa-la información da versión e saír\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -440,9 +440,9 @@ msgstr "" "Informe dos erros na traducción a .\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -637,17 +637,17 @@ msgstr "non foi posible muda-lo modo de %s a %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "o modo de %s mantense como %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "non se pode crea-lo directorio %s" @@ -657,7 +657,7 @@ msgstr "non se pode crea-lo directorio %s" msgid "changing permissions of %s" msgstr "non se pode cambia-los permisos de %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "erro de lectura" @@ -858,7 +858,7 @@ msgstr "non se pode cambiar ao directorio %s" msgid "cannot chdir to root directory" msgstr "non se pode cambiar ao directorio %s" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "non se poden cambia-los permisos de `%s'" @@ -885,18 +885,29 @@ msgstr "" "Amosa-la suma de comprobación CRC e o número de bytes de cada FICHEIRO.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Uso: %s [OPCIÓN]... FICHEIRO_ESQUERDO FICHEIRO_DEREITO\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Uso: %s [OPCIÓN]... FICHEIRO1 FICHEIRO2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Compara os ficheiros ordeados FICHEIRO_ESQUERDO e FICHEIRO_DEREITO liña a " @@ -911,7 +922,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "non se pode abrir %s para lectura" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -922,7 +933,7 @@ msgstr "non se poden cambia-los permisos de `%s'" msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -933,208 +944,208 @@ msgstr "non se poden cambia-los permisos de `%s'" msgid "cannot create regular file %s" msgstr "non se pode crea-lo ficheiro temporal" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "erro lendo %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "erro escribindo %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "pechando %s (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: ¿sobrescribir %s, ignorando o modo %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: erro de escritura" -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s son o mesmo ficheiro" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:927 +#: src/copy.c:932 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "non se pode sobrescribir o non-directorio %s co directorio %s" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "facer copia de seguridade de %s destruiría a orixe; %s non movido" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "facer copia de seguridade de %s destruiría a orixe; %s non copiado" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (copia de seguridade: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "non se pode copia-la ligazón simbólica cíclica %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: só se poden facer ligazóns simbólicas relativas no directorio actual" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "ficheiro especial de carácter" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "ligazón simbólica" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "mantense o dono de %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s é un tipo de ficheiro descoñecido" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "mantense a data de %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "mantense a data de %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "mantense o dono de %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "non se pode cambia-los permisos de %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (restaurado da copia de seguridade)\n" @@ -2184,7 +2195,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2325,15 +2336,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2344,7 +2356,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2357,30 +2369,30 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "total" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "anchura non válida: \"%s\"" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "non se pode resumir e amosar tódalas entradas ao mesmo tempo" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "aviso: resumir é o mesmo que usar --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "aviso: resumir vai en conflicto con --max-depth=%d" @@ -2585,7 +2597,7 @@ msgstr "" msgid "syntax error" msgstr "erro estándar" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2594,12 +2606,12 @@ msgstr "" "aviso: ERB non portable: `%s': usar `^' coma o primeiro carácter\n" "cunha expresión regular básica non é portable; ignorarase" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "argumento de límite" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3118,11 +3130,6 @@ msgstr "" " existing, nil copias numeradas se xa existen numeradas, se non simples\n" " simple, never facer sempre copias de seguridade simples\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Uso: %s [OPCIÓN]... FICHEIRO1 FICHEIRO2\n" - #: src/join.c:162 #, fuzzy msgid "" @@ -4313,7 +4320,7 @@ msgstr "ancho do campo do n msgid "invalid line numbering format: %s" msgstr "incremento de números de liña incorrecto: \"%s\"" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4322,28 +4329,32 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "mantense a data de %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "saída estándar" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "non se pode cambia-lo propietario e/ou grupo de %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5595,7 +5606,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8121,6 +8132,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Uso: %s [OPCIÓN]... FICHEIRO_ESQUERDO FICHEIRO_DEREITO\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "anchura non válida: \"%s\"" diff --git a/po/hu.po b/po/hu.po index a2b6dc7750..09fb66a998 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fileutils 4.1.8\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-05-07 09:03+0200\n" "Last-Translator: Emese Kovács \n" "Language-Team: Hungarian \n" @@ -155,7 +155,7 @@ msgstr "blokkm msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "nem lehet a következõ könyvtárat létrehozni: %s" @@ -236,19 +236,19 @@ msgstr "nem lehet helyi karakterk msgid "cannot convert U+%04X to local character set: %s" msgstr "nem lehet U+%04X-t helyi karakterkészletbe átalakítani: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "érvénytelen felhasználó" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "érvénytelen csoport" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "az UID-hez tartozó bejelentkezési csoportot nem lehet megállapítani" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "nem lehet egyszerre a csoportot és a felhasználót is elhagyni" @@ -358,15 +358,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "A `%s' argumentum érvénytelen ehhez: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "karakterlánc-összehasonlítás sikertelen" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Állítsd be az LC_ALL='C' -t a probléma elkerüléséhez." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Az összehasonlított karakterláncok: %s és %s." @@ -380,7 +380,7 @@ msgstr "Az #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -409,15 +409,15 @@ msgid "" msgstr "" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -436,9 +436,9 @@ msgstr "" "A hibákat jelentsd a címen." #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -634,17 +634,17 @@ msgstr "%s jogosults msgid "mode of %s retained as %04lo (%s)\n" msgstr "%s jogosultsága maradt a következõ: %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "%s: hozzáférés sikertelen" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "nem lehet a következõ könyvtárat létrehozni: %s" @@ -654,7 +654,7 @@ msgstr "nem lehet a k msgid "changing permissions of %s" msgstr "%s jogosultságainak megváltoztatása" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "strip sikertelen" @@ -872,7 +872,7 @@ msgstr "nem lehet a k msgid "cannot chdir to root directory" msgstr "nem lehet a következõ könyvtárba lépni: %s" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "%s törlése sikertelen" @@ -895,17 +895,28 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Használat: %s [KAPCSOLÓ]... [FÁJL]\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 +msgid "" +"\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" @@ -914,7 +925,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "%s megnyitása olvasásra sikertelen" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -925,7 +936,7 @@ msgstr "fstat %s sikertelen" msgid "skipping file %s, as it was replaced while being copied" msgstr "%s fájl kihagyása, mivel kicserélték másolás közben" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -936,215 +947,215 @@ msgstr "nem lehet t msgid "cannot create regular file %s" msgstr "nem lehet létrehozni a következõ reguláris fájlt: %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "%s olvasása" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "lseek %s sikertelen" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "%s írása" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "%s lezárása" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: %s felülírása %04lo mód figyelmen kívül hagyásával? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: felülírod %s-t? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "stat %s sikertelen" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "%s könyvtár kihagyása" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "vigyázat: %s forrásfájl többször is meg van adva" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s és %s ugyanaz a fájl" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "%s nem-könyvtárat nem lehet %s könyvtárral felülírni" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "az éppen létrehozott %s-t nem fogom felülírni ezzel: %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "%s könyvtárat nem lehet nem-könyvtárral felülírni" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "nem lehet %s könyvtárat felülírni" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "a könyvtárat nem lehet nem-könyvtárba áthelyezni: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "biztonsági mentés %s-rõl megsemmisítené a forrást:\n" "%s nem került áthelyezésre" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "biztonsági mentés %s-rõl megsemmisítené a forrást:\n" "%s nem került másolásra" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "%s biztonsági mentése sikertelen" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (biztonsági mentés: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "%s könyvtárat nem lehet saját magába (%s) másolni" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "%2$s könyvtárra mutató %1$s hard link nem hozható létre" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "%2$s-re mutató %1$s hard linket nem lehet létrehozni" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s-t nem lehet egy saját alkönyvtárába (%s) áthelyezni" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "%s-t nem lehet ide áthelyezni: %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "eszközközi áthelyezés sikertelen:\n" "%s --> %s; cél törlése sikertelen" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s körkörös linket nem lehet másolni" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: relatív szimbolikus linkeket csak az aktuális\n" "könyvtárban lehet létrehozni" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nem lehet létrehozni %2$s-re mutató %1$s szimbolikus linket" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "nem lehet a következõ linket létrehozni: %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "nem lehet a következõ fifot létrehozni: %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "nem lehet létrehozni a következõ speciális fájlt: %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "nem lehet olvasni a következõ szimbolikus linket: %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "nem lehet létrehozni a következõ szimbolikus linket: %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "%s tulajdonosának megtartása" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s fájltípusa ismeretlen" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "%s összes idejének megtartása" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "%s összes idejének megtartása" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "%s tulajdonosának megtartása" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "%s jogosultságainak beállítása" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "%s biztonsági mentés visszaállítása sikertelen" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (biztonsági mentés visszaállítása)\n" @@ -2171,7 +2182,7 @@ msgstr "" " -x, --exclude-type=TÍPUS a megadott fájlrendszereket nem listázza ki\n" " -v (figyelmen kívül hagyva)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 #, fuzzy msgid "" "\n" @@ -2316,10 +2327,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2328,7 +2340,7 @@ msgstr "" " -k mint --block-size=1K\n" " -l, --count-links többször számolja a méretet, ha hard linkek vannak\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2343,7 +2355,7 @@ msgstr "" " -S, --separate-dirs alkönyvtárakat nem számolja bele\n" " -s, --summarize argumentumonként egy összeget mutat\n" -#: src/du.c:199 +#: src/du.c:201 #, fuzzy msgid "" " -x, --one-file-system skip directories on different filesystems\n" @@ -2365,32 +2377,32 @@ msgstr "" " parancssorban megadott könyvtár alatt.\n" " A --max-depth=0 ugyanaz, mint a --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "összesen" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "érvénytelen maximális mélység: %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "" "nem lehet egyszerre összesítést kérni és minden bejegyzést megjeleníteni" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" "vigyázat: az összesítés megegyezik a --max-depth=0 kapcsoló használatával" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "vigyázat: az összesítés kérése ellenkezik a --max-depth=%d kapcsolóval" @@ -2569,19 +2581,19 @@ msgstr "" msgid "syntax error" msgstr "írási hiba" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "rossz az argumentumok száma" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3042,11 +3054,6 @@ msgstr "" "Az érvényes értékek a következõk:\n" "\n" -#: src/join.c:158 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Használat: %s [KAPCSOLÓ]... [FÁJL]\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4194,35 +4201,39 @@ msgstr " msgid "invalid line numbering format: %s" msgstr "érvénytelen sorhossz: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" " or: %s OPTION\n" msgstr "Használat: %s [KAPCSOLÓ]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "%s összes idejének megtartása" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "szabványos kimenet" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "%s csoportjának megváltoztatása" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5245,7 +5256,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7434,6 +7445,10 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Használat: %s [KAPCSOLÓ]... [FÁJL]\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "érvénytelen mód: %s" diff --git a/po/it.po b/po/it.po index dd33bda63a..ec2dd5709b 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 4.5.1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-07-24 18:12+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -185,7 +185,7 @@ msgstr "" msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "impossibile creare la directory %s" @@ -270,19 +270,19 @@ msgstr "impossibile convertire U+%04X nel set di caratteri locale" msgid "cannot convert U+%04X to local character set: %s" msgstr "impossibile convertire U+%04X nel set di caratteri locale: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "utente non valido" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "gruppo non valido" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "impossibile ottenere il gruppo di login di un UID numerico" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "impossibile omettere sia l'utente che il gruppo" @@ -402,15 +402,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "argomento `%s' non valido" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "confronto delle stringhe fallito" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Imposta LC_ALL='C' per aggirare il problema." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, fuzzy, c-format msgid "The strings compared were %s and %s." msgstr "" @@ -428,7 +428,7 @@ msgstr "" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -462,15 +462,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -493,9 +493,9 @@ msgstr "" "Segnalate i bug a <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -688,17 +688,17 @@ msgstr "impossibile cambiare il modo di %s in %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "il modo di %s è rimasto %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "impossibile accedere a %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "impossibile creare la directory %s" @@ -708,7 +708,7 @@ msgstr "impossibile creare la directory %s" msgid "changing permissions of %s" msgstr "ripristino dei permessi di %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "strip fallito" @@ -929,7 +929,7 @@ msgstr "impossibile cambiare la root directory a %s" msgid "cannot chdir to root directory" msgstr "impossibile fare chdir alla root directory" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "impossibile scollegare %s" @@ -954,17 +954,28 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Uso: %s [OPZIONE]... [ FILE ]\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 +msgid "" +"\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" @@ -973,7 +984,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "impossibile aprire %s per la lettura" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -984,7 +995,7 @@ msgstr "impossibile fare fstat di %s" msgid "skipping file %s, as it was replaced while being copied" msgstr "salto il file %s perché è stato rimpiazzato mentre veniva copiato" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -995,210 +1006,210 @@ msgstr "impossibile rimuovere %s" msgid "cannot create regular file %s" msgstr "impossibile creare il file normale %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "lettura di %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "impossibile fare lseek in %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "scrittura di %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "chiusura di %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: sovrascrivo %s ignorando il modo %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: sovrascrivo %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "impossibile fare stat di %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "directory %s omessa" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "attenzione: il file di origine %s è stato specificato più di una volta" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s sono lo stesso file" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "impossibile sovrascrivere la non-directory %s con la directory %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "il %1$s appena creato non sarà sovrascritto da %2$s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "impossibile sovrascrivere la directory %s con una non-directory" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "impossibile sovrascrivere la directory %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "impossibile spostare una directory in una non-directory: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "il backup di %s distruggerebbe l'origine; %s non spostato" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "il backup di %s distruggerebbe l'origine; %s non copiato" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "impossibile fare il backup di %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "impossibile copiare la directory %s dentro sè stessa, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "impossibile creare l'hard link %s alla directory %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "impossibile creare l'hard link %s a %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "impossibile spostare %s in una subdirectory di sè stesso, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "impossibile spostare %s in %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "spostamento tra dispositivi fallito: %s in %s; impossibile rimuovere\n" "la destinazione" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "impossibile copiare il link simbolico ciclico %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: si possono fare link simbolici relativi solo nella directory corrente" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "impossibile creare il link simbolico %s a %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "impossibile creare il link %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "impossibile creare il fifo %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "impossibile creare il file speciale %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "impossibile leggere il link simbolico %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "impossibile creare il link simbolico %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "impossibile preservare il proprietario di %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s ha il tipo di file sconosciuto" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "preservato l'orario di %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "impossibile preservare l'orario di %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "impossibile preservare l'autore di di %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "impostazione dei permessi di %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "impossibile annullare il backup di %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (annullamento backup)\n" @@ -2325,7 +2336,7 @@ msgstr "" " -x, --exclude-type=TIPO limita l'elenco ai filesystem non di tipo TIPO\n" " -v (ignorato)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 #, fuzzy msgid "" "\n" @@ -2475,10 +2486,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2488,7 +2500,7 @@ msgstr "" " -k come --block-size=1K\n" " -l, --count-links conta le dimensioni più volte se ci sono hard link\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2503,7 +2515,7 @@ msgstr "" " -S, --separate-dirs non include le dimensioni delle subdirectory\n" " -s, --summarize mostra solo un totale per ogni argomento\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2527,30 +2539,30 @@ msgstr "" " di comando; --max-depth=0 è lo stesso che --" "summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "totale" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "profondità massima %s non valida" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "impossibile riassumere e contemporaneamente mostrare tutte le voci" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "attenzione: --summarize è lo stesso che usare --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "attenzione: --summarize è in conflitto con --max-depth=%d" @@ -2801,7 +2813,7 @@ msgstr "" msgid "syntax error" msgstr "errore di sintassi" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2810,11 +2822,11 @@ msgstr "" "attenzione: BRE non portabile: `%s': l'uso di `^' come primo carattere\n" "di un'espressione regolare semplice non è portabile; è ignorato" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "argomenti non numerici" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "divisione per zero" @@ -3306,11 +3318,6 @@ msgstr "" "sono:\n" "\n" -#: src/join.c:158 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Uso: %s [OPZIONE]... [ FILE ]\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4499,7 +4506,7 @@ msgstr "larghezza delle righe non valida: %s" msgid "invalid line numbering format: %s" msgstr "argomento intero `%s' non valido" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4508,28 +4515,32 @@ msgstr "" "Uso: %s FORMATO [ARGOMENTO]...\n" " o: %s OPZIONE\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "impossibile preservare l'orario di %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "standard output" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "il gruppo di %s è stato cambiato" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5641,7 +5652,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8230,6 +8241,10 @@ msgstr "" "`y'.\n" "\n" +#, fuzzy +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Uso: %s [OPZIONE]... [ FILE ]\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "data `%s' non valida" diff --git a/po/ja.po b/po/ja.po index 913889d1bd..1b0f714739 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.22\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-07-27 22:54+0900\n" "Last-Translator: Masahito Yamaga \n" "Language-Team: Japanese \n" @@ -154,7 +154,7 @@ msgstr " msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" @@ -235,19 +235,19 @@ msgstr "U+%04X msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04X ¤ò¥í¡¼¥«¥ëʸ»ú¥»¥Ã¥È %s ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "¥æ¡¼¥¶»ØÄ꤬ÉÔÀµ" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "¥°¥ë¡¼¥×»ØÄ꤬ÉÔÀµ" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "¿ô»ú¤Î UID ¤Î¥í¥°¥¤¥ó¥°¥ë¡¼¥×¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤ÎξÊý¤ò¾Êά¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" @@ -359,15 +359,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "`%2$s' ¤ËÂФ¹¤ë°ú¿ô %1$s ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "ʸ»úÎó¤ÎÈæ³Ó¤Ë¼ºÇÔ" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "ÌäÂê¤ò²óÈò¤¹¤ë¤¿¤á¤Ë LC_ALL='C' ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Èæ³Ó¤·¤¿Ê¸»úÎó¤Ï %s ¤È %s ¤Ç¤¹." @@ -381,7 +381,7 @@ msgstr " #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -415,15 +415,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -442,9 +442,9 @@ msgstr "" "¥Ð¥°¤òȯ¸«¤·¤¿¤é <%s> °¸¤ËÊó¹ð¤·¤Æ²¼¤µ¤¤.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -655,17 +655,17 @@ msgstr "%s msgid "mode of %s retained as %04lo (%s)\n" msgstr "%s ¤Î¥â¡¼¥É¤Ï %04lo (%s) ¤È¤·¤ÆÊÝᤵ¤ì¤Þ¤·¤¿\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" @@ -675,7 +675,7 @@ msgstr " msgid "changing permissions of %s" msgstr "%s ¤Î°À­¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "Æɹþ¤ß¼ºÇÔ" @@ -897,7 +897,7 @@ msgstr " msgid "cannot chdir to root directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "`%s' ¤Ç ioctl() ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" @@ -924,18 +924,29 @@ msgstr "" "CRC ¥Á¥§¥Ã¥¯¥µ¥à¤È³Æ¡¹¤Î¥Õ¥¡¥¤¥ë¤Î¥Ð¥¤¥È¿ô¤òɽ¼¨.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ëA ¥Õ¥¡¥¤¥ëB\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ë1 ¥Õ¥¡¥¤¥ë2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "¤½¤ì¤¾¤ì¥½¡¼¥È¤µ¤ì¤¿ ¥Õ¥¡¥¤¥ëA ¤È ¥Õ¥¡¥¤¥ëB ¤È¤ò¹Ô¤´¤È¤ËÈæ³Ó¤·¤Þ¤¹.\n" @@ -949,7 +960,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "%s ¤ò Æɤ߹þ¤ßÍѤǥª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -960,7 +971,7 @@ msgstr " msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -971,208 +982,208 @@ msgstr " msgid "cannot create regular file %s" msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "%s ¤ÎÆɤ߹þ¤ß¥¨¥é¡¼" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "%s: ¥ª¥Õ¥»¥Ã¥È %s%s ¤ò seek ¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "%s ¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "%s ¤òÊĤ¸¤Æ¤¤¤Þ¤¹ (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: %s ¤Î¥â¡¼¥É %04lo ¤ò̵»ë¤·¤Æ¾å½ñ¤­¤·¤Þ¤¹¤«¡© " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s ¤ò¾å½ñ¤­¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«(yes/no)? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "·Ù¹ð: ¥³¥Ô¡¼¸µ¥Õ¥¡¥¤¥ë %s ¤¬Ê£¿ô»ØÄꤵ¤ì¤Þ¤·¤¿" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s ¤È %s ¤ÏƱ¤¸¥Õ¥¡¥¤¥ë¤Ç¤¹" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "¤¿¤Ã¤¿º£ºîÀ®¤·¤¿ %s ¤Ë¤Ï %s ¤Ç¾å½ñ¤­¤·¤Þ¤»¤ó" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s ¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¤È¸µ¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Þ¤¹ -- %s ¤ò°ÜÆ°¤·¤Þ¤»¤ó¤Ç¤·¤¿" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "%s ¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¤È¸µ¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Þ¤¹ -- %s ¤ò¥³¥Ô¡¼¤·¤Þ¤»¤ó¤Ç¤·¤¿" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (¥Ð¥Ã¥¯¥¢¥Ã¥×: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "`%s' ¤Ç ioctl() ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "½Û´Ä¤¹¤ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ %s ¤Ï¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¾å¤Ç¤Î¤ßÁêÂÐ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬¤Ç¤­¤Þ¤¹" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "¥­¥ã¥é¥¯¥¿¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "%s ¤Î½êÍ­¼Ô¾ðÊó¤òÊݸÃæ" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s ¤Î¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤¬ÉÔÌÀ¤Ç¤¹" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "%s ¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÊݸÃæ" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "%s ¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÊݸÃæ" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "%s ¤Î½êÍ­¼Ô¾ðÊó¤òÊݸÃæ" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "%s ¤Î°À­¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (Éü¸µ)\n" @@ -2307,7 +2318,7 @@ msgstr "" " -x, --exclude-type=TYPE »ØÄꤷ¤¿¼ïÎà¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò½ü¤¤¤Æɽ¼¨¤¹¤ë\n" " -v (̵»ë¤µ¤ì¤ë)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2448,10 +2459,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2461,7 +2473,7 @@ msgstr "" " -k, --kilobytes --block-size=1024 ¤ÈƱÍÍ\n" " -l, --count-links ¥Ï¡¼¥É¥ê¥ó¥¯¤Ç¤¢¤Ã¤Æ¤â½¸·×¤Ë´Þ¤á¤ë\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2477,7 +2489,7 @@ msgstr "" " -S, --separate-dirs ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥¤¥º¤ò´Þ¤á¤Ê¤¤\n" " -s, --summarize °ú¿ôËè¤ÎÁí¹ç·×¤·¤«É½¼¨¤·¤Ê¤¤\n" -#: src/du.c:199 +#: src/du.c:201 #, fuzzy msgid "" " -x, --one-file-system skip directories on different filesystems\n" @@ -2500,30 +2512,30 @@ msgstr "" "¤ë\n" " --max-depth=0 ¤Ê¤é --summarize ƱÅù¤È¤Ê¤ë\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "¹ç·×" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "Éý `%s' ¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "¹ç·×¤ÈÁ´¥¨¥ó¥È¥ê¤Îɽ¼¨¤ÎξÊý¤ò¡¢°ìÅ٤˻ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "·Ù¹ð: Åý·×(-s)¤È -max-depth=0 ¤ÏƱ¤¸ÍÑË¡¤Ç¤¹" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "·Ù¹ð: Åý·×(-s)¤È -max-depth=%d ¤Î»ØÄ꤬¶¥¹ç¤·¤Æ¤¤¤Þ¤¹" @@ -2774,7 +2786,7 @@ msgstr "" msgid "syntax error" msgstr "ɸ½à¥¨¥é¡¼" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2783,12 +2795,12 @@ msgstr "" "·Ù¹ð: ²ÄȤǤʤ¤ BRE: `%s': ´ðËÜŪ¤ÊÀµµ¬É½¸½¤ÎºÇ½é¤Îʸ»ú¤È¤·¤Æ\n" "`^' ¤ò»È¤¦¤³¤È¤Ï²ÄȤǤϤʤ¤¤Î¤Ç̵»ë¤·¤Þ¤¹" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "ÆþÎϤÎÂ礭¤µÀ©¸Â¤Î°ú¿ô" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "¥¼¥í¤Ç¤Î³ä¤ê»»" @@ -3305,11 +3317,6 @@ msgstr "" "¤òÄ̤¸¤ÆÁªÂò¤Ç¤­¤Þ¤¹¡£°Ê²¼¤¬¤½¤ÎºÝ¤ÎÃͤǤ¹:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ë1 ¥Õ¥¡¥¤¥ë2\n" - #: src/join.c:162 #, fuzzy msgid "" @@ -4551,7 +4558,7 @@ msgstr " msgid "invalid line numbering format: %s" msgstr "¹ÔÈÖ¹æ¤ÎÁýʬ¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó: `%s'" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4560,28 +4567,32 @@ msgstr "" "»ÈÍÑË¡: %s [¥Õ¥¡¥¤¥ë]...\n" "¤Þ¤¿¤Ï: %s [¥ª¥×¥·¥ç¥ó]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "%s ¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÊݸÃæ" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "ɸ½à½ÐÎÏ" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "%s ¤Î¥ª¡¼¥Ê¡¼¤È¥°¥ë¡¼¥×¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5860,7 +5871,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8555,6 +8566,9 @@ msgstr "" "»ØÄꤵ¤ì¤¿Á´¤Æ¤Îʸ»úÎó¤Þ¤¿¤Ï `y' ¤«¤é¤Ê¤ë¹Ô¤ò·«¤êÊÖ¤·½ÐÎÏ.\n" "\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ëA ¥Õ¥¡¥¤¥ëB\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "Éý `%s' ¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó" diff --git a/po/ko.po b/po/ko.po index fe2db2d0f6..506a4ca596 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.22\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-07-22 20:02+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -151,7 +151,7 @@ msgstr " msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" @@ -233,19 +233,19 @@ msgstr "U+%04X msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04XÀ»(¸¦) ·ÎÄ® ¹®ÀÚ¼ÂÀ¸·Î º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "À߸øµÈ »ç¿ëÀÚ" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "À߸øµÈ ±×·ì" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "UIDÀÇ ·Î±×ÀÎ ±×·ìÀ» ¾Ë¾Æ ³¾ ¼ö ¾ø½À´Ï´Ù" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "»ç¿ëÀÚ¿Í ±×·ìÀ» ¸ðµÎ »ý·«ÇÒ ¼ö´Â ¾ø½À´Ï´Ù" @@ -353,15 +353,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "%2$s¿¡ ´ëÇØ ºÎÀûÀýÇÑ ÀÎÀÚ %1$s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "¹®ÀÚ¿­ ºñ±³°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "ÀÌ ¹®Á¦¸¦ ÇÇÇØ °¡·Á¸é LC_ALL='C'ÇϽʽÿÀ." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "ºñ±³ÇÑ ¹®ÀÚ¿­Àº %s°ú(¿Í) %sÀÔ´Ï´Ù." @@ -375,7 +375,7 @@ msgstr " #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -406,15 +406,15 @@ msgid "" msgstr "" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -433,9 +433,9 @@ msgstr "" "<%s>(À¸)·Î ¹ö±×¸¦ ¾Ë·Á ÁֽʽÿÀ.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -630,17 +630,17 @@ msgstr "%s msgid "mode of %s retained as %04lo (%s)\n" msgstr "%sÀÇ ¸ðµå¸¦ %04lo(%s)À¸·Î À¯ÁöÇÏ¿´½À´Ï´Ù\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "`%s'¿¡ chownÀ» ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" @@ -650,7 +650,7 @@ msgstr "%s msgid "changing permissions of %s" msgstr "%sÀÇ Çã°¡¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "ÆÄÀÏ Àб⠽ÇÆÐ" @@ -846,7 +846,7 @@ msgstr "%s msgid "cannot chdir to root directory" msgstr "%s µð·ºÅ丮·Î chdirÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "`%s'¿¡¼­ ioctlÀ» ÇÒ ¼ö ¾ø½À´Ï´Ù" @@ -873,18 +873,29 @@ msgstr "" "°¢ <ÆÄÀÏ>¿¡ ´ëÇØ CRC üũ¼¶°ú ¹ÙÀÌÆ® °³¼ö¸¦ Ãâ·ÂÇÕ´Ï´Ù.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>]... <¿ÞÂÊ_ÆÄÀÏ> <¿À¸¥ÂÊ_ÆÄÀÏ>\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>]... <ÆÄÀÏ1> <ÆÄÀÏ2>\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Á¤·ÄµÈ ÆÄÀÏÀÎ <¿ÞÂÊ_ÆÄÀÏ>°ú <¿À¸¥ÂÊ_ÆÄÀÏ>À» Çà ´ÜÀ§·Î ºñ±³ÇÕ´Ï´Ù.\n" @@ -898,7 +909,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "`%s'¸¦ `%s'·Î À̵¿ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -909,7 +920,7 @@ msgstr "`%s' msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -920,207 +931,207 @@ msgstr "%s msgid "cannot create regular file %s" msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "%sÀ»(¸¦) Àд µµÁß ¿À·ù ¹ß»ý" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "%s: ¿ÀÇÁ¼Â %s%s·Î(À¸·Î) °¥ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "%s¿¡ ¾²´Â µµÁß ¿À·ù ¹ß»ý" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "%s(fd=%d)À»(¸¦) ´Ý½À´Ï´Ù " -#: src/copy.c:630 +#: src/copy.c:635 #, fuzzy, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: `%s'¿¡ ¸ðµå %04loÀ¸·Î °ãÃľ²°Ú½À´Ï±î? " -#: src/copy.c:636 +#: src/copy.c:641 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: `%s'¸¦ °ãÃľ¹´Ï±î? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "`%s'¿Í `%s'´Â °°Àº ÆÄÀÏÀÔ´Ï´Ù" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "%s µð·ºÅ丮·Î chdirÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:927 +#: src/copy.c:932 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: µð·ºÅ丮°¡ ¾Æ´Ñ °÷¿¡ µð·ºÅ丮¸¦ °ãÃľµ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "%s µð·ºÅ丮·Î chdirÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1031 +#: src/copy.c:1036 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "`%s'ÀÇ ¹é¾÷Àº ¿ø·¡ ÆÄÀÏÀ» ¼Õ»óÇÒ °ÍÀÔ´Ï´Ù; `%s'´Â À̵¿µÇÁö ¾Ê½À´Ï´Ù" -#: src/copy.c:1032 +#: src/copy.c:1037 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "`%s'ÀÇ ¹é¾÷Àº ¿ø·¡ ÆÄÀÏÀ» ¼Õ»óÇÒ °ÍÀÔ´Ï´Ù; `%s'´Â º¹»çµÇÁö ¾Ê½À´Ï´Ù" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "`%s'¸¦ ¹é¾÷ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (¹é¾÷: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "%s µð·ºÅ丮·Î chdirÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s µð·ºÅ丮·Î chdirÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "`%s'¿¡¼­ ioctlÀ» ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: ½Éº¼¸¯ ¸µÅ©ÀÇ »çÀÌŬÀº º¹»çÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: ÇöÀç µð·ºÅ丮 ¾È¿¡¼­¸¸ »ó´ëÀûÀÎ ½Éº¼¸¯ ¸µÅ©¸¦ ¸¸µé ¼ö ÀÖ½À´Ï´Ù" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "¹®ÀÚ Æ¯¼ö ÆÄÀÏ" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "½Éº¼¸¯ ¸µÅ©" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "%s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "%sÀÇ ¼ÒÀ¯±ÇÀ» À¯ÁöÇÕ´Ï´Ù" -#: src/copy.c:1502 +#: src/copy.c:1520 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: ¾Ë ¼ö ¾ø´Â ÆÄÀÏÇü" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "%sÀÇ ½Ã°£À» À¯ÁöÇÕ´Ï´Ù" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "%sÀÇ ½Ã°£À» À¯ÁöÇÕ´Ï´Ù" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "%sÀÇ ¼ÒÀ¯±ÇÀ» À¯ÁöÇÕ´Ï´Ù" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "%sÀÇ Çã°¡¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "`%s'ÀÇ ¹é¾÷À» µÇµ¹¸± ¼ö ¾ø½À´Ï´Ù" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (¹é¾÷ ÇØÁ¦)\n" @@ -2179,7 +2190,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2309,15 +2320,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2328,7 +2340,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2341,30 +2353,30 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "ÇÕ°è" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "ºÎÀûÀýÇÑ Æø: `%s'" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "¸ðµç µð·ºÅ丮 ³»¿ëÀ» Ç¥½ÃÇϸ鼭 ¿ä¾àÇÒ ¼ö´Â ¾ø½À´Ï´Ù" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "°æ°í: ¿ä¾àÀº --max-depth=0À» »ç¿ëÇÏ´Â °Í°ú °°½À´Ï´Ù" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "°æ°í: --max-depth=%d´Â ¿ä¾à ¿É¼Ç°ú Ãæµ¹ÇÕ´Ï´Ù" @@ -2551,19 +2563,19 @@ msgstr "" msgid "syntax error" msgstr "Ç¥ÁØ ¿À·ù" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "Àμö Á¦ÇÑ" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3037,11 +3049,6 @@ msgstr "" " ´Ü¼øÇÏ°Ô ÇÕ´Ï´Ù\n" " simple, never Ç×»ó ´Ü¼ø ¹é¾÷À» ÇÕ´Ï´Ù\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>]... <ÆÄÀÏ1> <ÆÄÀÏ2>\n" - # -a SIDE, -e EMPTY Àç°í·Á #: src/join.c:162 #, fuzzy @@ -4182,7 +4189,7 @@ msgstr " msgid "invalid line numbering format: %s" msgstr "ºÎÀûÀýÇÑ Çà¹øÈ£ Áõ°¡: `%s'" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4191,28 +4198,32 @@ msgstr "" "»ç¿ë¹ý: %s [<ÆÄÀÏ>]...\n" " ȤÀº: %s [<¿É¼Ç>]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "%sÀÇ ½Ã°£À» À¯ÁöÇÕ´Ï´Ù" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "Ç¥ÁØ Ãâ·Â" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "%sÀÇ ¼ÒÀ¯ÀÚ ±×¸®°í/ȤÀº ±×·ìÀ» ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5425,7 +5436,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7768,6 +7779,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>]... <¿ÞÂÊ_ÆÄÀÏ> <¿À¸¥ÂÊ_ÆÄÀÏ>\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "ºÎÀûÀýÇÑ Æø: `%s'" diff --git a/po/lg.po b/po/lg.po index 5708db1aeb..6948ae1b87 100644 --- a/po/lg.po +++ b/po/lg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fileutils 4.1.11\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-09-02 22:46GMT\n" "Last-Translator: K.Birabwa \n" "Language-Team: Luganda \n" @@ -152,7 +152,7 @@ msgstr "bunene obwa buloka" msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "nnemedwa okukola wo tterekero %s" @@ -233,20 +233,20 @@ msgstr "nemedwa okukyuusa U+%04X okudda mu bubonero obukozesebwa wano" msgid "cannot convert U+%04X to local character set: %s" msgstr "nemedwa okukyuusa U+%04X okudda mu bubonero obukozesebwa wano: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "omukozesa ono takkirizibwa" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "guluupu eno tekkirizibwa" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "" "UID bw'ogiwa nga omuwendo, mbeera sisobola okufuna guluupu yayo eya login" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "tekikkirizibwa obutawa byombi, mukozesa ate ne guluupu" @@ -352,15 +352,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "agumenti %s tekozesebwa ku %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "okugerageranya nkolongo kugaanye" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Okuvvuunuka obuzibu buno, teeka LC_ALL='C'." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Nkolongo ezigerageranyizidwa ze %s ne %s." @@ -374,7 +374,7 @@ msgstr "Nkolongo ezigerageranyizidwa ze %s ne %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -403,15 +403,15 @@ msgid "" msgstr "" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -430,9 +430,9 @@ msgstr "" "Zizinga mubuulire <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -630,17 +630,17 @@ msgstr "nnemedwa okukyuusa nkola eya %s efuuke %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "nkola eya %s esigazidwa nga eri %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "nnemedwa okubikkula %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "nnemedwa okukola wo tterekero %s" @@ -650,7 +650,7 @@ msgstr "nnemedwa okukola wo tterekero %s" msgid "changing permissions of %s" msgstr "nkyuusa obuyinza obwa ku %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "fayiro eya bulijjo" @@ -877,7 +877,7 @@ msgstr "chdir elemedwa okuyingira tterekero %s" msgid "cannot chdir to root directory" msgstr "chdir elemedwa okuyingira tterekero %s" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "nnemedwa okukola stat ku %s" @@ -902,17 +902,28 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" @@ -921,7 +932,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "sisobodde okubikkula %s kugisoma" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -933,7 +944,7 @@ msgid "skipping file %s, as it was replaced while being copied" msgstr "" "fayiro %s ngibuuka kubanga eyo yawanyisidwa mu ndala bwe yabadde ekoppebwa" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -944,207 +955,207 @@ msgstr "sisobola okugyawo %s" msgid "cannot create regular file %s" msgstr "nnemedwa okukolawo fayiro eya bulijjo %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "nsoma %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "nnemedwa okukola lseek ku %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "mpandikira mu %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "mbikka %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: %s ngiwandiike ko nga empya, nga sifa ku nkola %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s ngiwandiike ko nga empya?" -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "nnemedwa okukola stat ku %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "tterekero %s ngibuuka" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "nnemedwa okuykyusa guluupu eya %s ebeere %s\n" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -2025,7 +2036,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2135,15 +2146,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2154,7 +2166,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2167,30 +2179,30 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "" @@ -2369,18 +2381,18 @@ msgstr "" msgid "syntax error" msgstr "kiremya mu kuwandiikira" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -2804,11 +2816,6 @@ msgid "" "\n" msgstr "" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -3768,7 +3775,7 @@ msgstr "tekola nga ennamba eya guluupu %s" msgid "invalid line numbering format: %s" msgstr "tekola nga ennamba eya guluupu %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -3777,27 +3784,31 @@ msgstr "" "Enkozesa: %s [KAWAYIRO]... FAYIRO EYA GULUUPU...\n" " oba: %s [KAWAYIRO]... --reference=RFAYIRO FAYIRO...\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "nnemedwa okuykyusa guluupu eya %s ebeere %s\n" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "nkyusa guluupu eya %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -4781,7 +4792,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" diff --git a/po/ms.po b/po/ms.po index 6eecec982a..def74dfa7d 100644 --- a/po/ms.po +++ b/po/ms.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0.90\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2003-08-10 16:00+0800\n" "Last-Translator: Hasbullah Bin Pit \n" "Language-Team: Malay \n" @@ -150,7 +150,7 @@ msgstr "saiz blok" msgid "failed to return to initial working directory" msgstr "gagal untuk kembali ke direktori kerja pemulaan" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "tak dapat mencipta direktori %s" @@ -231,19 +231,19 @@ msgstr "tak dapat menukar U+%04X ke set aksara lokal" msgid "cannot convert U+%04X to local character set: %s" msgstr "tak dapat menukar U+%04X ke set aksara lokal: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "pengguna tidak sah" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "kumpulan tidak sah" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "tak boleh mendapatkan kumpulan logmasuk untuk UID numerik" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "tak dapat omit kedua-dua pengguna dan kumpulan" @@ -352,15 +352,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "hujah tidak sah %s bagi %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "perbandingan rentetan gagal" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Tetapkan LC_ALL='C' untuk mengatasi masalah." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Rentetan dibandingkan adalah %s dan %s." @@ -374,7 +374,7 @@ msgstr "Rentetan dibandingkan adalah %s dan %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -407,15 +407,15 @@ msgstr "" "Jika dinyatakan, juga akan membuang DUFFIKS ekoran.\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -434,9 +434,9 @@ msgstr "" "Lapor pepijat ke <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -638,17 +638,17 @@ msgstr "gagal menukar mod %s kepada %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "mod %s kekal sebagai %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "Tak dapat mengakses %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "tak dapat membaca direktori %s" @@ -658,7 +658,7 @@ msgstr "tak dapat membaca direktori %s" msgid "changing permissions of %s" msgstr "menukar keizinan %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "fail biasa" @@ -861,7 +861,7 @@ msgstr "Gagal menukar direktori root ke %s " msgid "cannot chdir to root directory" msgstr "tak dapat chdir ke direktori root" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "takboleh nyahpaut %s" @@ -886,17 +886,28 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Penggunaan: %s [OPSYEN]...FAIL_KIRI FAIL_KANAN\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Penggunaan: %s [OPSYEN]...FAIL1 FAIL2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" @@ -905,7 +916,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "tak dapat buka %s untuk dibaca" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -916,7 +927,7 @@ msgstr "tak dapat fstat %s" msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -927,207 +938,207 @@ msgstr "tak dapat membuang %s" msgid "cannot create regular file %s" msgstr "tak dapat memcipta fail biasa %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "membaca %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "tak dapat lseek %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "menulis %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "menutup %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: menindih %s, menindih mod %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: tindih %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "tak dapat stat %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "Amaran: fail sumber %s dinyatakan lebih drpd sekali" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s dan %s adalah fail yang sama" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "tak boleh menindih bukan-direktori %s dengan direktori %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "tak akan menindih baru-dicipta %s dengan %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "tak boleh menindih direktori %s dengan direktori" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "tak boleh menindih direktori %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "tak dapat pindah direktori ke bukan-direktori: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "backup %s akan memusnahkan sumber; %s tidak dipindahkan" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "backup %s akan memusnahkan sumber; %s tidak disalin" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "tak dapat backup %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "tak dapat salin direktori, %s ke dirinya, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "tidak akan mencipta pautan keras %s ke direktori %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "tak dapat mencipta pautan keras %s ke %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "tak dapat pindahkan %s ke subdirektori dirinya, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "tak dapat pindahkan %s ke %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "pindahan antara-peranti gagak: %s ke %s; tak dapat memindah sasaran" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "tak boleh salin pautan simbolik cyclic %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: hanya boleh membuat pautan simbolik relatif pada direktori semasa" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "tak dapat mencipta pautan simbolik %s ke %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "tak boleh mencipta pautan %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "tak boleh mencipta fifo %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "tak boleh mencipta fail istimewa %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "tak dapat membaca pautan simbolik %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "tak dapat mencipta pautan simbolik %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "gagal mengekalkan hakmilik bagi %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s mempunyai jenis fail yang tidak diketahui" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "mengekalkan masa pada %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "gagal mencari fail %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "gagal mengekalkan hakmilik bagi %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "menetapkan keizinan pada %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "tak dapat nyahbackup %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (nyahbackup)\n" @@ -2107,7 +2118,7 @@ msgstr "" "JENIS\n" " -v (diabaikan)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 #, fuzzy msgid "" "\n" @@ -2234,15 +2245,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2253,7 +2265,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2266,30 +2278,30 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "jumlah" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "Kedalaman maksimum %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "tak dapat meringkaskan dan menunjukkan semua kemasukan" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "amaran: peringkasan sama seperti menggunakan --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "amaran: peringkasan konflik dengan --max-depth=%d" @@ -2469,18 +2481,18 @@ msgstr "" msgid "syntax error" msgstr "Ralat sintaks" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "hujah bukan-numerik" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "dibahagi dengan sifar" @@ -2963,11 +2975,6 @@ msgid "" "\n" msgstr "" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Penggunaan: %s [OPSYEN]...FAIL1 FAIL2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4013,7 +4020,7 @@ msgstr "lebar baris tidak sah: %s" msgid "invalid line numbering format: %s" msgstr "lebar baris tidak sah: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4022,28 +4029,32 @@ msgstr "" "Pengunaan: %s FAIL\n" " atau: %s OPSYEN\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "menutup output piawai" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "penukaran kumpulan %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5041,7 +5052,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7172,6 +7183,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Penggunaan: %s [OPSYEN]...FAIL_KIRI FAIL_KANAN\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "mod tak sah %s" diff --git a/po/nb.po b/po/nb.po index cc7b801e07..e2b74e3ad8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.20\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-01-27 21:35+0100\n" "Last-Translator: Eivind Tagseth \n" "Language-Team: Norwegian \n" @@ -154,7 +154,7 @@ msgstr "blokkst msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "kan ikke opprette katalog %s" @@ -239,19 +239,19 @@ msgstr "kan ikke konvertere U+%04X til lokalt tegnsett" msgid "cannot convert U+%04X to local character set: %s" msgstr "kan ikke konvertere U+%04X til lokalt tegnsett" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "ugyldig bruker" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "ugyldig gruppe" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "kan ikke finne login-gruppen til en numerisk bruker-ID" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "kan ikke utelate både bruker og gruppe" @@ -360,15 +360,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "ugyldig argument %s for %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "strengsammenligning feilet" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Sett LC_ALL='C' for å omgå problemet." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Strengene som ble sammenlignet var «%s» og «%s»." @@ -382,7 +382,7 @@ msgstr "Strengene som ble sammenlignet var #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -413,15 +413,15 @@ msgid "" msgstr "" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -440,9 +440,9 @@ msgstr "" "Rapportér feil til ." #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -637,17 +637,17 @@ msgstr "" msgid "mode of %s retained as %04lo (%s)\n" msgstr "" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "kan ikke opprette katalog %s" @@ -657,7 +657,7 @@ msgstr "kan ikke opprette katalog %s" msgid "changing permissions of %s" msgstr "kan ikke endre rettigheter til %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "feil ved lesing" @@ -833,7 +833,7 @@ msgstr "kan ikke skifte til katalog, %s" msgid "cannot chdir to root directory" msgstr "kan ikke skifte til katalog, %s" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "kan ikke utføre ioctl på «%s»" @@ -860,18 +860,29 @@ msgstr "" "Skriv CRC-sjekksum og oktett-antall for hver FIL.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Bruk: %s [FLAGG]... VENSTRE_FIL HØYRE_FIL\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Bruk: %s [FLAGG]... FIL1 FIL2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Sammenlign de sorterte filene VENSTREFIL og HØYREFIL linje for linje.\n" @@ -885,7 +896,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -896,7 +907,7 @@ msgstr "" msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -907,207 +918,207 @@ msgstr "kan ikke opprette katalog %s" msgid "cannot create regular file %s" msgstr "kan ikke opprette midlertidig fil" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "feil ved lesing av %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "%s: kan ikke søke til posisjon %s%s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "feil ved skriving til %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "lukker %s (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "" -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "" -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan ikke skifte til katalog, %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan ikke skifte til katalog, %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "kan ikke skifte til katalog, %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "kan ikke skifte til katalog, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "tegn-posisjon er null" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "kan ikke opprette katalog %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "kan ikke endre rettigheter til %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -2039,7 +2050,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2151,15 +2162,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2170,7 +2182,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2183,30 +2195,30 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "totalt" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "ugyldig bredde: «%s»" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "" @@ -2394,19 +2406,19 @@ msgstr "" msgid "syntax error" msgstr "standard feilkanal" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "begrens argument" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -2860,11 +2872,6 @@ msgid "" "\n" msgstr "" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Bruk: %s [FLAGG]... FIL1 FIL2\n" - #: src/join.c:162 #, fuzzy msgid "" @@ -3919,7 +3926,7 @@ msgstr "ugyldig linjenummer-feltbredde: msgid "invalid line numbering format: %s" msgstr "ugyldig linjenummer-økning: «%s»" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -3928,28 +3935,32 @@ msgstr "" "Bruk: %s [FIL]...\n" "eller: %s [FLAGG]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "standard ut" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "kan ikke endre eier og/eller gruppe for %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5135,7 +5146,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7467,6 +7478,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Bruk: %s [FLAGG]... VENSTRE_FIL HØYRE_FIL\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "ugyldig bredde: «%s»" diff --git a/po/nl.po b/po/nl.po index ae994277b8..35ff336169 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0d\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2000-03-17 17:45+01:00\n" "Last-Translator: Ivo Timmermans \n" "Language-Team: Dutch \n" @@ -153,7 +153,7 @@ msgstr "blokgrootte" msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, fuzzy, c-format msgid "cannot create directory %s" msgstr "kan map `%s' niet aanmaken" @@ -236,19 +236,19 @@ msgstr "" msgid "cannot convert U+%04X to local character set: %s" msgstr "" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "ongeldige gebruiker" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "ongeldige groep" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "kan de logingroep van een numerieke gebruiker niet opvragen" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "u kunt niet zowel de gebruiker als de groep weglaten" @@ -357,15 +357,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "ongeldig argument %s voor `%s'" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "" @@ -379,7 +379,7 @@ msgstr "" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -414,15 +414,15 @@ msgstr "" " --version toon versie-informatie en bekindig programma\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -442,9 +442,9 @@ msgstr "" "Meld fouten in de vertaling aan ." #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -661,17 +661,17 @@ msgstr "kan mode van %s niet in %04lo (%s) veranderen\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "mode van %s blijft %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "kan de rechten van %s niet veranderen" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "kan map `%s' niet aanmaken" @@ -681,7 +681,7 @@ msgstr "kan map `%s' niet aanmaken" msgid "changing permissions of %s" msgstr "kan de eigenaar van %s niet veranderen" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "fout bij schrijven" @@ -875,7 +875,7 @@ msgstr "kan niet naar map gaan, %s" msgid "cannot chdir to root directory" msgstr "kan niet naar map gaan, %s" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "kan de rechten van %s niet veranderen" @@ -898,18 +898,29 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Aanroep: %s [OPTIE]... BESTAND1 BESTAND2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Vergelijk gesorteerde bestanden BESTAND1 en BESTAND2 regel voor regel.\n" @@ -926,7 +937,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "kan `%s' niet verplaatsen naar `%s'" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -937,7 +948,7 @@ msgstr "kan de rechten van %s niet veranderen" msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -948,209 +959,209 @@ msgstr "kan de rechten van %s niet veranderen" msgid "cannot create regular file %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "fout bij lezen %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "kan de rechten van %s niet veranderen" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "fout bij schrijven %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "%s wordt gesloten (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, fuzzy, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: `%s' overschrijven, ondanks mode %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: fout bij schrijven" -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "kan de rechten van %s niet veranderen" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "`%s' en `%s' zijn het zelfde bestand" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan niet naar map gaan, %s" -#: src/copy.c:927 +#: src/copy.c:932 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: kan map niet overschrijven" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan niet naar map gaan, %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "een reservekopie van `%s' zou de bron vernietigen; `%s' niet verplaatst" -#: src/copy.c:1032 +#: src/copy.c:1037 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "een reservekopie van `%s' zou de bron vernietigen; `%s' niet gekopieerd" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "kan de rechten van %s niet veranderen" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (reservekopie: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "kan niet naar map gaan, %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "kan niet naar map gaan, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "kan de rechten van %s niet veranderen" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: kan cyclische symbolische koppeling niet kopiëren" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: kan relatieve symbolische koppelingen alleen in huidige map maken" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "kan geen ioctl doen op `%s'" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "kan map `%s' niet aanmaken" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "bezig met kopiëren van de eigenaar van %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: onbekend bestandstype" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "bezig met kopiëren van de tijden van %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "Kon bestand `%s' niet verwijderen" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "bezig met kopiëren van de eigenaar van %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "kan de eigenaar van %s niet veranderen" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "kan de rechten van %s niet veranderen" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (reservekopie verwijderd)\n" @@ -2197,7 +2208,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2334,15 +2345,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2353,7 +2365,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2366,31 +2378,31 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "totaal" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "ongeldig veldnummer: `%s'" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "" "totalen berekenen kan niet gelijktijdig met het tonen van alle ingangen" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "waarschuwing: totalen geven is het zelfde als --max-depth=0 gebruiken" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "waarschuwing: het geven van totalen is in conflict met --max-depth=%d" @@ -2586,7 +2598,7 @@ msgstr "" msgid "syntax error" msgstr "standaard fout-uitvoer" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2595,12 +2607,12 @@ msgstr "" "let op: niet portable BRE: `%s': gebruik `^' als het eerrste karakter\n" "van de basic reguliere expressie is niet portable; het wordt genegeerd" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "beperk argument" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3138,11 +3150,6 @@ msgstr "" " reserve-kopiekn bestaan, anders simpel\n" " simple, never maak altijd simpele reservekopieën\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Aanroep: %s [OPTIE]... BESTAND1 BESTAND2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4241,35 +4248,39 @@ msgstr "ongeldige veldbreedte voor regelnummer: `%s'" msgid "invalid line numbering format: %s" msgstr "ongeldige ophoging voor regelnummers: `%s'" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" " or: %s OPTION\n" msgstr "Aanroep: %s [OPTIE]... [INVOER [UITVOER]]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "Kon bestand `%s' niet verwijderen" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "standaarduitvoer" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "u kunt niet zowel de gebruiker als de groep weglaten" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5345,7 +5356,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7785,6 +7796,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Aanroep: %s [OPTIE]... BESTAND1 BESTAND2\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "ongeldig veldnummer: `%s'" diff --git a/po/no.po b/po/no.po index 0a9506aee4..b6163602c1 100644 --- a/po/no.po +++ b/po/no.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 1.22i\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 1999-04-16 12:02 +02:00\n" "Last-Translator: Eivind Tagseth \n" "Language-Team: Norwegian \n" @@ -152,7 +152,7 @@ msgstr "" msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, fuzzy, c-format msgid "cannot create directory %s" msgstr "kan ikke utføre ioctl på «%s»" @@ -234,21 +234,21 @@ msgstr "" msgid "cannot convert U+%04X to local character set: %s" msgstr "" -#: lib/userspec.c:148 +#: lib/userspec.c:147 #, fuzzy msgid "invalid user" msgstr "ugyldig antall" -#: lib/userspec.c:149 +#: lib/userspec.c:148 #, fuzzy msgid "invalid group" msgstr "ugyldig antall" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "" @@ -354,15 +354,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "ugyldig type-streng «%s»" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "" @@ -376,7 +376,7 @@ msgstr "" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -411,15 +411,15 @@ msgstr "" " --version vis versjonsinformasjon og avslutt\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -438,9 +438,9 @@ msgstr "" "Rapportér feil til ." #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -657,17 +657,17 @@ msgstr "klarte ikke msgid "mode of %s retained as %04lo (%s)\n" msgstr "beskyttelse for %s beholdt som %04o (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "kan ikke utføre ioctl på «%s»" @@ -677,7 +677,7 @@ msgstr "kan ikke utf msgid "changing permissions of %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "feil ved skriving" @@ -870,7 +870,7 @@ msgstr "kan ikke utf msgid "cannot chdir to root directory" msgstr "kan ikke utføre ioctl på «%s»" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "kan ikke utføre ioctl på «%s»" @@ -893,18 +893,29 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Bruk: %s [FLAGG]... VENSTRE_FIL HØYRE_FIL\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Bruk: %s [FLAGG]... FIL1 FIL2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Sammenlign de sorterte filene VENSTRE_FIL og HØYRE_FIL linje for linje.\n" @@ -920,7 +931,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "kan ikke linke «%s» til «%s»" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -931,7 +942,7 @@ msgstr "kan ikke utf msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -942,209 +953,209 @@ msgstr "kan ikke utf msgid "cannot create regular file %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "feil ved lesing av %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "feil ved skriving til %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "lukker %s (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, fuzzy, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: overskrive «%s», uten hensyn til beskyttelse %04o?" -#: src/copy.c:636 +#: src/copy.c:641 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: skrivefeil" -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "«%s» og «%s» er samme fil" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:927 +#: src/copy.c:932 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: kan ikke overskrive filkatalog med annet enn filkatalog" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1031 +#: src/copy.c:1036 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "sikkerhetskopiering av «%s» vil overskrive kildefil. «%s» er ikke flyttet" -#: src/copy.c:1032 +#: src/copy.c:1037 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "sikkerhetskopiering av «%s» vil overskrive kildefil. «%s» er ikke kopiert" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, fuzzy, c-format msgid " (backup: %s)" msgstr "kan ikke gjøre sikkerhetskopi av «%s»" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: kan ikke kopiere syklisk symbolsk link" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: kan bare lage relative symbolske linker i aktiv filkatalog" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "bevarer eierrettigheter for %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: ukjent filtype" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "bevarer tider for %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "bevarer tider for %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "bevarer eierrettigheter for %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "kan ikke utføre ioctl på «%s»" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -2152,7 +2163,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2282,15 +2293,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2301,7 +2313,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2314,30 +2326,30 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "totalt" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "ugyldig felt-nummer: «%s»" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "kan ikke vise alle størrelser og bare vise summer samtidig." -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "advarsel: summering er det samme som å bruke --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "advarsel: summering er i konflikt med --max-depth=%d" @@ -2532,7 +2544,7 @@ msgstr "" msgid "syntax error" msgstr "stdin: lesefeil" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2542,12 +2554,12 @@ msgstr "" "bruk av «^» som første tegn av et vanlig regulært uttrykk er ikke\n" "portabelt; «^» ignoreres" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "begrens argument" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3080,11 +3092,6 @@ msgstr "" " ellers enkle\n" " never, simple lag enkle sikkerhetskopier\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Bruk: %s [FLAGG]... FIL1 FIL2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4160,35 +4167,39 @@ msgstr "ugyldig linjenummer-feltbredde: msgid "invalid line numbering format: %s" msgstr "ugyldig linjenummer-økning: «%s»" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" " or: %s OPTION\n" msgstr "Bruk: %s [FLAGG]... [INN [UT]]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "bevarer tider for %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "standard ut" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "kan ikke endre rot-katalogen til %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5249,7 +5260,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7663,6 +7674,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Bruk: %s [FLAGG]... VENSTRE_FIL HØYRE_FIL\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "ugyldig felt-nummer: «%s»" diff --git a/po/pl.po b/po/pl.po index 308cda97fd..888e75f110 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,10 +10,10 @@ # msgid "" msgstr "" -"Project-Id-Version: coreutils 5.1.3\n" +"Project-Id-Version: coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-02-09 14:30+0200\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-02-21 15:00+0200\n" "Last-Translator: Rafa³ Maszkowski \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -158,7 +158,7 @@ msgstr "rozmiar bloku" msgid "failed to return to initial working directory" msgstr "nie uda³o siê wróciæ do pocz±tkowego katalogu roboczego" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "nie mo¿na utworzyæ katalogu %s" @@ -239,19 +239,19 @@ msgstr "nie mo msgid "cannot convert U+%04X to local character set: %s" msgstr "nie mo¿na przekszta³ciæ U+%04X do lokalnego zestawu znaków: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "b³êdny u¿ytkownik" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "b³êdna grupa" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "Nie mo¿na ustaliæ grupy identyfikatora numerycznego UID" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "nie mo¿na pomin±æ u¿ytkownika i grupy równocze¶nie" @@ -377,15 +377,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "b³êdny argument: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "nie uda³o siê porównanie ³añcuchów znaków" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Ustaw LC_ALL='C' ¿eby obej¶æ problem" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Porównywane ³añcuchy znaków do %s i %s." @@ -399,7 +399,7 @@ msgstr "Por #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -433,15 +433,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -460,9 +460,9 @@ msgstr "" "Raporty o b³êdach wysy³aj do %s .\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -683,17 +683,17 @@ msgstr "nie uda msgid "mode of %s retained as %04lo (%s)\n" msgstr "uprawnienia do %s zachowane jako %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "nie ma dostêpu do %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "nie mo¿na przeczytaæ katalogu %s" @@ -703,7 +703,7 @@ msgstr "nie mo msgid "changing permissions of %s" msgstr "nie mo¿na zmieniæ uprawnieñ do %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "b³±d fts_read" @@ -933,7 +933,7 @@ msgstr "nie mo msgid "cannot chdir to root directory" msgstr "nie mo¿na przej¶æ do katalogu root" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "nie mo¿na uruchomic polecenia %s" @@ -958,18 +958,29 @@ msgid "" "\n" msgstr "Wypisanie sumy CRC i liczby bajtów ka¿dego PLIKU.\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Sk³adnia: %s [OPCJA]... LEWY_PLIK PRAWY_PLIK\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Sk³adnia: %s [OPCJA]... PLIK1 PLIK2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Porównanie posortowanych plików LEWY_PLIK i PRAWY_PLIK linia po linii.\n" @@ -983,7 +994,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "nie mo¿na otworzyæ %s do czytania" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -994,7 +1005,7 @@ msgstr "nie mo msgid "skipping file %s, as it was replaced while being copied" msgstr "plik %s zosta³ ominiêty, bo zosta³ zmieniony w trakcie kopiowania" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -1005,213 +1016,213 @@ msgstr "nie mo msgid "cannot create regular file %s" msgstr "nie mo¿na utworzyæ zwyk³ego pliku %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "czytanie %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "nie mo¿na wykonaæ lseek na %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "zapis %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "zamykanie %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: zamazanie %s, obej¶æ uprawnienia %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: zamazaæ %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "nie mo¿na wykonaæ stat na %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "katalog %s zosta³ pominiêty" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "uwaga: plik ¼ród³owy %s pojawi³ siê wiêcej ni¿ raz" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s i %s to ten sam plik" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "nie mo¿na zamazaæ nie-katalogu %s katalogiem %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "nie mo¿na zamazaæ w³a¶nie utworzonego %s plikiem %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "nie mo¿na zamazaæ katalogu %s nie-katalogiem" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "nie mo¿na zamazaæ katalogu %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "nie mo¿na przenie¶æ katalogu do nie-katalogu: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "utworzenie kopii zapasowej %s zniszczy³oby ¿ród³o; %s nie zosta³ " "przeniesiony" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "utworzenie kopii zapasowej %s zniszczy³oby ¿ród³o; %s nie zosta³ skopiowany" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "nie mo¿na utworzyæ kopii zapasowej %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (kopia zapasowa: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "nie mo¿na skopiowaæ katalogu %s do siebie samego %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "nie mo¿na utworzyæ dowi±zania zwyk³ego %s do katalogu %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "nie mo¿na utworzyæ dowi±zania zwyk³ego %s do %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "nie mo¿na przenie¶æ %s do w³asnego podkatalogu %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "nie mo¿na przenie¶æ %s do %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "nie uda³o siê przeniesienie miêdzy urz±dzeniami: %s do %s; nie uda³o siê " "usunaæ pliku docelowego" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "nie mo¿na skopiowaæ cyklicznego dowi±zania symbolicznego %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: mo¿na zrobiæ tylko wzglêdne dowi±zanie symboliczne w bie¿±cym katalogu" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nie mo¿na utworzyæ dowi±zania symbolicznego %s do %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "nie mo¿na utworzyæ dowi±zania %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "nie mo¿na utworzyæ potoku %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "nie mo¿na utworzyæ pliku specjalnego %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "nie mo¿na przeczytaæ dowi±zania symbolicznego %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "nie mo¿na utworzyæ dowi±zania symbolicznego %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "nie uda³o siê zachowaæ w³asno¶ci %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s to nieznany typ pliku" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "zachowanie czasu %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "nie uda³o siê znale¼æ pliku %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "nie uda³o siê zachowaæ autorstwa %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "nie mo¿na ustawiæ uprawnieñ do %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "nie mo¿na przywróciæ kopii zapasowej %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (przywrócenie kopii zapasowej)\n" @@ -2363,7 +2374,7 @@ msgstr "" " -x, --exclude-type=TYP pokazanie tylko systemów plików nie tego TYPU\n" " -v (ignorowane)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2512,11 +2523,13 @@ msgstr "" " -D, --dereference-args rozwijanie PLIKÓW - dowi±zañ symbolicznych\n" #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2529,7 +2542,7 @@ msgstr "" " -l, --count-links liczenie rozmiaru wielokrotnie je¿eli plik ma\n" " dowi±zania zwyk³e\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2545,7 +2558,7 @@ msgstr "" " -S, --separate-dirs bez uwzglêdniania rozmiarów podkatalogów\n" " -s, --summarize wypisanie tylko podsumowañ dla ka¿dego argumentu\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2567,11 +2580,11 @@ msgstr "" " poni¿ej podanego jako argument komendy;\n" " --max-depth=0 jest tym samym co -summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "razem" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2579,20 +2592,20 @@ msgstr "" "UWAGA: u¿ywaj --si zamiast -H; znaczenie opcji -H nied³ugo zmieni siê na\n" "odpowiednik opcji --dereference-args (-D)" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "b³êdny maksymalny poziom zag³êbienia %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "nie mo¿na równocze¶nie tylko podsumowaæ i wypisaæ wszystkich danych" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "uwaga: --summarize jest tym samym co --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "uwaga: --summarize nie mo¿e byæ u¿yte razem z --max-depth=%d" @@ -2853,7 +2866,7 @@ msgid "syntax error" msgstr "b³±d sk³adni" # trochê niezrêczne -pk -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2863,11 +2876,11 @@ msgstr "" "pierwszego znaku podstawowego wyra¿enia regularnego nie jest przeno¶ne;\n" "zignorowane" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "argument nieliczbowy" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "dzielenie przez zero" @@ -3396,11 +3409,6 @@ msgstr "" "Mo¿liwe warto¶ci:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Sk³adnia: %s [OPCJA]... PLIK1 PLIK2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4684,7 +4692,7 @@ msgstr "b msgid "invalid line numbering format: %s" msgstr "b³êdny przyrost numeru linii: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4693,27 +4701,31 @@ msgstr "" "Sk³adnia: %s POLECENIE [ARGUMENT]...\n" " albo: %s OPCJA\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "Uruchomienie POLECENIA ignoruj±cego sygna³y HUP.\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "nie uda³o siê otworzyæ %s" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "nie uda³o siê przekierowaæ standardowego wyj¶cia" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "do³±czanie wyników do %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "nie uda³o siê przekierowaæ wyj¶cia standardowego b³êdu" @@ -6029,12 +6041,12 @@ msgstr "" " -w, --equal-width wype³nienie zerami do równej szeroko¶ci\n" #: src/seq.c:96 -#, c-format +#, fuzzy, c-format msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -6407,7 +6419,7 @@ msgstr "" " -S, --buffer-size=ROZM ROZMIAR g³ównego bufora pamiêci\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -6420,11 +6432,11 @@ msgid "" msgstr "" " -t, --field-separator=SEP u¿ycie SEPARATORA zamiast przej¶cia\n" " odstêp - nie-odstêp\n" -" -T, --temporary-directory=KATALOG u¿ycie KATALOGU na pliki tymczasowe, " -"nie\n" -" $TMPDIR ani %s; wiêcej razy to wiêcej " -"katalogów\n" -" -u, --unique z -c: sprawdzenie ¶cis³ego uporz±dkowania\n" +" -T, --temporary-directory=KATALOG u¿ycie KATALOGU na pliki tymczasowe\n" +" zamiast $TMPDIR lub %s; opcja u¿yta wiêcej " +"razy\n" +" definiuje wiêcej katalogów\n" +" -u, --unique z -c: sprawdzenie ¶cis³ego uporz±dkowania;\n" " bez -c: wypisanie tylko pierwszej z " "identycznych\n" " linii\n" @@ -8801,3 +8813,6 @@ msgid "" msgstr "" "Powtarzanie na wyj¶ciu linii ze wszystkimi podanymi £AÑCUCH(AMI) albo `y'\n" "\n" + +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Sk³adnia: %s [OPCJA]... LEWY_PLIK PRAWY_PLIK\n" diff --git a/po/pt.po b/po/pt.po index 84be9aef9d..16214f30d4 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sh-utils 1.12i\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 1996-11-08 20:03+0100\n" "Last-Translator: António João Serras Rendas \n" "Language-Team: Português \n" @@ -151,7 +151,7 @@ msgstr "" msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, fuzzy, c-format msgid "cannot create directory %s" msgstr "não consigo obter a directoria actual" @@ -233,21 +233,21 @@ msgstr "" msgid "cannot convert U+%04X to local character set: %s" msgstr "" -#: lib/userspec.c:148 +#: lib/userspec.c:147 #, fuzzy msgid "invalid user" msgstr "\\%c: caracter de escape inválido" -#: lib/userspec.c:149 +#: lib/userspec.c:148 #, fuzzy msgid "invalid group" msgstr "opção inválida `%s'" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "" -#: lib/userspec.c:153 +#: lib/userspec.c:152 #, fuzzy msgid "cannot omit both user and group" msgstr "não consigo mostrar só o utilizador e só o grupo" @@ -354,15 +354,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "argumento inválido `%s'" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "" @@ -376,7 +376,7 @@ msgstr "" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -412,15 +412,15 @@ msgstr "" " --version mostrar informação de versão e sair\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -437,9 +437,9 @@ msgid "" msgstr "" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -617,17 +617,17 @@ msgstr "modo de %s mudado para %04o (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "modo de %s mantido como %04o (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "não consigo correr %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "não consigo obter a directoria actual" @@ -637,7 +637,7 @@ msgstr "n msgid "changing permissions of %s" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "`%s' não é um ficheiro normal" @@ -830,7 +830,7 @@ msgstr "aviso: n msgid "cannot chdir to root directory" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "não consigo correr %s" @@ -855,17 +855,28 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Utilização: %s [OPÇÃO]... [FICHEIRO]...\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 +msgid "" +"\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" @@ -874,7 +885,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "não consigo mover `%s' para `%s'" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -885,7 +896,7 @@ msgstr "n msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -896,209 +907,209 @@ msgstr "n msgid "cannot create regular file %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "%s: apagar directoria `%s'? " -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "não consigo correr %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "%s: apagar directoria `%s'? " -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "%s: apagar directoria `%s'? " -#: src/copy.c:630 +#: src/copy.c:635 #, fuzzy, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: escrever por cima de `%s', apesar de modo %04o? " -#: src/copy.c:636 +#: src/copy.c:641 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: escrever por cima de `%s'? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "não consigo alterar data" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "`%s' e `%s' são o mesmo ficheiro" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/copy.c:927 +#: src/copy.c:932 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: não posso escrever por cima de directoria com não-directoria" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "não consigo obter a directoria actual" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "fazer \"backup\" de `%s' iria destruir o original; `%s' não copiado" -#: src/copy.c:1032 +#: src/copy.c:1037 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "fazer \"backup\" de `%s' iria destruir o original; `%s' não copiado" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "não consigo correr %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, fuzzy, c-format msgid " (backup: %s)" msgstr "não consigo fazer \"backup\" de `%s'" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "não consigo correr %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: não consigo copiar ligação (link) simbólica cíclica" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: só consigo fazer ligações (links) simbólicas relativas na directoria\n" "actual" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "não consigo ler ligação (link) simbólica `%s'" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "não consigo obter a directoria actual" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "modo de %s mudado para %04o (%s)\n" -#: src/copy.c:1502 +#: src/copy.c:1520 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: tipo de ficheiro desconhecido" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "%s: apagar directoria `%s'? " -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "modo de %s mudado para %04o (%s)\n" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "não consigo correr %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -2120,7 +2131,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2258,15 +2269,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2277,7 +2289,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2290,31 +2302,31 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 #, fuzzy msgid "total" msgstr "%ld\ttotal\n" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "argumento inválido `%s'" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "não consigo resumir e mostrar todas as entradas ao mesmo tempo" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "" @@ -2504,19 +2516,19 @@ msgstr "" msgid "syntax error" msgstr "erro de sintaxe" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "a ignorar argumentos não-opção" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -2996,11 +3008,6 @@ msgstr "" " caso contrário\n" " never, simple fazer \"backups\" simples sempre\n" -#: src/join.c:158 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Utilização: %s [OPÇÃO]... [FICHEIRO]...\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4076,7 +4083,7 @@ msgstr "argumento inteiro inv msgid "invalid line numbering format: %s" msgstr "argumento inteiro inválido `%s'" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4085,28 +4092,32 @@ msgstr "" "Utilização: %s FORMATO [ARGUMENTO]...\n" " ou: %s OPÇÃO\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "%s: apagar directoria `%s'? " -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "canal de saída padrão (stdout)" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "aviso: não consigo mudar para a directoria %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5129,7 +5140,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7429,6 +7440,10 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Utilização: %s [OPÇÃO]... [FICHEIRO]...\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "data inválida `%s'" diff --git a/po/pt_BR.po b/po/pt_BR.po index 730ebb6692..7693d34892 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2003-06-27 19:20-0300\n" "Last-Translator: Juan Carlos Castro y Castro \n" "Language-Team: Brazilian Portuguese \n" @@ -158,7 +158,7 @@ msgid "failed to return to initial working directory" msgstr "" # , c-format -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "não é possível criar o diretório %s" @@ -242,19 +242,19 @@ msgstr "imposs msgid "cannot convert U+%04X to local character set: %s" msgstr "impossível converter U+%04X para o conjunto local de caracteres: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "usuário inválido" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "grupo inválido" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "nao foi possivel obter um grupo e login de um UID numerico " -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "não pode ignorar usuário e grupo" @@ -364,15 +364,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "argumento inválido %s para '%s'" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "" @@ -387,7 +387,7 @@ msgstr "" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -422,15 +422,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -449,9 +449,9 @@ msgstr "" "Comunicar `bugs' para <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -663,18 +663,18 @@ msgstr "falha na troca do modo de %s para %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "modo de %s mantido como %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "impossível acessar %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" # , c-format -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "imposível ler diretório %s" @@ -685,7 +685,7 @@ msgstr "impos msgid "changing permissions of %s" msgstr "mudando permissões de %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "falha na leitura" @@ -914,7 +914,7 @@ msgid "cannot chdir to root directory" msgstr "impossível mudar para o diretório raiz" # , c-format -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "não pode executar a função 'ioctl' sobre `%s'" @@ -943,18 +943,29 @@ msgstr "" "\n" # , c-format -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Uso: %s [OPÇÃO]... ARQUIVO1 ARQUIVO2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Compara os arquivos ordenados ARQUIVO1 e ARQUIVO2, linha a linha.\n" @@ -968,7 +979,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "não foi possível abrir %s para leitura" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -980,7 +991,7 @@ msgid "skipping file %s, as it was replaced while being copied" msgstr "pulando arquivo %s; ele foi substituído durante a cópia" # , c-format -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -993,226 +1004,226 @@ msgid "cannot create regular file %s" msgstr "impossível criar arquivo comum %s" # , c-format -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "lendo %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "impossível fazer lseek em %s" # , c-format -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "escrevendo %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "fechando %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: sobrescrever %s, apesar do modo %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: sobrescrever %s? " # , c-format -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "impossível fazer stat em %s" # , c-format -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "omitindo diretório %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "aviso: arquivo origem %s especificado mais de uma vez" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s são o mesmo arquivo" # , c-format -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "impossível sobrescrever não-diretório %s com diretório %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "não sobrescreverá recém-criado %s com %s" # , c-format -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "impossível sobrescrever diretório %s com não-diretório" # , c-format -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "impossível sobrescrever diretório %s" # , c-format -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "imposível mover diretório para não-diretório: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "fazer cópia de %s iria destruir o original; `%s' não movido" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "fazer backup de %s iria destruir o original; %s não copiado" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "impossível fazer backup de %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" # , c-format -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "impossível copiar um diretório, %s, para si próprio, %s" # , c-format -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "não criará link físico %s para diretório %s" # , c-format -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "impossível criar link físico %s para %s" # , c-format -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "impossível mover %s para um subdiretório de si próprio, %s" # , c-format -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "impossível mover %s para %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "falha ao mover entre dispositivos: %s para %s: impossível remover destino" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "impossível copiar link simbólico cíclico %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: só é possível fazer links simbólicos no diretório corrente" # , c-format -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "impossível criar link simbólico %s para %s" # , c-format -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "impossível criar link %s" # , c-format -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "impossível criar fifo %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "impossível criar arquivo especial %s" # , c-format -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "impossível ler link simbólico %s" # , c-format -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "impossível criar link simbólico %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "impossível preservar proprietário para %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s tem tipo de arquivo desconhecido" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "preservando horário para %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "falha ao preservar horário para %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "impossível preservar autoria para %s" # , c-format -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "definindo permissões para %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "impossível desfazer backup %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (unbackup)\n" @@ -2195,7 +2206,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2334,15 +2345,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2353,7 +2365,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2366,31 +2378,31 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "total" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" # , c-format -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "profundidade máxima inválida %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "não é possível resumir e mostrar todas as entradas ao mesmo tempo" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "alerta: summarizing é o mesmo que usar --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "alerta: summarizing conflita com --max-depth=%d" @@ -2614,7 +2626,7 @@ msgstr "" msgid "syntax error" msgstr "erro de sintaxe" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2623,11 +2635,11 @@ msgstr "" "atenção: BRE não portável: `%s': usando `^' como primeiro caractere\n" " da expressão regular básica (BRE) não é portável; está sendo ignorado" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "argumento não-numérico" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "divisão por zero" @@ -3184,12 +3196,6 @@ msgstr "" " caso contrário\n" " simple,never fazer backups simples sempre\n" -# , c-format -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Uso: %s [OPÇÃO]... ARQUIVO1 ARQUIVO2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4349,7 +4355,7 @@ msgid "invalid line numbering format: %s" msgstr "incremento de linha não válido: `%s'" # , c-format -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4358,28 +4364,32 @@ msgstr "" "Uso: %s [ARQUIVO]...\n" " ou: %s [OPÇÃO]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "falha ao preservar horário para %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "fechando saída padrão" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "mudando grupo de %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5486,7 +5496,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8029,6 +8039,10 @@ msgid "" "\n" msgstr "" +# , c-format +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Uso: %s [OPÇÃO]... ARQUIVO1 ARQUIVO2\n" + # , c-format #, fuzzy #~ msgid "*** invalid date/time ***" diff --git a/po/ru.po b/po/ru.po index 5351c7e7ef..5941235fe3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2003-04-07 08:10+0400\n" "Last-Translator: Oleg S. Tihonov \n" "Language-Team: Russian \n" @@ -153,7 +153,7 @@ msgstr " msgid "failed to return to initial working directory" msgstr "ÎÅ ÕÄÁÌÏÓØ ×ÅÒÎÕÔØÓÑ × ÐÅÒ×ÏÎÁÞÁÌØÎÙÊ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ %s" @@ -234,19 +234,19 @@ msgstr " msgid "cannot convert U+%04X to local character set: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ U+%04X Ë ÌÏËÁÌØÎÏÊ ËÏÄÉÒÏ×ËÅ: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "ÎÅ×ÅÒÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "ÎÅ×ÅÒÎÁÑ ÇÒÕÐÐÁ" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÚÎÁÔØ ÇÌÁ×ÎÕÀ ÇÒÕÐÐÕ ÄÌÑ ÞÉÓÌÏ×ÏÇÏ UID" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÐÕÓÔÉÔØ É ÐÏÌØÚÏ×ÁÔÅÌÑ, É ÇÒÕÐÐÕ" @@ -355,15 +355,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ `%s'" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "ÓÒÁ×ÎÅÎÉÅ ÓÔÒÏË ÎÅÕÓÐÅÛÎÏ" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "þÔÏÂÙ ÏÂÏÊÔÉ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÕÓÔÁÎÏ×ÉÔÅ LC_ALL='C'." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "óÒÁ×ÎÉ×ÁÌÉÓØ ÓÔÒÏËÉ %s %s." @@ -377,7 +377,7 @@ msgstr " #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -411,15 +411,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -438,9 +438,9 @@ msgstr "" "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -654,17 +654,17 @@ msgstr " msgid "mode of %s retained as %04lo (%s)\n" msgstr "ÐÒÁ×Á ÄÏÓÔÕÐÁ %s ÏÓÔÁ×ÌÅÎÙ ËÁË %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÞÉÔÁÔØ ËÁÔÁÌÏÇ %s" @@ -674,7 +674,7 @@ msgstr " msgid "changing permissions of %s" msgstr "ÉÚÍÅÎÅÎÉÅ ÐÒÁ× ÄÏÓÔÕÐÁ ÄÌÑ %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "ÞÔÅÎÉÅ ÎÅÕÓÐÅÛÎÏ" @@ -896,7 +896,7 @@ msgstr " msgid "cannot chdir to root directory" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÍÕ ËÁÔÁÌÏÇÕ" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÓÓÙÌËÕ %s" @@ -923,18 +923,29 @@ msgstr "" "ðÅÞÁÔÁÅÔ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ (CRC) É ÞÉÓÌÏ ÂÁÊÔ ÄÌÑ ËÁÖÄÏÇÏ æáêìá.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... ìå÷ùê_æáêì ðòá÷ùê_æáêì\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì1 æáêì2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "ðÏÓÔÒÏÞÎÏ ÓÒÁ×ÎÉ×ÁÅÔ ÓÏÒÔÉÒÏ×ÁÎÎÙÅ ÆÁÊÌÙ ìå÷ùê_æáêì É ðòá÷ùê_æáêì.\n" @@ -948,7 +959,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -959,7 +970,7 @@ msgstr " msgid "skipping file %s, as it was replaced while being copied" msgstr "ÐÒÏÐÕÓËÁÀ ÆÁÊÌ %s, ÔÁË ËÁË ÏÎ ÂÙÌ ÚÁÍÅÎÅÎ ×Ï ×ÒÅÍÑ ËÏÐÉÒÏ×ÁÎÉÑ" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -970,213 +981,213 @@ msgstr " msgid "cannot create regular file %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÏÂÙÞÎÙÊ ÆÁÊÌ %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "ÞÔÅÎÉÅ %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ lseek ÄÌÑ %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "ÚÁÐÉÓØ %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "ÚÁËÒÙÔÉÅ %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: ÐÅÒÅÐÉÓÁÔØ %s, ÎÅÓÍÏÔÒÑ ÎÁ ÐÒÁ×Á ÄÏÓÔÕÐÁ %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: ÐÅÒÅÐÉÓÁÔØ %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ stat ÄÌÑ %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "ÐÒÏÐÕÓË ËÁÔÁÌÏÇÁ %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "×ÎÉÍÁÎÉÅ: ×ÈÏÄÎÏÊ ÆÁÊÌ %s ÕËÁÚÁÎ ÂÏÌÅÅ ÏÄÎÏÇÏ ÒÁÚÁ" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s É %s - ÏÄÉÎ É ÔÏÔ ÖÅ ÆÁÊÌ" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÐÉÓÁÔØ ÐÏ×ÅÒÈ ÆÁÊÌÁ %s, ÎÅ Ñ×ÌÑÀÝÅÇÏÓÑ ËÁÔÁÌÏÇÏÍ, ËÁÔÁÌÏÇ %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ÎÅ ÐÅÒÅÐÉÓÙ×ÁÀ ÔÏÌØËÏ ÞÔÏ ÓÏÚÄÁÎÎÙÊ %s %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÐÉÓÁÔØ ËÁÔÁÌÏÇ %s ÆÁÊÌÏÍ, ÎÅ Ñ×ÌÑÀÝÉÍÓÑ ËÁÔÁÌÏÇÏÍ" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÐÉÓÁÔØ ËÁÔÁÌÏÇ %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ ËÁÔÁÌÏÇ × ÆÁÊÌ, ÎÅ Ñ×ÌÑÀÝÉÊÓÑ ËÁÔÁÌÏÇÏÍ: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "ÓÏÈÒÁÎÅÎÉÅ ÚÁÐÁÓÎÏÊ ËÏÐÉÉ %s ÕÎÉÞÔÏÖÉÔ ÏÒÉÇÉÎÁÌ; %s ÎÅ ÐÅÒÅÎÅÓÅÎ" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "ÓÏÈÒÁÎÅÎÉÅ ÚÁÐÁÓÎÏÊ ËÏÐÉÉ %s ÕÎÉÞÔÏÖÉÔ ÏÒÉÇÉÎÁÌ; %s ÎÅ ÓËÏÐÉÒÏ×ÁÎ" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÒÅÚÅÒ×ÎÕÀ ËÏÐÉÀ ÄÌÑ %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (ÒÅÚÅÒ×ÎÁÑ ËÏÐÉÑ: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ ËÁÔÁÌÏÇ, %s, × ÓÁÍÏÇÏ ÓÅÂÑ, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ÖÅÓÔËÁÑ ÓÓÙÌËÁ %s ÎÁ ËÁÔÁÌÏÇ %s ÎÅ ÂÕÄÅÔ ÓÏÚÄÁÎÁ" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÖÅÓÔËÕÀ ÓÓÙÌËÕ %s ÎÁ %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÎÅÓÔÉ %s × Ó×ÏÊ ÓÏÂÓÔ×ÅÎÎÙÊ ÐÏÄËÁÔÁÌÏÇ, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÅÓÔÉÔØ %s × %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "ÐÅÒÅÍÅÝÅÎÉÅ Ó ÕÓÔÒÏÊÓÔ×Á %s ÎÁ ÕÓÔÒÏÊÓÔ×Ï %s ÎÅÕÓÐÅÛÎÏ: ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ " "ÃÅÌÅ×ÏÅ" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ ÃÉËÌÉÞÅÓËÕÀ ÓÉÍ×ÏÌØÎÕÀ ÓÓÙÌËÕ %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: ×ÏÚÍÏÖÎÏ ÓÏÚÄÁ×ÁÔØ ÏÔÎÏÓÉÔÅÌØÎÙÅ ÓÉÍ×ÏÌÉÞÅÓËÉÅ ÓÓÙÌËÉ ÔÏÌØËÏ × ÔÅËÕÝÅÍ " "ËÁÔÁÌÏÇÅ" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÉÍ×ÏÌØÎÕÀ ÓÓÙÌËÕ %s ÎÁ %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÓÙÌËÕ %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÏÞÅÒÅÄØ %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÐÅÃÉÁÌØÎÙÊ ÆÁÊÌ %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÞÉÔÁÔØ ÓÉÍÓÉÍ×ÏÌØÎÕÀ ÓÓÙÌËÕ %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÉÍ×ÏÌØÎÕÀ ÓÓÙÌËÕ %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "ÎÅ ÕÄÁÌÏÓØ ÓÏÈÒÁÎÉÔØ ×ÌÁÄÅÌØÃÁ %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "ÔÉÐ ÆÁÊÌÁ %s ÎÅÉÚ×ÅÓÔÅÎ" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "ÓÏÈÒÁÎÅÎÉÅ ×ÒÅÍÅÎÎÏÊ ÏÔÍÅÔËÉ %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "ÎÅ ÕÄÁÌÏÓØ ÓÏÈÒÁÎÉÔØ ×ÒÅÍÅÎÎÙÅ ÍÅÔËÉ ÄÌÑ %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "ÎÅ ÕÄÁÌÏÓØ ÓÏÈÒÁÎÉÔØ Á×ÔÏÒÁ %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "ÕÓÔÁÎÏ×ËÁ ÐÒÁ× ÄÏÓÔÕÐÁ ÄÌÑ %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÏÓÓÔÁÎÏ×ÉÔØ %s ÉÚ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ)\n" @@ -2335,7 +2346,7 @@ msgstr "" " -x, --exclude-type=TYPE limit listing to filesystems not of type TYPE\n" " -v (ignored)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 #, fuzzy msgid "" "\n" @@ -2487,10 +2498,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2500,7 +2512,7 @@ msgstr "" " -k, --kilobytes ÉÓÐÏÌØÚÏ×ÁÔØ ÒÁÚÍÅÒ ÂÌÏËÁ 1024 ×ÍÅÓÔÏ 512\n" " -l, --count-links ÓÞÉÔÁÔØ ËÁÖÄÕÀ ÖÅÓÔËÕÀ ÓÓÙÌËÕ ËÁË ÏÔÄÅÌØÎÙÊ ÆÁÊÌ\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2515,7 +2527,7 @@ msgstr "" " -S, --separate-dirs ÎÅ ×ËÌÀÞÁÔØ ÒÁÚÍÅÒ ËÁÔÁÌÏÇÏ×\n" " -s, --summarize ÐÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ ÉÔÏÇ ÄÌÑ ËÁÖÄÏÇÏ ÁÒÇÕÍÅÎÔÁ\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2536,30 +2548,30 @@ msgstr "" " ÞÅÍ ÐÁÒÁÍÅÔÒ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ; --max-depth=0\n" " ÜÔÏ ÔÏ ÖÅ ÓÁÍÏÅ, ÞÔÏ É --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "ÉÔÏÇÏ" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÍÁËÓÉÍÁÌØÎÁÑ ÇÌÕÂÉÎÁ %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÐÏÄ×ÏÄÉÔØ ÉÔÏÇ É ÐÏËÁÚÙ×ÁÔØ ×ÓÅ ÜÌÅÍÅÎÔÙ" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÏÄ×ÅÄÅÎÉÅ ÉÔÏÇÁ ÜÔÏ ÔÏ ÖÅ ÓÁÍÏÅ, ÞÔÏ É --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÏÄ×ÅÄÅÎÉÅ ÉÔÏÇÁ ËÏÎÆÌÉËÔÕÅÔ Ó --max-depth=%d" @@ -2821,7 +2833,7 @@ msgstr "" msgid "syntax error" msgstr "ÓÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2832,11 +2844,11 @@ msgstr "" "ÂÕÄÅÔ\n" "ÉÇÎÏÒÉÒÏ×ÁÎ" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "ÎÅÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ" @@ -3357,11 +3369,6 @@ msgstr "" "ÏËÒÕÖÅÎÉÑ VERSION_CONTROL. äÏÐÕÓÔÉÍÙÅ ÚÎÁÞÅÎÉÑ:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì1 æáêì2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4624,7 +4631,7 @@ msgstr " msgid "invalid line numbering format: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÉÒÁÝÅÎÉÅ ÎÏÍÅÒÁ ÓÔÒÏËÉ: `%s'" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4633,28 +4640,32 @@ msgstr "" "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s æïòíáô [áòçõíåîô]...\n" " ÉÌÉ: %s ëìàþ\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "ÎÅ ÕÄÁÌÏÓØ ÓÏÈÒÁÎÉÔØ ×ÒÅÍÅÎÎÙÅ ÍÅÔËÉ ÄÌÑ %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "ÚÁËÒÙÔÉÅ ÓÔÁÎÄÁÒÔÎÏÇÏ ×Ù×ÏÄÁ" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "ÉÚÍÅÎÅÎÉÅ ÇÒÕÐÐÙ ÄÌÑ %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5980,7 +5991,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8801,6 +8812,9 @@ msgstr "" "`y'.\n" "\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... ìå÷ùê_æáêì ðòá÷ùê_æáêì\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** ÎÅÐÒÁ×ÉÌØÎÁÑ ÄÁÔÁ/×ÒÅÍÑ ***" diff --git a/po/sk.po b/po/sk.po index cc81ae5bda..54437039bb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: textutils 2.0.14\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2001-06-08 22:10 +02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -154,7 +154,7 @@ msgstr "ve msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "nie je mo¾né vytvori» adresár %s" @@ -238,19 +238,19 @@ msgstr "nie je mo msgid "cannot convert U+%04X to local character set: %s" msgstr "nie je mo¾né konvertova» U+%04X do lokálnej znakovej sady" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "neplatný pou¾ívateµ" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "neplatná skupina" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "nie je mo¾né urèi» skupinu èíselného UID" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "nie je mo¾né vynecha» pou¾ívateµa aj skupinu" @@ -359,15 +359,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "chybný argument %s pre `%s'" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "" @@ -381,7 +381,7 @@ msgstr "" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -418,15 +418,15 @@ msgstr "" " --version vypísa» informáciu o verzii a skonèi»\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -447,9 +447,9 @@ msgstr "" "(slovensky)." #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -669,17 +669,17 @@ msgstr "zmena pr msgid "mode of %s retained as %04lo (%s)\n" msgstr "práva súboru %s zostali %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, fuzzy, c-format msgid "cannot access %s" msgstr "nie je mo¾né spusti» %s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "nie je mo¾né vytvori» adresár %s" @@ -689,7 +689,7 @@ msgstr "nie je mo msgid "changing permissions of %s" msgstr "nie je mo¾né zmeni» práva %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "zlyhalo èítanie" @@ -890,7 +890,7 @@ msgstr "nie je mo msgid "cannot chdir to root directory" msgstr "nie je mo¾né vojs» do adresára, %s" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "ioctl na `%s' nie je mo¾né vykona»" @@ -915,18 +915,29 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Pou¾itie: %s [PREPÍNAÈ]... ¥AVÝ_SÚBOR PRAVÝ_SÚBOR\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Pou¾itie: %s [PREPÍNAÈ]... SÚBOR1 SÚBOR2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" " Porovnáva súbory ¥AVÝ_SÚBOR a PRAVÝ_SÚBOR, ktorých riadky sú usporiadané\n" @@ -946,7 +957,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "nie je mo¾né otvori» %s pre èítanie" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, fuzzy, c-format msgid "cannot fstat %s" @@ -957,7 +968,7 @@ msgstr "nie je mo msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -968,208 +979,208 @@ msgstr "nie je mo msgid "cannot create regular file %s" msgstr "nie je mo¾né vytvori» doèasný súbor" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "chyba pri èítaní %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "nie je mo¾né spusti» %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "chyba pri zápise %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "uzatváranie %s (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: prepísa» %s bez ohµadu na práva %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: prepísa» %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s a %s predstavujú ten istý súbor" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "nie je mo¾né vojs» do adresára, %s" -#: src/copy.c:927 +#: src/copy.c:932 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "nie je mo¾né prepísa» ne-adresár %s adresárom %s" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "nie je mo¾né vojs» do adresára, %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "vytvorenie zálo¾nej kópie %s by znièilo zdroj; %s nebol presunutý" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "vytvorenie zálo¾nej kópie %s by znièilo zdroj; %s nebol skopírovaný" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, fuzzy, c-format msgid "cannot backup %s" msgstr "nie je mo¾né spusti» %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr "(záloha: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "nie je mo¾né vojs» do adresára, %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "nie je mo¾né vojs» do adresára, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "ioctl na `%s' nie je mo¾né vykona»" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "nie je mo¾né skopírova» zacyklený symbolický odkaz %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: relatívne symbolické odkazy je mo¾né vytvori» iba v aktuálnom adresári" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "pozícia znaku je nula" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "ioctl na `%s' nie je mo¾né vykona»" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "nie je mo¾né vytvori» adresár %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "zachovávam vlastníctvo %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s je neznámy typ souboru" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "zachovávam èasy %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "zachovávam èasy %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "zachovávam vlastníctvo %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "nie je mo¾né zmeni» práva %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "nie je mo¾né spusti» %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (obnovenie zálohy)\n" @@ -2181,7 +2192,7 @@ msgid "" " -v (ignored)\n" msgstr "" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2317,15 +2328,16 @@ msgstr "" #: src/du.c:186 msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2336,7 +2348,7 @@ msgid "" " -s, --summarize display only a total for each argument\n" msgstr "" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2349,30 +2361,30 @@ msgid "" " --summarize\n" msgstr "" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "celkom" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "chybné èíslo polo¾ky: `%s'" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "nie je mo¾né súèasne sumarizova» a vypisova» v¹etky polo¾ky" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "varovanie: sumarizácia je to isté ako --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "varovanie: sumarizácia je v konflikte s --max-depth=%d" @@ -2571,7 +2583,7 @@ msgstr "" msgid "syntax error" msgstr "¹tandardná chyba" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2580,12 +2592,12 @@ msgstr "" "varovanie: neprenositeµný BRE (základný regulérny výraz): `%s': pou¾itie\n" "znaku `^' na zaèiatku nie je prenositeµné a je ignorovaný" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "argument orezaný" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3120,11 +3132,6 @@ msgstr "" " existujú, inak tvori» jednoduché\n" " simple, never v¾dy tvori» jednoduché zálo¾né kópie súborov \n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Pou¾itie: %s [PREPÍNAÈ]... SÚBOR1 SÚBOR2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4243,7 +4250,7 @@ msgstr "chybn msgid "invalid line numbering format: %s" msgstr "chybná hodnota prírastku èísla riadku: `%s'" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4252,28 +4259,32 @@ msgstr "" "Pou¾itie: %s [SÚBOR]...\n" " alebo: %s [VO¥BA]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "zachovávam èasy %s" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "¹tandardný výstup" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "nie je mo¾né zmeni» pou¾ívateµa a/alebo skupinu %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5364,7 +5375,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7857,6 +7868,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Pou¾itie: %s [PREPÍNAÈ]... ¥AVÝ_SÚBOR PRAVÝ_SÚBOR\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "chybné èíslo polo¾ky: `%s'" diff --git a/po/sl.po b/po/sl.po index acb6406add..0d0c300c27 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,13 +1,13 @@ # -*- mode: po; -*- Slovenian message catalog for GNU coreutils. # Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # Primo¾ Peterlin , 1996, 1999, 2000, 2001, 2002, 2003. -# $Id: sl.po,v 1.112 2004/02/18 17:50:02 meyering Exp $ +# $Id: sl.po,v 1.116 2004/03/12 13:59:40 meyering Exp $ # msgid "" msgstr "" "Project-Id-Version: GNU coreutils 4.5.10\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2003-03-14 12:43+0100\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -154,7 +154,7 @@ msgstr "velikost bloka" msgid "failed to return to initial working directory" msgstr "vrnitev v zaèetni delovni imenik neuspe¹na" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "imenika %s ni mogoèe ustvariti" @@ -237,19 +237,19 @@ msgstr "znaka s kodo U+%04X ni mogo msgid "cannot convert U+%04X to local character set: %s" msgstr "znaka s kodo U+%04X ni moè pretvoriti v lokalni nabor znakov: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "neveljavno uporabni¹ko ime" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "neveljavno ime skupine" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "imena skupine, ki pripada ¹tevilènemu UID, ni mogoèe ugotoviti" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "ni mogoèe obenem izpustiti uporabnika in skupine" @@ -358,15 +358,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "neveljaven argument ,%s`" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "primerjanje nizov ni uspelo" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Nastavite LC_ALL='C', da bi odpravili te¾avo." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Primerjana niza sta bila %s in %s." @@ -380,7 +380,7 @@ msgstr "Primerjana niza sta bila %s in %s." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -413,15 +413,15 @@ msgstr "" "izpi¹emo ime datoteke brez pripone.\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -440,9 +440,9 @@ msgstr "" "Poroèila o napakah javite na <%s>.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -657,17 +657,17 @@ msgstr "poskus spremembe za msgid "mode of %s retained as %04lo (%s)\n" msgstr "za¹èita datoteke %s ohranjena kot %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "dostop do %s ni mogoè" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "imenika %s ni mogoèe prebrati" @@ -677,7 +677,7 @@ msgstr "imenika %s ni mogo msgid "changing permissions of %s" msgstr "spreminjamo dovoljenja %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "branje ni uspelo" @@ -898,7 +898,7 @@ msgstr "korenskega imenika ni mo msgid "cannot chdir to root directory" msgstr "korenski imenik ni dosegljiv s chdir" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "s klicem unlink ni mogoèe odstraniti %s" @@ -925,18 +925,29 @@ msgstr "" "Izpi¹emo nadzorno vsoto in dol¾ino v bajtih za vsako DATOTEKO.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Uporaba: %s [IZBIRA]... LEVA DESNA\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Uporaba: %s [IZBIRA]... DATOTEKA1 DATOTEKA2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Urejeni datoteki LEVA in DESNA primerjamo vrstico za vrstico.\n" @@ -950,7 +961,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "datotek %s ni mogoèe odpreti za branje" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -961,7 +972,7 @@ msgstr "statusa %s ni mo msgid "skipping file %s, as it was replaced while being copied" msgstr "datoteko %s izpustimo, ker je bila med prepisom zamenjana" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -972,208 +983,208 @@ msgstr "ni mogo msgid "cannot create regular file %s" msgstr "ni mogoèe ustvariti navadne datoteke %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "beremo %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "premikanje z lseek po %s ni mogoèe" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "zapisujemo %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "zapiramo %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: naj pi¹emo prek %s navzlic za¹èiti %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: naj pi¹emo prek %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "statusa %s ni moè ugotoviti s stat" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "izpu¹èamo imenik %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "opozorilo: izvorna datoteka %s je podana veè kot enkrat" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s in %s sta ena in ista datoteka" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "prek ne-imenika %s ne moremo pisati imenika %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "prek pravkar ustvarjene datoteke %s ne moremo zapisati %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "prek imenika %s ne moremo zapisati ne-imenika" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "ni mogoèe pisati prek imenika %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "imenika ne moremo premakniti v ne-imenik: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "varnostna kopija %s bi unièila izvirnik; %s ni premaknjen" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "varnostna kopija %s bi unièila izvirnik; %s ni prepisan" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "ni mogoèe izdelati varnostne kopije %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (varnostna kopija: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "imenika %s se ne da prepisati vase, v %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ni mogoèe ustvariti trde povezave %s na imenik %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "ni mogoèe ustvariti trde povezave %s na %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "imenika %s se ne da premakniti v %s, ki je podimenik prvega" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "ni mogoèe premakniti %s v %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "premik med enotami ni uspel: %s v %s; cilja ni moè odstraniti" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ni mogoèe prepisati cikliène simbolne povezave %s" # ! INEXACT -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: relativne simbolne povezave so mogoèe samo znotraj imenika" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ni mogoèe ustvariti simbolne povezave %s na %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "ni mogoèe ustvariti povezave %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "ni mogoèe ustvariti FIFO %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "ni mogoèe ustvariti posebne datoteke %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "ni mogoèe prebrati simbolne povezave %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "ni mogoèe ustvariti simbolne povezave %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "lastni¹tvo za %s ni bilo ohranjeno" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s ima neznan tip datoteke" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "ohranjeni èasi za %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "èasi za %s niso bili ohranjeni" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "avtorstvo datoteke %s ni bilo ohranjeno" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "nastavljena dovoljenja za %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "ni mogoèe odstraniti varnostne kopije %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (brez varnostne kopije)\n" @@ -2327,7 +2338,7 @@ msgstr "" " -x, --exclude-type=TIP brez datoteènih sistemov tipa TIP\n" " -v (ignorirano)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 #, fuzzy msgid "" "\n" @@ -2480,10 +2491,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2493,7 +2505,7 @@ msgstr "" " -k isto kot --block-size=1024\n" " -l, --count-links trde povezeva ¹tejemo po veèkrat\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2509,7 +2521,7 @@ msgstr "" " -S, --separate-dirs brez velikosti podimenikov\n" " -s, --summarize za vsak argument samo povzetek\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2530,30 +2542,30 @@ msgstr "" " izbiri --all), ki so N ali manj ravni pod trenutnim\n" " imenikom; --max-depth=0 je isto kot --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "skupno" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "neveljavna najveèja globina %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "mo¾nosti se izkljuèujeta - ali izpis vseh, ali povzetek" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "opozorilo: povzetek je isto kot izbira --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "opozorilo: povzetek se izkljuèuje z --max-depth=%d" @@ -2809,7 +2821,7 @@ msgstr "" msgid "syntax error" msgstr "napaka v skladnji" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2818,11 +2830,11 @@ msgstr "" "opozorilo: neprenosljiv osnovni regularni izraz: ,%s` : uporaba ,^` kot\n" "prvega znaka v osnovnem regularnem izrazu ni prenosljiva, ignorirano" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "ne-¹tevilèni argument" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "deljenje z niè" @@ -3331,11 +3343,6 @@ msgstr "" "kopij lahko nastavimo z izbiro --backup ali spremenljivko\n" "VERSION_CONTROL. Mo¾nosti so:\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Uporaba: %s [IZBIRA]... DATOTEKA1 DATOTEKA2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4616,7 +4623,7 @@ msgstr "neveljavna msgid "invalid line numbering format: %s" msgstr "neveljaven vrstièni inkrement: ,%s`" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4625,28 +4632,32 @@ msgstr "" "Uporaba: %s OBLIKA [ARGUMENT]...\n" " ali: %s IZBIRA\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "èasi za %s niso bili ohranjeni" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "zapiramo standardni izhod" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "spreminjamo skupino %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5940,7 +5951,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8707,6 +8718,9 @@ msgstr "" "Ponavljaje izpisujemo vrstico s podanim NIZOM (privzeto ,y`).\n" "\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Uporaba: %s [IZBIRA]... LEVA DESNA\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** neveljavni datum/èas ***" diff --git a/po/sv.po b/po/sv.po index 0ebabdf6f9..44f7c2f945 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,14 +4,14 @@ # Thomas Olsson , 1997. # Daniel Resare 1999, 2000. # Göran Uddeborg , 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004. -# $Revision: 1.118 $ +# $Revision: 1.123 $ # msgid "" msgstr "" -"Project-Id-Version: coreutils 5.1.1\n" +"Project-Id-Version: coreutils 5.2.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" -"PO-Revision-Date: 2004-01-19 18:10+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" +"PO-Revision-Date: 2004-02-21 10:42+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -155,7 +155,7 @@ msgstr "blockstorlek" msgid "failed to return to initial working directory" msgstr "kunde inte återvända till den ursprungliga arbetskatalogen" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "kan inte skapa katalog %s" @@ -236,19 +236,19 @@ msgstr "kan inte konvertera U+%04X till lokal teckenupps msgid "cannot convert U+%04X to local character set: %s" msgstr "kan inte konvertera U+%04X till lokal teckenuppsättning: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "ogiltig användare" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "ogiltig grupp" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "kan inte ta reda på inloggningsgruppen för ett numeriskt UID" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "kan inte utelämna både användare och grupp" @@ -374,15 +374,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "felaktigt argument: %s" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "strängjämförelse misslyckades" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Sätt LC_ALL='C' för att gå runt problemet." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "De jämförda strängarna var %s och %s." @@ -396,7 +396,7 @@ msgstr "De j #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -431,15 +431,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -459,9 +459,9 @@ msgstr "" "Rapportera kommentarer om översättningen till .\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -680,19 +680,19 @@ msgstr "kunde inte msgid "mode of %s retained as %04lo (%s)\n" msgstr "rättigheterna hos %s är oförändrat %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "kan inte komma åt %s" # Jag har påpekat att det inte är så stor mening att markera detta för # översättning. -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "%s" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "kan inte läsa katalog %s" @@ -702,7 +702,7 @@ msgstr "kan inte l msgid "changing permissions of %s" msgstr "ändrar rättigheter på %s" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 msgid "fts_read failed" msgstr "fts_read misslyckades" @@ -924,7 +924,7 @@ msgstr "kan inte msgid "cannot chdir to root directory" msgstr "kan inte byta katalog till rotkatalog" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "kan inte köra kommando %s" @@ -952,18 +952,29 @@ msgstr "" "Skriv CRC-kontrollsumma och byteantal för varje FIL.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Användning: %s [FLAGGA]... VÄNSTER_FIL HÖGER_FIL\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Användning: %s [FLAGGA]... FIL1 FIL2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Jämför de sorterade filerna VÄNSTER_FIL och HÖGER_FIL rad för rad.\n" @@ -977,7 +988,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "kan inte öppna %s för läsning" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -988,7 +999,7 @@ msgstr "kan inte g msgid "skipping file %s, as it was replaced while being copied" msgstr "hoppar över fil %s eftersom den byttes ut medan den kopierades" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -999,207 +1010,207 @@ msgstr "kan inte ta bort %s" msgid "cannot create regular file %s" msgstr "kan inte skapa normal fil %s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "läser %s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "kan inte göra lseek i %s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "skriver %s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "stänger %s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: skriva över %s och därmed åsidosätta rättigheterna %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: skriva över %s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "kan inte ta status på %s" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "utesluter katalog %s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "varning: källfil %s angiven mer än en gång" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s och %s är samma fil" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan inte skriva över icke-katalog %s med katalog %s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "kommer inte skriva över nyligen skapade %s med %s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan inte skriva över katalog %s med icke-katalog" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "kan inte skriva över katalog %s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan inte flytta katalog på icke-katalog: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "säkerhetskopiering av %s skulle förstöra källan; %s inte flyttad" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "säkerhetskopiering av %s skulle förstöra källan; %s inte kopierad" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "kan inte göra säkerhetskopia %s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr "(säkerhetskopia: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kan inte kopiera en katalog, %s, på sig själv, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "kommer inte skapa hård länk %s till katalog %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "kan inte skapa hård länk %s till %s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "kan inte flytta %s till en underkatalog till sig själv, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "kan inte flytta %s till %s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "flytt mellan enheter misslyckades: %s till %s; kan inte ta bort målet" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kan inte kopiera cyklisk symbolisk länk %s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: kan bara skapa relativa symboliska länkar i aktuell katalog" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan inte skapa symbolisk länk %s till %s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "kan inte skapa länk %s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "kan inte skapa fifo %s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "kan inte skapa specialfil %s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "kan inte läsa symbolisk länk %s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "kan inte skapa symbolisk länk %s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "misslyckades att bevara ägare av %s" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s har okänd filtyp" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "bevarar tider på %s" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "misslyckades att hitta filen %s" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "misslyckades att bevara författarskap för %s" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "sätter rättigheter på %s" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "kan inte avsäkerhetskopiera %s" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (återta säkerhetskopia)\n" @@ -2030,9 +2041,9 @@ msgid "cannot set date" msgstr "kan inte ställa klockan" #: src/date.c:529 -#, fuzzy, c-format +#, c-format msgid "time %s is out of range" -msgstr "filposition utanför intervallet" +msgstr "tiden %s är utanför tillåtet intervall" #: src/dd.c:287 src/tty.c:68 src/uname.c:109 src/whoami.c:53 #, c-format @@ -2329,7 +2340,7 @@ msgstr "" " -x, --exclude-type=TYP utelämna filsystem av typ TYP\n" " -v (ignorerad)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2475,11 +2486,13 @@ msgstr "" " -D, --dereference-args följ FILer som är symboliska länkar\n" #: src/du.c:186 +#, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2489,7 +2502,7 @@ msgstr "" " -k som --block-size=1K\n" " -l, --count-links räkna storlek flera gånger för hårda länkar\n" -#: src/du.c:192 +#: src/du.c:194 msgid "" " -L, --dereference dereference all symbolic links\n" " -P, --no-dereference don't follow any symbolic links (this is the " @@ -2506,7 +2519,7 @@ msgstr "" " -S, --separate-dirs ta inte med storlek på underkataloger\n" " -s, --summarize visa bara summan för varje argument\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2527,11 +2540,11 @@ msgstr "" "som\n" " --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "totalt" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" @@ -2539,20 +2552,20 @@ msgstr "" "VARNING: använd --si, inte -H. Betydelsen av -H kommer snart ändras\n" "till att bli samma som den för --dereference-args (-D)" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "ogiltigt maxdjup %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "kan inte samtidigt bara visa summan och alla storlekar" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "varning: att summera är detsamma som att använda --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "varning: att summera står i konflikt med --max-depth=%d" @@ -2806,7 +2819,7 @@ msgstr "" msgid "syntax error" msgstr "syntaxfel" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2816,11 +2829,11 @@ msgstr "" "ett\n" "grundläggande reguljärt uttryck är inte portabelt; det ignoreras" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "ickenumeriskt argument" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "division med noll" @@ -3342,11 +3355,6 @@ msgstr "" "med miljövariabeln VERSION_CONTROL. Den kan ha följande värden:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Användning: %s [FLAGGA]... FIL1 FIL2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4593,7 +4601,7 @@ msgstr "felaktig bredd p msgid "invalid line numbering format: %s" msgstr "felaktigt format på radnummer: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4602,7 +4610,7 @@ msgstr "" "Användning: %s KOMMANDO [ARGUMENT]...\n" " eller: %s FLAGGA\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -4610,21 +4618,25 @@ msgstr "" "Kör KOMMANDO, ignorera avringningssignaler.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "misslyckades att öppna %s" -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "misslyckades att omdirigera standard ut" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "lägger till utdata till %s" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "misslyckades att omdirigera standard fel" @@ -5909,18 +5921,20 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" "the printf-style, floating point output formats %e, %f, %g\n" msgstr "" "\n" -"Om FÖRSTA eller ÖKNING utelämnas, sätts de till 1. FÖRSTA, ÖKNING och\n" -"SISTA tolkas som flyttal. ÖKNING ska vara positivt om FÖRSTA är\n" -"mindre än SISTA och negativt annars. När argumentet FORMAT anges\n" -"måste det innehålla precis en av flyttalsformattyperna %e, %f, %g\n" -"(samma som i printf).\n" +"Om FÖRSTA eller ÖKNING utelämnas, sätts de till 1. Det vill säga, en\n" +"utelämnad ÖKNING sätts till 1 även när SISTA är mindre än FÖRSTA.\n" +"FÖRSTA, ÖKNING och SISTA tolkas som flyttal. ÖKNING är normalt\n" +"positivt om FÖRSTA är mindre än SISTA och ÖKNING är normalt negativt\n" +"om FÖRSTA är större än SISTA. När argumentet FORMAT anges måste det\n" +"innehålla precis en av flyttalsformattyperna %e, %f, %g (samma som i\n" +"printf).\n" #: src/seq.c:121 #, c-format @@ -6268,7 +6282,7 @@ msgstr "" " -S, --buffer-size=STORLEK använd STORLEK för huvudminnesbuffer\n" #: src/sort.c:312 -#, fuzzy, c-format +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -6283,9 +6297,10 @@ msgstr "" " till blanka\n" " -T, --temporary-directory=KAT använd KAT för tillfälliga filer, ej " "$TMPDIR\n" -" eller %s\n" -" -u, --unique med -c: kontrollera strikt ordningsföljd\n" -" annars: skriv ut endast den första av flera " +" eller %s;\n" +" flera argument anger flera kataloger\n" +" -u, --unique med -c, kontrollera strikt ordningsföljd;\n" +" utan -c, skriv ut endast den första av flera " "lika\n" #: src/sort.c:319 @@ -8390,7 +8405,7 @@ msgstr "pm" #: src/uptime.c:142 #, c-format msgid " ??:???? up " -msgstr "" +msgstr " ??:???? igång " #: src/uptime.c:144 #, c-format @@ -8646,5 +8661,5 @@ msgstr "" "Skriv gång på gång en rad med alla specifierade STRÄNG(ar), eller \"y\"\n" "\n" -#~ msgid "*** invalid date/time ***" -#~ msgstr "*** ogiltigt datum/tid ***" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Användning: %s [FLAGGA]... VÄNSTER_FIL HÖGER_FIL\n" diff --git a/po/tr.po b/po/tr.po index 0500b959d9..ca6322bc5b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0.90\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2003-08-17 15:06+0300\n" "Last-Translator: Deniz Akkus Kanca \n" "Language-Team: Turkish \n" @@ -162,7 +162,7 @@ msgstr "blok uzunluğu" msgid "failed to return to initial working directory" msgstr "başlangıç çalışma dizinine geri dönülemedi" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "%s dizini oluşturulamıyor" @@ -244,20 +244,20 @@ msgstr "U+%04X yerel karakter kümesine dönüştürülemiyor" msgid "cannot convert U+%04X to local character set: %s" msgstr "U+%04X yerel karakter kümesine dönüştürülemiyor: %s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "kullanıcı geçersiz" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "grup geçersiz" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "bir sayısal kullanıcı-kimliğin grubu alınamıyor" # -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "kullanıcı ve grubun her ikisi birden atlanamaz" @@ -368,16 +368,16 @@ msgid "invalid argument: %s" msgstr "`%s' argümanı geçersiz" # -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "dizge karşılaştırması başarısız" # -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "Problemi devre dışı bırakmak için LC_ALL='C' tanımlayın." -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "Karşılaştırılan dizgeler %s ve %s idi." @@ -391,7 +391,7 @@ msgstr "Karşılaştırılan dizgeler %s ve %s idi." #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -425,15 +425,15 @@ msgstr "" "\n" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -453,9 +453,9 @@ msgstr "" "çeviri hatalarını adresine bildirin.\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -668,17 +668,17 @@ msgstr "%s'nın kipi %04lo (%s) olarak değiştirilemedi\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "%s'nin kipi %04lo (%s) olarak korundu\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "%s'e erişilemedi" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, c-format msgid "cannot read directory %s" msgstr "%s dizini okunamıyor" @@ -688,7 +688,7 @@ msgstr "%s dizini okunamıyor" msgid "changing permissions of %s" msgstr "%s'nın erişim izinleri değiştiriliyor" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "okuma başarısız oldu" @@ -913,7 +913,7 @@ msgstr "kök dizini %s olarak değiştirilemedi" msgid "cannot chdir to root directory" msgstr "kök dizinine geçilemedi" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, c-format msgid "cannot run command %s" msgstr "%s komutu çalıştırılamadı" @@ -940,18 +940,29 @@ msgstr "" "Her DOSYA'nın CRC sağlama toplamlarını ve bayt sayılarını yazdırır.\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "Kullanım: %s [SEÇENEK]...SOL-DOSYA SAĞ-DOSYA\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Kullanım: %s [SEÇENEK]... DOSYA1 DOSYA2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "Sıralanmış SOL-DOSYA ve SAĞ-DOSYA'yı okur ve üç kolondan oluşan\n" @@ -968,7 +979,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "%s okumak için açılamadı" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -979,7 +990,7 @@ msgstr "%s'nin dosya durumu (fstat) alınamadı" msgid "skipping file %s, as it was replaced while being copied" msgstr "kopyalandığı esnada değiştirildiği için %s dosyası atlandı" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -990,207 +1001,207 @@ msgstr "%s silinemedi" msgid "cannot create regular file %s" msgstr "normal dosya %s oluşturulamadı" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "%s okunuyor" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "%s'de lseek yapılamadı" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "%s yazılıyor" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "%s kapatılıyor " -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s: %s'ın, %04lo kipi gözardı edilerek, üzerine yazılsın mı?" -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s'ın üzerine yazılsın mı?" -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "%s durumlanamadı" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "%s dizini atlanıyor" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "uyarı: %s kaynak dosyası bir defadan çok belirtilmiş" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s ve %s aynı dosya" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "Dizin olmayan %s'un üzerine dizin %s yazılamaz" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "yeni oluşturulmuş %s'un üzerine %s yazılamaz" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "Dizin %s'ın üzerine dizin olmayan bir dosya yazılamaz" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "%s dizininin üzerine yazılamaz" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "bir dizin, dizin olmayanın üzerine taşınamaz: %s -> %s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s'ı yedeklemek kaynağı yok eder; %s taşınmadı" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "%s'ı yedeklemek kaynağı yok eder; %s kopyalanmadı" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "%s yedeklenemedi" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (yedek: %s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "bir dizin, %s, kendi içine kopyalanamaz, %s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "Dizine sabit bağ oluşturulmayacak: sabit bağ %s, dizin %s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "%s sabit bağı %s'e bağlanamadı" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s kendi alt dizinine taşınamaz, %s" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "%s %s'e taşınamadı" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "aygıt arası taşıma başarısız: %s'yı %s'a; hedef silinemedi" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "çevrimli sembolik bağ %s kopyalanamaz" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: göreceli sembolik bağlar yalnızca mevcut dizinde oluşturulabilir" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "sembolik bağ %s, %s'e bağlanamadı" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "%s bağı oluşturulamadı" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "%s fifosu oluşturulamadı" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "özel dosya %s oluşturulamadı" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "%s sembolik bağı okunamadı" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "%s sembolik bağı oluşturulamadı" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s'nin sahiplik bilgileri korunamadı" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s bilinmeyen dosya türüne sahip" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "%s'in zaman damgaları korundu" -#: src/copy.c:1560 +#: src/copy.c:1578 #, c-format msgid "failed to lookup file %s" msgstr "%s dosyasına bakılamadı" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "%s'nin yazar bilgileri korunamadı" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "%s'in izinleri ayarlanıyor" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "%s yedeklemesi geri alınamadı" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (yedeklemeyi geri al)\n" @@ -2362,7 +2373,7 @@ msgstr "" " dosyasistemleri ile sınırlar\n" " -v (yoksayılır)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 msgid "" "\n" "SIZE may be (or may be an integer optionally followed by) one of following:\n" @@ -2520,10 +2531,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2534,7 +2546,7 @@ msgstr "" " -k, --kilobytes --block-size=1024 gibi\n" " -l, --count-links Eğer sabit bağ var ise, boyları toplama tekrar alır\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2549,7 +2561,7 @@ msgstr "" " -S, --separate-dirs altdizinlerin boyutunu dahil etmez\n" " -s, --summarize her argüman için yalnızca toplamı gösterir\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2571,30 +2583,30 @@ msgstr "" " seviye aşağıda ise gösterir. \n" " --max-depth=0, --summarize ile aynıdır.\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "toplam" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "geçersiz maksimum derinlik %s" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "hem özetleyip hem bütün girdiler gösterilemez" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "uyarı: özetlemek --max-depth=0 ile aynı" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "uyarı: özetlemek --max-depth=%d ile çakışıyor" @@ -2852,7 +2864,7 @@ msgstr "" msgid "syntax error" msgstr "sözdizimi hatası" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" @@ -2861,11 +2873,11 @@ msgstr "" "uyarı: taşınamaz düzgün ifade: `%s':`^' ile başlayan temel düzenli\n" "ifadeler taşınamadığından`^' yoksayılıyor." -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 msgid "non-numeric argument" msgstr "nümerik olmayan argüman" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "sıfırla bölüm" @@ -3385,11 +3397,6 @@ msgstr "" "VERSION_CONTROL çevre değişkeninden belirlenebilir. Geçerli değerler:\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Kullanım: %s [SEÇENEK]... DOSYA1 DOSYA2\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4680,7 +4687,7 @@ msgstr "geçersiz satır numarası alan genişliği: %s" msgid "invalid line numbering format: %s" msgstr "geçersiz satır numaralama biçemi: %s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4689,7 +4696,7 @@ msgstr "" "Kullanımı: %s BİÇEM [ARGÜMAN]...\n" " veya: %s SEÇENEK\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" @@ -4697,22 +4704,26 @@ msgstr "" "KOMUTu çalıştırır, ve bitir sinyallerini yoksayar.\n" "\n" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, c-format msgid "failed to open %s" msgstr "%s açılamadı" # -#: src/nohup.c:131 +#: src/nohup.c:132 msgid "failed to redirect standard output" msgstr "standart çıktı yeniden yönlendirilemedi" -#: src/nohup.c:133 +#: src/nohup.c:134 #, c-format msgid "appending output to %s" msgstr "çıktı, %s'nin sonuna ekleniyor" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "standart hata yeniden yönlendirilemedi" @@ -6052,7 +6063,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -8861,6 +8872,9 @@ msgid "" msgstr "" "Belirtilmişse DÄ°ZGE(ler)den, yoksa `y'den oluşan satırları sürekli üretir.\n" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "Kullanım: %s [SEÇENEK]...SOL-DOSYA SAĞ-DOSYA\n" + #~ msgid "*** invalid date/time ***" #~ msgstr "*** geçersiz tarih/zaman ***" diff --git a/po/zh_CN.po b/po/zh_CN.po index 749194d4ec..000c390da4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fileutils 4.1.9\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-07-19 23:58+0800\n" "Last-Translator: Anthony Fok \n" "Language-Team: Chinese (simplified) \n" @@ -152,7 +152,7 @@ msgstr "块大小" msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "无法创建目录%s" @@ -233,19 +233,19 @@ msgstr "无法将 U+%04X 转换至用户的字符集" msgid "cannot convert U+%04X to local character set: %s" msgstr "无法将 U+%04X 转换至用户的字符集：%s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "无效的用户" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "无效的组" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "无法取得 UID 数值所表示的用户的主组" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "不可同时省略用户和所属组" @@ -353,15 +353,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "%2$s 的参数 %1$s 无效" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "字串比较出现错误" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "请设定 LC_ALL='C' 避免问题出现。" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "要比较的字串为 %s 和 %s。" @@ -375,7 +375,7 @@ msgstr "要比较的字串为 %s 和 %s。" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -406,15 +406,15 @@ msgid "" msgstr "" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -433,9 +433,9 @@ msgstr "" "请向 报告错误。" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -625,17 +625,17 @@ msgstr "无法将 %s 的权限模式更改为 %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "%s 的权限模式保留为 %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "无法访问%s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "无法创建目录%s" @@ -645,7 +645,7 @@ msgstr "无法创建目录%s" msgid "changing permissions of %s" msgstr "正在更改 %s 的权限" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "strip 出现错误" @@ -856,7 +856,7 @@ msgstr "无法进入目录 %s" msgid "cannot chdir to root directory" msgstr "无法切换到目录%s" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "无法解除%s的链接" @@ -881,17 +881,28 @@ msgid "" "\n" msgstr "" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "用法：%s [选项]... [文件]\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 +msgid "" +"\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" @@ -900,7 +911,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "无法打开 %s 来读取数据" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -911,7 +922,7 @@ msgstr "无法 fstat%s" msgid "skipping file %s, as it was replaced while being copied" msgstr "略过文件%s，因为准备复制时它已被其他文件取代" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, c-format msgid "cannot remove %s" @@ -922,207 +933,207 @@ msgstr "无法删除%s" msgid "cannot create regular file %s" msgstr "无法创建一般文件%s" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, c-format msgid "reading %s" msgstr "正在读入%s" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, c-format msgid "cannot lseek %s" msgstr "无法 lseek%s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, c-format msgid "writing %s" msgstr "正在写入%s" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, c-format msgid "closing %s" msgstr "正在关闭%s" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s：是否覆盖%s，而不理会权限模式 %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆盖%s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, c-format msgid "cannot stat %s" msgstr "stat%s失败" -#: src/copy.c:841 +#: src/copy.c:846 #, c-format msgid "omitting directory %s" msgstr "略过目录%s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定来源文件%s多於一次" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s及%s为同一文件" -#: src/copy.c:910 +#: src/copy.c:915 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "无法以目录%2$s来覆盖非目录%1$s" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不会以%2$s覆盖刚创建的%1$s" -#: src/copy.c:938 +#: src/copy.c:943 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "无法以非目录来覆盖目录%s" -#: src/copy.c:999 +#: src/copy.c:1004 #, c-format msgid "cannot overwrite directory %s" msgstr "无法覆盖目录%s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "无法将目录移动至非目录：%s→%s" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "将%s备份会破坏来源文件，故不移动%s。" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "将%s备份会破坏来源文件，故不复制%s。" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "无法备份%s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (备份：%s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "无法将目录%s复制至原来位置%s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, c-format msgid "will not create hard link %s to directory %s" msgstr "不会创建连至目录%2$s的硬链接%1$s" -#: src/copy.c:1169 +#: src/copy.c:1187 #, c-format msgid "cannot create hard link %s to %s" msgstr "无法创建连至%2$s的硬链接%1$s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "无法将目录%s移动至本身的子目录%s下" -#: src/copy.c:1266 +#: src/copy.c:1284 #, c-format msgid "cannot move %s to %s" msgstr "无法移动%s至%s" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "无法进行跨设备的移动 (%s至%s)；无法删除目标文件或目录" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "无法复制循环的符号链接%s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能於目前的目录中创建相对符号链接" -#: src/copy.c:1390 +#: src/copy.c:1408 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "无法创建连至%2$s的符号链接%1$s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, c-format msgid "cannot create link %s" msgstr "无法创建链接%s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, c-format msgid "cannot create fifo %s" msgstr "无法创建 fifo 文件%s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, c-format msgid "cannot create special file %s" msgstr "无法创建特殊文件%s" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, c-format msgid "cannot read symbolic link %s" msgstr "无法读取符号链接%s" -#: src/copy.c:1471 +#: src/copy.c:1489 #, c-format msgid "cannot create symbolic link %s" msgstr "无法创建符号链接%s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "无法保留%s的所有者" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s的文件类型不详" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "保留%s的时间" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "无法保留%s的时间" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "无法保留%s的著作者" -#: src/copy.c:1584 +#: src/copy.c:1602 #, c-format msgid "setting permissions for %s" msgstr "设定%s的权限" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "无法将 %s 的备份还原" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (还原备份)\n" @@ -2129,7 +2140,7 @@ msgstr "" " -x, --exclude-type=类型 只印出不是指定<类型>的文件系统信息\n" " -v (此选项不作处理)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 #, fuzzy msgid "" "\n" @@ -2266,10 +2277,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2278,7 +2290,7 @@ msgstr "" " -k 即 --block-size=1K\n" " -l, --count-links 连硬链接的大小也计算在内\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2293,7 +2305,7 @@ msgstr "" " -S, --separate-dirs 不包括子目录的占用量\n" " -s, --summarize 只分别计算命令列中每个参数所占的总用量\n" -#: src/du.c:199 +#: src/du.c:201 #, fuzzy msgid "" " -x, --one-file-system skip directories on different filesystems\n" @@ -2313,30 +2325,30 @@ msgstr "" " (若使用 --all 选项，也会显示文件的占用量)；\n" " --max-depth=0 的效果等於 --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "总用量" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, c-format msgid "invalid maximum depth %s" msgstr "目录最大深度 %s 无效" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "不能只显示总用量，同时又显示每个项目" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：显示总用量等於使用 --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "警告：显示总用量的选项和 --max-depth=%d 互相抵触" @@ -2517,19 +2529,19 @@ msgstr "" msgid "syntax error" msgstr "写入时发生错误" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "参数数目错误" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -2986,11 +2998,6 @@ msgstr "" "变量来选择。以下是可用的变量值：\n" "\n" -#: src/join.c:158 -#, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "用法：%s [选项]... [文件]\n" - #: src/join.c:162 msgid "" "For each pair of input lines with identical join fields, write a line to\n" @@ -4094,7 +4101,7 @@ msgstr "无效的行宽数值：%s" msgid "invalid line numbering format: %s" msgstr "无效的行宽数值：%s" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4103,28 +4110,32 @@ msgstr "" "用法：%s 文件\n" " 或：%s 选项\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "无法保留%s的时间" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "标准输出" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "正在更改 %s 的所属组" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5142,7 +5153,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7319,6 +7330,10 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "用法：%s [选项]... [文件]\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "无效的权限模式%s" diff --git a/po/zh_TW.po b/po/zh_TW.po index 46573f97bb..67172dcda2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: textutils 2.1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2004-02-18 18:49+0100\n" +"POT-Creation-Date: 2004-03-12 14:56+0100\n" "PO-Revision-Date: 2002-08-04 06:10+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -151,7 +151,7 @@ msgstr "區塊大小錯誤" msgid "failed to return to initial working directory" msgstr "" -#: lib/makepath.c:152 src/copy.c:1325 src/mkdir.c:171 +#: lib/makepath.c:152 src/copy.c:1343 src/mkdir.c:171 #, c-format msgid "cannot create directory %s" msgstr "無法建立目錄%s" @@ -232,19 +232,19 @@ msgstr "無法將 U+%04X 轉換至使用者的字元集" msgid "cannot convert U+%04X to local character set: %s" msgstr "無法將 U+%04X 轉換至使用者的字元集：%s" -#: lib/userspec.c:148 +#: lib/userspec.c:147 msgid "invalid user" msgstr "無效的使用者" -#: lib/userspec.c:149 +#: lib/userspec.c:148 msgid "invalid group" msgstr "無效的群組" -#: lib/userspec.c:151 +#: lib/userspec.c:150 msgid "cannot get the login group of a numeric UID" msgstr "無法取得 UID 數值所代表的登入群組" -#: lib/userspec.c:153 +#: lib/userspec.c:152 msgid "cannot omit both user and group" msgstr "不可同時省略使用者和所屬群組" @@ -352,15 +352,15 @@ msgstr "" msgid "invalid argument: %s" msgstr "%2$s的引數%1$s無效" -#: lib/xmemcoll.c:54 src/expr.c:711 +#: lib/xmemcoll.c:54 src/expr.c:740 msgid "string comparison failed" msgstr "字串比較出現錯誤" -#: lib/xmemcoll.c:55 src/expr.c:712 +#: lib/xmemcoll.c:55 src/expr.c:741 msgid "Set LC_ALL='C' to work around the problem." msgstr "請設定 LC_ALL='C' 避免問題出現。" -#: lib/xmemcoll.c:57 src/expr.c:714 +#: lib/xmemcoll.c:57 src/expr.c:743 #, c-format msgid "The strings compared were %s and %s." msgstr "要比較的字串為%s及%s。" @@ -374,7 +374,7 @@ msgstr "要比較的字串為%s及%s。" #: src/install.c:588 src/join.c:154 src/kill.c:90 src/link.c:47 src/ln.c:341 #: src/logname.c:44 src/ls.c:3901 src/md5sum.c:120 src/mkdir.c:57 #: src/mkfifo.c:51 src/mknod.c:51 src/mv.c:301 src/nice.c:65 src/nl.c:172 -#: src/nohup.c:49 src/od.c:282 src/paste.c:392 src/pathchk.c:136 +#: src/nohup.c:50 src/od.c:282 src/paste.c:392 src/pathchk.c:136 #: src/pinky.c:464 src/pr.c:2748 src/printenv.c:62 src/printf.c:91 #: src/ptx.c:1870 src/pwd.c:41 src/readlink.c:63 src/rm.c:103 src/rmdir.c:143 #: src/seq.c:78 src/setuidgid.c:46 src/shred.c:155 src/sleep.c:48 @@ -405,15 +405,15 @@ msgid "" msgstr "" #: src/basename.c:65 src/cat.c:123 src/chgrp.c:163 src/chmod.c:298 -#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:85 src/cp.c:251 +#: src/chown.c:152 src/chroot.c:59 src/cksum.c:292 src/comm.c:93 src/cp.c:251 #: src/csplit.c:1443 src/cut.c:223 src/date.c:216 src/dd.c:341 src/df.c:762 -#: src/dircolors.c:121 src/dirname.c:57 src/du.c:214 src/echo.c:104 +#: src/dircolors.c:121 src/dirname.c:57 src/du.c:216 src/echo.c:104 #: src/env.c:133 src/expand.c:129 src/expr.c:161 src/factor.c:89 #: src/false.c:43 src/fmt.c:297 src/fold.c:85 src/head.c:144 src/hostid.c:55 #: src/hostname.c:75 src/id.c:103 src/install.c:643 src/join.c:195 #: src/kill.c:120 src/link.c:59 src/ln.c:398 src/logname.c:55 src/ls.c:4035 #: src/md5sum.c:156 src/mkdir.c:76 src/mkfifo.c:68 src/mknod.c:82 src/mv.c:355 -#: src/nice.c:79 src/nl.c:227 src/nohup.c:65 src/od.c:369 src/paste.c:416 +#: src/nice.c:79 src/nl.c:227 src/nohup.c:66 src/od.c:369 src/paste.c:416 #: src/pathchk.c:148 src/pinky.c:491 src/pr.c:2860 src/printenv.c:75 #: src/printf.c:140 src/ptx.c:1917 src/pwd.c:52 src/readlink.c:80 src/rm.c:141 #: src/rmdir.c:163 src/seq.c:106 src/setuidgid.c:66 src/shred.c:219 @@ -432,9 +432,9 @@ msgstr "" "請向 <%s> 回報錯誤。\n" #: src/basename.c:114 src/chgrp.c:246 src/chmod.c:395 src/chown.c:264 -#: src/chroot.c:80 src/comm.c:280 src/csplit.c:1373 src/dirname.c:89 +#: src/chroot.c:80 src/comm.c:288 src/csplit.c:1373 src/dirname.c:89 #: src/expr.c:199 src/install.c:281 src/link.c:88 src/mkdir.c:125 -#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:99 src/pathchk.c:189 +#: src/mkfifo.c:114 src/mknod.c:138 src/nohup.c:100 src/pathchk.c:189 #: src/readlink.c:128 src/rm.c:231 src/rmdir.c:208 src/seq.c:374 #: src/setuidgid.c:99 src/sleep.c:140 src/stat.c:825 src/unlink.c:89 msgid "too few arguments" @@ -643,17 +643,17 @@ msgstr "無法將%s的權限模式更改為 %04lo (%s)\n" msgid "mode of %s retained as %04lo (%s)\n" msgstr "%s的權限模式保留為 %04lo (%s)\n" -#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:339 +#: src/chmod.c:167 src/chown-core.c:189 src/copy.c:158 src/du.c:341 #, c-format msgid "cannot access %s" msgstr "無法存取%s" -#: src/chmod.c:171 src/chown-core.c:193 src/du.c:345 +#: src/chmod.c:171 src/chown-core.c:193 src/du.c:347 #, c-format msgid "%s" msgstr "" -#: src/chmod.c:175 src/chown-core.c:197 src/du.c:352 +#: src/chmod.c:175 src/chown-core.c:197 src/du.c:354 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "無法建立目錄%s" @@ -663,7 +663,7 @@ msgstr "無法建立目錄%s" msgid "changing permissions of %s" msgstr "無法更改%s的權限" -#: src/chmod.c:245 src/chown-core.c:327 src/du.c:502 +#: src/chmod.c:245 src/chown-core.c:327 src/du.c:504 #, fuzzy msgid "fts_read failed" msgstr "讀入時發生錯誤" @@ -874,7 +874,7 @@ msgstr "無法進入%s目錄" msgid "cannot chdir to root directory" msgstr "無法進入%s目錄" -#: src/chroot.c:110 src/nohup.c:186 src/setuidgid.c:126 +#: src/chroot.c:110 src/nohup.c:192 src/setuidgid.c:126 #, fuzzy, c-format msgid "cannot run command %s" msgstr "無法對‘%s’執行輸出入控制 (ioctl)" @@ -901,18 +901,29 @@ msgstr "" "印出每個 <檔案> 的 CRC 總和檢查值及位元組總數。\n" "\n" -#: src/comm.c:72 +#: src/comm.c:72 src/join.c:158 #, c-format -msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -msgstr "用法：%s [選項]... LEFT_FILE RIGHT_FILE\n" +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "用法：%s [選項]... 檔案1 檔案2\n" #: src/comm.c:76 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "" + +#: src/comm.c:79 +msgid "" +"\n" +"With no options, produce three-column output. Column one contains\n" +"lines unique to FILE1, column two contains lines unique to FILE2,\n" +"and column three contains lines common to both files.\n" +msgstr "" + +#: src/comm.c:85 #, fuzzy msgid "" -"Compare sorted files LEFT_FILE and RIGHT_FILE line by line.\n" "\n" -" -1 suppress lines unique to left file\n" -" -2 suppress lines unique to right file\n" +" -1 suppress lines unique to FILE1\n" +" -2 suppress lines unique to FILE2\n" " -3 suppress lines that appear in both files\n" msgstr "" "逐行比較兩個已排序的檔案 LEFT_FILE 及 RIGHT_FILE。\n" @@ -926,7 +937,7 @@ msgstr "" msgid "cannot open %s for reading" msgstr "無法開啟%s來讀取資料" -#: src/copy.c:228 src/copy.c:282 src/copy.c:297 src/dd.c:1209 src/tail.c:1098 +#: src/copy.c:228 src/copy.c:282 src/copy.c:302 src/dd.c:1209 src/tail.c:1098 #: src/tail.c:1170 #, c-format msgid "cannot fstat %s" @@ -937,7 +948,7 @@ msgstr "無法 fstat%s" msgid "skipping file %s, as it was replaced while being copied" msgstr "略過檔案%s，因為準備複製時它已被其它檔案取代" -#: src/copy.c:258 src/copy.c:887 src/copy.c:1071 src/copy.c:1161 src/ln.c:297 +#: src/copy.c:258 src/copy.c:892 src/copy.c:1076 src/copy.c:1179 src/ln.c:297 #: src/remove.c:727 src/remove.c:781 src/remove.c:902 src/remove.c:1009 #, fuzzy, c-format msgid "cannot remove %s" @@ -948,207 +959,207 @@ msgstr "無法建立目錄%s" msgid "cannot create regular file %s" msgstr "無法建立暫存檔" -#: src/copy.c:324 src/dd.c:825 src/dd.c:1019 +#: src/copy.c:329 src/dd.c:825 src/dd.c:1019 #, fuzzy, c-format msgid "reading %s" msgstr "讀取 %s 時發生錯誤" -#: src/copy.c:358 src/head.c:437 +#: src/copy.c:363 src/head.c:437 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "%s：無法搜尋至位置 %s%s" -#: src/copy.c:373 src/copy.c:397 src/dd.c:1063 src/dd.c:1124 +#: src/copy.c:378 src/copy.c:402 src/dd.c:1063 src/dd.c:1124 #, fuzzy, c-format msgid "writing %s" msgstr "寫入 %s 時發生錯誤" -#: src/copy.c:405 src/copy.c:411 src/head.c:874 +#: src/copy.c:410 src/copy.c:416 src/head.c:874 #, fuzzy, c-format msgid "closing %s" msgstr "正在關閉 %s (fd=%d)" -#: src/copy.c:630 +#: src/copy.c:635 #, c-format msgid "%s: overwrite %s, overriding mode %04lo? " msgstr "%s：是否覆寫%s，而不理會權限模式 %04lo? " -#: src/copy.c:636 +#: src/copy.c:641 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆寫%s? " -#: src/copy.c:831 src/copy.c:869 src/df.c:492 src/stat.c:655 +#: src/copy.c:836 src/copy.c:874 src/df.c:492 src/stat.c:655 #, fuzzy, c-format msgid "cannot stat %s" msgstr "無法建立目錄%s" -#: src/copy.c:841 +#: src/copy.c:846 #, fuzzy, c-format msgid "omitting directory %s" msgstr "無法建立目錄%s" -#: src/copy.c:855 +#: src/copy.c:860 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定了來源檔%s多於一次" -#: src/copy.c:900 src/ln.c:241 +#: src/copy.c:905 src/ln.c:241 #, c-format msgid "%s and %s are the same file" msgstr "%s及%s為同一檔案" -#: src/copy.c:910 +#: src/copy.c:915 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "無法進入%s目錄" -#: src/copy.c:927 +#: src/copy.c:932 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不會以%2$s覆寫剛建立的%1$s" -#: src/copy.c:938 +#: src/copy.c:943 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "無法建立目錄%s" -#: src/copy.c:999 +#: src/copy.c:1004 #, fuzzy, c-format msgid "cannot overwrite directory %s" msgstr "無法建立目錄%s" -#: src/copy.c:1008 +#: src/copy.c:1013 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "無法進入%s目錄" -#: src/copy.c:1031 +#: src/copy.c:1036 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "將%s備份會破壞來源檔，故不移動%s。" -#: src/copy.c:1032 +#: src/copy.c:1037 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "將%s備份會破壞來源檔，故不複製%s。" -#: src/copy.c:1050 src/ln.c:279 +#: src/copy.c:1055 src/ln.c:279 #, c-format msgid "cannot backup %s" msgstr "無法備份%s" -#: src/copy.c:1086 src/ln.c:314 +#: src/copy.c:1091 src/ln.c:314 #, c-format msgid " (backup: %s)" msgstr " (備份：%s)" -#: src/copy.c:1136 +#: src/copy.c:1154 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "無法建立目錄%s" -#: src/copy.c:1143 +#: src/copy.c:1161 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "無法進入%s目錄" -#: src/copy.c:1169 +#: src/copy.c:1187 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "無法建立目錄%s" -#: src/copy.c:1223 +#: src/copy.c:1241 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "無法進入%s目錄" -#: src/copy.c:1266 +#: src/copy.c:1284 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "無法對‘%s’執行輸出入控制 (ioctl)" -#: src/copy.c:1278 +#: src/copy.c:1296 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "無法進行跨裝置的移動 (%s至%s)；無法移除目標檔案或目錄" -#: src/copy.c:1306 +#: src/copy.c:1324 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "無法複製循環的符號鏈結%s" -#: src/copy.c:1383 +#: src/copy.c:1401 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能於目前的目錄中建立相對符號鏈結" -#: src/copy.c:1390 +#: src/copy.c:1408 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "無法建立目錄%s" -#: src/copy.c:1401 +#: src/copy.c:1419 #, fuzzy, c-format msgid "cannot create link %s" msgstr "無法建立目錄%s" -#: src/copy.c:1423 src/mkfifo.c:134 +#: src/copy.c:1441 src/mkfifo.c:134 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "無法建立目錄%s" -#: src/copy.c:1434 +#: src/copy.c:1452 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "字元特殊檔案" -#: src/copy.c:1446 src/ls.c:2554 src/stat.c:439 +#: src/copy.c:1464 src/ls.c:2554 src/stat.c:439 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "符號連結" -#: src/copy.c:1471 +#: src/copy.c:1489 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "無法建立目錄%s" -#: src/copy.c:1487 src/copy.c:1548 src/cp.c:330 +#: src/copy.c:1505 src/copy.c:1566 src/cp.c:330 #, c-format msgid "failed to preserve ownership for %s" msgstr "無法保留%s的擁有者及所屬群組" -#: src/copy.c:1502 +#: src/copy.c:1520 #, c-format msgid "%s has unknown file type" msgstr "%s的檔案類型不詳" -#: src/copy.c:1535 +#: src/copy.c:1553 #, c-format msgid "preserving times for %s" msgstr "保留%s的時間" -#: src/copy.c:1560 +#: src/copy.c:1578 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "無法保留%s的時間" -#: src/copy.c:1565 +#: src/copy.c:1583 #, c-format msgid "failed to preserve authorship for %s" msgstr "無法保留%s的著作者" -#: src/copy.c:1584 +#: src/copy.c:1602 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "無法更改%s的權限" -#: src/copy.c:1606 src/ln.c:332 +#: src/copy.c:1624 src/ln.c:332 #, c-format msgid "cannot un-backup %s" msgstr "無法將%s的備份還原" -#: src/copy.c:1610 +#: src/copy.c:1628 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s→%s (還原備份)\n" @@ -2185,7 +2196,7 @@ msgstr "" " -x, --exclude-type=類型 只印出不是指定 <類型> 的檔案系統資訊\n" " -v (此選項不作處理)\n" -#: src/df.c:758 src/du.c:210 src/ls.c:4023 +#: src/df.c:758 src/du.c:212 src/ls.c:4023 #, fuzzy msgid "" "\n" @@ -2322,10 +2333,11 @@ msgstr "" #: src/du.c:186 #, fuzzy msgid "" +" -H like --si, but also evokes a warning; will soon\n" +" change to be equivalent to --dereference-args (-D)\n" " -h, --human-readable print sizes in human readable format (e.g., 1K 234M " "2G)\n" -" -H, --si likewise, but use powers of 1000 not 1024 " -"(deprecated)\n" +" --si like -h, but use powers of 1000 not 1024\n" " -k like --block-size=1K\n" " -l, --count-links count sizes many times if hard linked\n" msgstr "" @@ -2334,7 +2346,7 @@ msgstr "" " -k 即 --block-size=1K\n" " -l, --count-links 連實際鏈結 (hard link) 的大小也計算在內\n" -#: src/du.c:192 +#: src/du.c:194 #, fuzzy msgid "" " -L, --dereference dereference all symbolic links\n" @@ -2349,7 +2361,7 @@ msgstr "" " -S, --separate-dirs 不包括副目錄的佔用量\n" " -s, --summarize 只分別計算指令列中每個引數所佔的總用量\n" -#: src/du.c:199 +#: src/du.c:201 msgid "" " -x, --one-file-system skip directories on different filesystems\n" " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " @@ -2368,30 +2380,30 @@ msgstr "" " (若使用 --all 選項，也會顯示檔案的佔用量)；\n" " --max-depth=0 的效果等於 --summarize\n" -#: src/du.c:524 src/ls.c:2224 src/wc.c:674 +#: src/du.c:526 src/ls.c:2224 src/wc.c:674 msgid "total" msgstr "總計" -#: src/du.c:604 +#: src/du.c:606 msgid "" "WARNING: use --si, not -H; the meaning of the -H option will soon\n" "change to be the same as that of --dereference-args (-D)" msgstr "" -#: src/du.c:626 +#: src/du.c:628 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "無效的寬度：‘%s’" -#: src/du.c:696 +#: src/du.c:698 msgid "cannot both summarize and show all entries" msgstr "不能只顯示總用量，同時又顯示每個項目" -#: src/du.c:703 +#: src/du.c:705 msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：顯示總用量等於使用 --max-depth=0" -#: src/du.c:709 +#: src/du.c:711 #, c-format msgid "warning: summarizing conflicts with --max-depth=%d" msgstr "警告：顯示總用量的選項和 --max-depth=%d 互相抵觸" @@ -2576,19 +2588,19 @@ msgstr "" msgid "syntax error" msgstr "標準錯誤輸出" -#: src/expr.c:405 +#: src/expr.c:420 #, c-format msgid "" "warning: unportable BRE: `%s': using `^' as the first character\n" "of the basic regular expression is not portable; it is being ignored" msgstr "" -#: src/expr.c:607 src/expr.c:646 +#: src/expr.c:632 src/expr.c:674 #, fuzzy msgid "non-numeric argument" msgstr "限制引數" -#: src/expr.c:613 +#: src/expr.c:638 msgid "division by zero" msgstr "" @@ -3067,11 +3079,6 @@ msgstr "" "變數來選擇。以下是可用的變數值：\n" "\n" -#: src/join.c:158 -#, c-format -msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "用法：%s [選項]... 檔案1 檔案2\n" - #: src/join.c:162 #, fuzzy msgid "" @@ -4254,7 +4261,7 @@ msgstr "無效的行號欄位寬度：‘%s’" msgid "invalid line numbering format: %s" msgstr "無效的行號增加值：‘%s’" -#: src/nohup.c:53 +#: src/nohup.c:54 #, fuzzy, c-format msgid "" "Usage: %s COMMAND [ARG]...\n" @@ -4263,28 +4270,32 @@ msgstr "" "用法：%s [檔案]...\n" " 或：%s [選項]\n" -#: src/nohup.c:59 +#: src/nohup.c:60 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" -#: src/nohup.c:122 src/nohup.c:123 +#: src/nohup.c:123 src/nohup.c:124 #, fuzzy, c-format msgid "failed to open %s" msgstr "無法保留%s的時間" -#: src/nohup.c:131 +#: src/nohup.c:132 #, fuzzy msgid "failed to redirect standard output" msgstr "標準輸出" -#: src/nohup.c:133 +#: src/nohup.c:134 #, fuzzy, c-format msgid "appending output to %s" msgstr "無法更改%s的擁有者和/或所屬群組" -#: src/nohup.c:152 +#: src/nohup.c:155 +msgid "failed to set the copy of stderr to close on exec" +msgstr "" + +#: src/nohup.c:158 msgid "failed to redirect standard error" msgstr "" @@ -5448,7 +5459,7 @@ msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" "omitted INCREMENT defaults to 1 even when LAST is smaller than FIRST.\n" -" FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" "When given, the FORMAT argument must contain exactly one of\n" @@ -7860,6 +7871,9 @@ msgid "" "\n" msgstr "" +#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" +#~ msgstr "用法：%s [選項]... LEFT_FILE RIGHT_FILE\n" + #, fuzzy #~ msgid "*** invalid date/time ***" #~ msgstr "無效的寬度：‘%s’" -- 2.47.2