summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2004-03-12 13:59:39 +0000
committerJim Meyering <jim@meyering.net>2004-03-12 13:59:39 +0000
commit2b412668900201fe2d202475d285332d04996e24 (patch)
tree7e8646f8e3ff21c5929bf0df6d80b841ad18912c
parente0bc86781fe3982f64f962549e43a7b9a3fc7484 (diff)
downloadcoreutils-2b412668900201fe2d202475d285332d04996e24.tar.xz
.
-rw-r--r--po/af.po504
-rw-r--r--po/be.po204
-rw-r--r--po/ca.po219
-rw-r--r--po/cs.po204
-rw-r--r--po/da.po204
-rw-r--r--po/de.po216
-rw-r--r--po/el.po208
-rw-r--r--po/es.po245
-rw-r--r--po/et.po213
-rw-r--r--po/fi.po219
-rw-r--r--po/fr.po219
-rw-r--r--po/ga.po220
-rw-r--r--po/gl.po204
-rw-r--r--po/hu.po203
-rw-r--r--po/it.po203
-rw-r--r--po/ja.po204
-rw-r--r--po/ko.po204
-rw-r--r--po/lg.po199
-rw-r--r--po/ms.po204
-rw-r--r--po/nb.po204
-rw-r--r--po/nl.po202
-rw-r--r--po/no.po204
-rw-r--r--po/pl.po223
-rw-r--r--po/pt.po203
-rw-r--r--po/pt_BR.po204
-rw-r--r--po/ru.po204
-rw-r--r--po/sk.po204
-rw-r--r--po/sl.po206
-rw-r--r--po/sv.po239
-rw-r--r--po/tr.po204
-rw-r--r--po/zh_CN.po203
-rw-r--r--po/zh_TW.po204
32 files changed, 3780 insertions, 3220 deletions
diff --git a/po/af.po b/po/af.po
index 38f818304..23db4b49c 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 <rkwjpj@puknet.puk.ac.za>\n"
"Language-Team: Afrikaans <i18n@af.org.za>\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 lergids %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 kopiervoorwaardes. 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 kopiervoorwaardes. 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]... LINKERLER REGTERLER\n"
+msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
+msgstr "Gebruik so: %s [OPSIE]... LER1 LER2 \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 ler %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 "lergids %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 ler"
-#: 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 lergids, %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 ler %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 lertipe"
-#: src/copy.c:1535
+#: src/copy.c:1553
#, c-format
msgid "preserving times for %s"
msgstr "lertye van %s word behou"
-#: src/copy.c:1560
+#: src/copy.c:1578
#, c-format
msgid "failed to lookup file %s"
msgstr "kon nie ler %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=LER lees vanaf LER in plaas van stdin\n"
" obs=GREPE skryf GREPE(aantal) grepe op 'n slag\n"
" of=LER skryf na LER 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]... LER1 LER2 \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"
" FORMAT1<newline>FORMAT2, 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 relnommer veld: %s"
msgid "invalid line numbering format: %s"
msgstr "ongeldige relnommeringformaat: %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 <TAB> 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 <TAB> with -J and <space>\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]... LINKERLER REGTERLER\n"
diff --git a/po/be.po b/po/be.po
index 0db8615a8..9075921c9 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 <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\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 bde0f5c28..ad47e836f 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 <ivan@selidor.net>\n"
"Language-Team: Catalan <ca@dodds.net>\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 f0ee6b8c9..ae0fb071b 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 <Vladimir.Michl@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\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 vytvoit"
@@ -238,19 +238,19 @@ msgstr "znak U+%04X nelze pevst do lokln znakov sady"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "znak U+%04X nelze pevst do lokln znakov sady"
-#: lib/userspec.c:148
+#: lib/userspec.c:147
msgid "invalid user"
msgstr "neplatn uivatel"
-#: 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 pihlaovac skupinu"
-#: lib/userspec.c:153
+#: lib/userspec.c:152
msgid "cannot omit both user and group"
msgstr "nemete vynechat jak uivatele 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 vype oznaen 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), pipomnky k pekladu zaslejte na adresu <cs@li.org> (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 "prva souboru %s se nepodaila zmnit na %04lo (%s)\n"
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "prva souboru %s zstala %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 provst"
-#: 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 vytvoit"
@@ -687,7 +687,7 @@ msgstr "adres %s nelze vytvoit"
msgid "changing permissions of %s"
msgstr "prva %s nelze zmnit"
-#: 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 nezdailo"
@@ -884,7 +884,7 @@ msgstr "do adrese `%s' nelze vejt"
msgid "cannot chdir to root directory"
msgstr "do adrese `%s' nelze vejt"
-#: 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 mon 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 "Pouit: %s [PEPNA]... LEV_SOUBOR PRAV_SOUBOR\n"
+msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
+msgstr "Pouit: %s [PEPNA]... 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 ""
" Porovnv 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' pemstit"
-#: 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 %s nelze vytvoit"
msgid "cannot create regular file %s"
msgstr "nelze vytvoit doasn 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 pi 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 provst"
-#: 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 pi zpisu %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 "uzavrn %s (fd=%d)"
-#: src/copy.c:630
+#: src/copy.c:635
#, fuzzy, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
msgstr "%s: pepsat `%s', pehldnout prva %04lo? "
-#: src/copy.c:636
+#: src/copy.c:641
#, fuzzy, c-format
msgid "%s: overwrite %s? "
msgstr "%s: pepsat `%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 vytvoit"
-#: src/copy.c:841
+#: src/copy.c:846
#, fuzzy, c-format
msgid "omitting directory %s"
msgstr "adres %s nelze vytvoit"
-#: 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 adrese `%s' nelze vejt"
-#: src/copy.c:927
+#: src/copy.c:932
#, fuzzy, c-format
msgid "will not overwrite just-created %s with %s"
msgstr "%s: adres nelze pepsat souborem, kter nen adresem"
-#: src/copy.c:938
+#: src/copy.c:943
#, fuzzy, c-format
msgid "cannot overwrite directory %s with non-directory"
msgstr "adres %s nelze vytvoit"
-#: src/copy.c:999
+#: src/copy.c:1004
#, fuzzy, c-format
msgid "cannot overwrite directory %s"
msgstr "adres %s nelze vytvoit"
-#: src/copy.c:1008
+#: src/copy.c:1013
#, fuzzy, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "do adrese `%s' nelze vejt"
-#: src/copy.c:1031
+#: src/copy.c:1036
#, fuzzy, c-format
msgid "backing up %s would destroy source; %s not moved"
msgstr "vytvoen zlohy souboru `%s' me zniit zdroj; `%s' nepejmenovn"
-#: src/copy.c:1032
+#: src/copy.c:1037
#, fuzzy, c-format
msgid "backing up %s would destroy source; %s not copied"
msgstr "vytvoen zlohy souboru `%s' me zniit zdroj; `%s' nekoprovn"
-#: src/copy.c:1050 src/ln.c:279
+#: src/copy.c:1055 src/ln.c:279
#, fuzzy, c-format
msgid "cannot backup %s"
msgstr "pkaz %s nelze provst"
-#: src/copy.c:1086 src/ln.c:314
+#: src/copy.c:1091 src/ln.c:314
#, c-format
msgid " (backup: %s)"
msgstr " (zloha: %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 vytvoit"
-#: src/copy.c:1143
+#: src/copy.c:1161
#, fuzzy, c-format
msgid "will not create hard link %s to directory %s"
msgstr "do adrese `%s' nelze vejt"
-#: src/copy.c:1169
+#: src/copy.c:1187
#, fuzzy, c-format
msgid "cannot create hard link %s to %s"
msgstr "adres %s nelze vytvoit"
-#: src/copy.c:1223
+#: src/copy.c:1241
#, fuzzy, c-format
msgid "cannot move %s to a subdirectory of itself, %s"
msgstr "do adrese `%s' nelze vejt"
-#: src/copy.c:1266
+#: src/copy.c:1284
#, fuzzy, c-format
msgid "cannot move %s to %s"
msgstr "ioctl na `%s' nen mon 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 koprovat"
-#: 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 vytvoit pouze v aktulnm adresi"
-#: src/copy.c:1390
+#: src/copy.c:1408
#, fuzzy, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "adres %s nelze vytvoit"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, fuzzy, c-format
msgid "cannot create link %s"
msgstr "adres %s nelze vytvoit"
-#: 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 vytvoit"
-#: 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 mon vykonat"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, fuzzy, c-format
msgid "cannot create symbolic link %s"
msgstr "adres %s nelze vytvoit"
-#: 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 "zachovn vlastnictv souboru %s"
-#: src/copy.c:1502
+#: src/copy.c:1520
#, fuzzy, c-format
msgid "%s has unknown file type"
msgstr "%s: neznm typ souboru"
-#: src/copy.c:1535
+#: src/copy.c:1553
#, c-format
msgid "preserving times for %s"
msgstr "zachovn as souboru %s"
-#: src/copy.c:1560
+#: src/copy.c:1578
#, fuzzy, c-format
msgid "failed to lookup file %s"
msgstr "zachovn as souboru %s"
-#: src/copy.c:1565
+#: src/copy.c:1583
#, fuzzy, c-format
msgid "failed to preserve authorship for %s"
msgstr "zachovn vlastnictv souboru %s"
-#: src/copy.c:1584
+#: src/copy.c:1602
#, fuzzy, c-format
msgid "setting permissions for %s"
msgstr "prva %s nelze zmnit"
-#: 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 "pkaz %s nelze provst"
-#: src/copy.c:1610
+#: src/copy.c:1628
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s -> %s (obnoven ze zlohy)\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 poloky: `%s'"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr ""
"nen mon oboje, potat celkov souty pro kad argument a ukzat\n"
"vechny poloky"
-#: src/du.c:703
+#: src/du.c:705
msgid "warning: summarizing is the same as using --max-depth=0"
msgstr "varovn: sumarizace je stejn jako pouit --max-depth=0"
-#: src/du.c:709
+#: src/du.c:711
#, c-format
msgid "warning: summarizing conflicts with --max-depth=%d"
msgstr "varovn: sumarizace je v rozporu s --max-depth=%d"
@@ -2604,7 +2616,7 @@ msgstr ""
msgid "syntax error"
msgstr "standardn chybov vstup"
-#: 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 ""
"upozornn: nepenositeln : '%s': pouit '^' jako prvnho znaku\n"
"zkladnho regulrnho vrazu nen penositeln; bude ignorovno"
-#: src/expr.c:607 src/expr.c:646
+#: src/expr.c:632 src/expr.c:674
#, fuzzy
msgid "non-numeric argument"
msgstr "argument oezn"
-#: src/expr.c:613
+#: src/expr.c:638
msgid "division by zero"
msgstr ""
@@ -3159,11 +3171,6 @@ msgstr ""
" jinak jednoduch\n"
" simple, never jednoduch zlon kopie\n"
-#: src/join.c:158
-#, c-format
-msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Pouit: %s [PEPNA]... 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 ka sla dku: `%s'"
msgid "invalid line numbering format: %s"
msgstr "chybn hodnota prstku 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 ""
"Pouit: %s [SOUBOR]...\n"
" nebo: %s [PEPNA]\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 "zachovn as souboru %s"
-#: src/nohup.c:131
+#: src/nohup.c:132
#, fuzzy
msgid "failed to redirect standard output"
msgstr "standardn vstup"
-#: src/nohup.c:133
+#: src/nohup.c:134
#, fuzzy, c-format
msgid "appending output to %s"
msgstr "vlastnka a/nebo skupinu %s nelze zmnit"
-#: 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 "Pouit: %s [PEPNA]... LEV_SOUBOR PRAV_SOUBOR\n"
+
#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr "chybn slo poloky: `%s'"
diff --git a/po/da.po b/po/da.po
index aa9f08d67..84999d758 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 Jrn Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -153,7 +153,7 @@ msgstr "blokstrrelse"
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 tegnst"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "Kan ikke konvertere U+%04X til lokalt tegnst: %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 bde 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 "St 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 ""
"Rapportr 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 ndre tilstand for %s til %04lo (%s)\n"
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 lse katalog %s"
@@ -671,7 +671,7 @@ msgstr "kan ikke lse katalog %s"
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 "lsefejl"
@@ -895,7 +895,7 @@ msgstr "kan ikke ndre rod-kataloget til %s"
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 aflnke %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 HJRE_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 HJRE_FIL linje for linje.\n"
@@ -947,7 +958,7 @@ msgstr ""
msgid "cannot open %s for reading"
msgstr "kan ikke bne %s til lsning"
-#: 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 udfre fstat() %s"
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 "lser %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 udfre 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 udfre 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 hrd lnke %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 hrd lnke %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 mlet"
-#: src/copy.c:1306
+#: src/copy.c:1324
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "kan ikke kopiere cyklisk symbolsk lnke %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 lnker 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 lnke %s til %s"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, c-format
msgid "cannot create link %s"
msgstr "kan ikke oprette lnke %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 lse symbolsk lnke %s"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, c-format
msgid "cannot create symbolic link %s"
msgstr "kan ikke oprette symbolsk lnke %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 "stter 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 tl strrelsen med flere gange for hrde lnker\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 strrelsen 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 strste dybde %s"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "kan ikke bde summere og vise alle strrelser"
-#: 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 frste tegn af et almindelig regulrt 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 linjenummerfelt: \"%s\""
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 HJRE_FIL\n"
+
#~ msgid "*** invalid date/time ***"
#~ msgstr "*** ugyldig datoi/klokkeslt ***"
diff --git a/po/de.po b/po/de.po
index 72aead0dd..07cec703f 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 <piefel@informatik.hu-berlin.de>\n"
"Language-Team: German <de@li.org>\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 07201b002..6550fbf82 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 <simos@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\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"
@@ -8479,6 +8489,10 @@ msgid ""
msgstr ""
#
+#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
+#~ msgstr ": %s []... Ѽ_ź ɼ_ź\n"
+
+#
#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr " : `%s'"
diff --git a/po/es.po b/po/es.po
index 73b7459aa..65e997333 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 <sanvila@unex.es>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
@@ -155,7 +155,7 @@ msgstr "tamao del bloque"
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 da 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 invlido"
-#: lib/userspec.c:149
+#: lib/userspec.c:148
msgid "invalid group"
msgstr "grupo invlido"
-#: 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 numrico"
-#: 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 invlido: %s"
-#: lib/xmemcoll.c:54 src/expr.c:711
+#: lib/xmemcoll.c:54 src/expr.c:740
msgid "string comparison failed"
msgstr "la comparacin 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 ""
# Vase la excelente pelcula "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 raz a %s"
msgid "cannot chdir to root directory"
msgstr "no se puede cambiar al directorio raz"
-#: 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 comprobacin CRC y el nmero 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 [OPCIN]... 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 ""
+
# cmo 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 "atencin: se ha especificado el fichero origen %s ms 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 recin 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 destruira 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 destruira 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 simblico cclico %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 simblicos 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 simblico %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 :) Djalo 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 simblico %s"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, c-format
msgid "cannot create symbolic link %s"
msgstr "no se puede crear el enlace simblico %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 (restauracin)\n"
@@ -1925,8 +1936,6 @@ msgid ""
"A line OFFSET is a required `+' or `-' followed by a positive integer.\n"
msgstr ""
"\n"
-"Lee la entrada estndar si FICHERO es `-'. Cada PLANTILLA puede ser:\n"
-"\n"
" NMERO_LNEA copia a partir de este nmero de lnea excluida ella\n"
" /EXPREG/[DESPLAZ] copia sin incluir las lneas que coincidan con EXPREG\n"
" %%EXPREG%%[DESPLAZ] comienza a partir de la lnea que coincida con "
@@ -2336,12 +2345,10 @@ msgstr "no se puede obtener la hora del da"
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 ponis 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 tamaos 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 tamao 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 lnea 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 ""
"ATENCIN: Utilice --si, no -H; el significado de la opcin -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 mxima invlida %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 "atencin: 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 "atencin: 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 algn sitio ms? 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 ""
"atencin: ERB no transportable: `%s': utilizar `^' como el primer carcter\n"
"de la expresin regular bsica 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 numrico"
-#: src/expr.c:613
+#: src/expr.c:638
msgid "division by zero"
msgstr "divisin 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 [OPCIN]... 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 nmero de lnea invlido: %s"
msgid "invalid line numbering format: %s"
msgstr "formato de numeracin de lneas invlido: %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 OPCIN\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 seales 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 estndar"
-#: src/nohup.c:133
+#: src/nohup.c:134
#, c-format
msgid "appending output to %s"
msgstr "se aade 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 estndar"
@@ -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 ms pequeo 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 transicin 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 [OPCIN]... FICHERO1 FICHERO2\n"
+
#~ msgid "*** invalid date/time ***"
#~ msgstr "*** fecha/hora invlida ***"
diff --git a/po/et.po b/po/et.po
index 10e1cb521..d6a402c2f 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 <Toomas.Soome@microlink.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
@@ -151,7 +151,7 @@ msgstr "bloki suurus"
msgid "failed to return to initial working directory"
msgstr "esialgsesse tkataloogi 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 trkkida"
@@ -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 "snede vrdlus ebannestus"
-#: 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 "Vrreldi snesid %s ja %s."
@@ -392,7 +392,7 @@ msgstr "Vrreldi snesid %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
@@ -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 nnestu %s iguste muutmine olekusse %04lo (%s)\n"
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "%s igused jeti %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 nnestu lugeda"
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 ebannestus"
@@ -908,7 +908,7 @@ msgstr "%s ei nnestu juurkataloogiks seada"
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 "ksklust %s ei saa kivitada"
@@ -935,18 +935,29 @@ msgstr ""
"Vljasta 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 [VTI]... VASAK_FAIL PAREM_FAIL\n"
+msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
+msgstr "Kasutamine: %s [VTI]... 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 ""
"Vrdle ridahaaval jrjestatud 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 nnestu"
msgid "skipping file %s, as it was replaced while being copied"
msgstr "jtan %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 "jtan kataloogi %s vahele"
-#: src/copy.c:855
+#: src/copy.c:860
#, c-format
msgid "warning: source file %s specified more than once"
msgstr "hoiatus: lhtefail %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 tsta 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 hvitaks 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 hvitaks 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 tsta iseenda alamkataloogi %s"
-#: src/copy.c:1266
+#: src/copy.c:1284
#, c-format
msgid "cannot move %s to %s"
msgstr "ei nnestu tsta %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 ebannestus: %s -> %s; allikat ei saa "
"kustutada"
-#: src/copy.c:1306
+#: src/copy.c:1324
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "tsklilist 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 silitada"
-#: src/copy.c:1502
+#: src/copy.c:1520
#, c-format
msgid "%s has unknown file type"
msgstr "%s on tundmatut tpi fail"
-#: src/copy.c:1535
+#: src/copy.c:1553
#, c-format
msgid "preserving times for %s"
msgstr "jtan %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 silitada"
-#: 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=TP ra vljasta infot antud tpi failissteemidest\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 vljasta 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 ksurea 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 vtme thendus 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 sgavus %s"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "korraga ei saa summeerida ja nidata kiki"
-#: 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 vtmega --max-depth=%d"
@@ -2783,7 +2796,7 @@ msgstr ""
msgid "syntax error"
msgstr "sntaksi 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 smbolina 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 ""
"vrtused on jrgnevad:\n"
"\n"
-#: src/join.c:158
-#, c-format
-msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Kasutamine: %s [VTI]... 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 vlja laius: %s"
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 KSKLUS [ARGUMENT]...\n"
" vi: %s VTI\n"
-#: src/nohup.c:59
+#: src/nohup.c:60
msgid ""
"Run COMMAND, ignoring hangup signals.\n"
"\n"
@@ -4555,21 +4563,25 @@ msgstr ""
"Kivita KSKLUS, 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 ebannestus"
-#: src/nohup.c:131
+#: src/nohup.c:132
msgid "failed to redirect standard output"
msgstr "standardvljundi mbersuunamine ebannestus"
-#: src/nohup.c:133
+#: src/nohup.c:134
#, c-format
msgid "appending output to %s"
msgstr "lisan vljundi %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 ebannestus"
@@ -5840,12 +5852,12 @@ msgstr ""
" -w, --equal-width kasuta vrdse laiusega vlju, tida 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 mra mlupuhvri 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 ""
"Vljasta korduvalt rida antud snedega vi `y'.\n"
"\n"
+
+#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
+#~ msgstr "Kasutamine: %s [VTI]... VASAK_FAIL PAREM_FAIL\n"
diff --git a/po/fi.po b/po/fi.po
index c87b743af..e014c6b21 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 <lanurmi@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\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 5119a33be..49f0d519c 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 <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\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 rpertoire 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 crer le rpertoire %s"
@@ -232,21 +232,21 @@ msgstr "ne peut convertir U+%04X un jeu local de caractres"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "ne peut convertir U+%04X au jeu local de caractres: %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 "
"numrique"
-#: 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 chane"
-#: 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 "Dfinir LC_ALL= C pour contourner le problme."
-#: 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 chanes compares taient %s et %s."
@@ -394,7 +394,7 @@ msgstr "Les chanes compares taient %s et %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
@@ -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 "chec du changement de mode de %s %04lo (%s).\n"
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "Le mode d'accs 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 accder %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 rpertoire %s"
@@ -709,7 +709,7 @@ msgstr "ne peut lire le rpertoire %s"
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 rpertoire racine vers %s"
msgid "cannot chdir to root directory"
msgstr "ne peut aller vers le rpertoire 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 excuter 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 tris 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 valuer par fstat() %s"
msgid "skipping file %s, as it was replaced while being copied"
msgstr "escamotage du fichier %s, parce qu<il a /t/ remplac/ durant la copie"
-#: 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"
@@ -1017,213 +1028,213 @@ msgstr "ne peut enlever %s"
msgid "cannot create regular file %s"
msgstr "ne peut crer le fichier rgulier %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 "lecture de %s"
-#: src/copy.c:358 src/head.c:437
+#: src/copy.c:363 src/head.c:437
#, c-format
msgid "cannot lseek %s"
msgstr "ne peut reprer par 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 "criture de %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 "fermeture de %s"
-#: src/copy.c:630
+#: src/copy.c:635
#, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
msgstr "%s: craser %s, en outrepassant le mode %04lo? "
-#: src/copy.c:636
+#: src/copy.c:641
#, c-format
msgid "%s: overwrite %s? "
msgstr "%s: craser %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 "ne peut valuer %s"
-#: src/copy.c:841
+#: src/copy.c:846
#, c-format
msgid "omitting directory %s"
msgstr "omission du rpertoire %s"
-#: src/copy.c:855
+#: src/copy.c:860
#, c-format
msgid "warning: source file %s specified more than once"
msgstr "AVERTISSEMENT: fichier source %s spcifi plus d'une fois"
-#: 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 et %s identifient le mme fichier."
-#: src/copy.c:910
+#: src/copy.c:915
#, c-format
msgid "cannot overwrite non-directory %s with directory %s"
msgstr "ne peut craser le non-rpertoire %s par le rpertoire %s"
-#: src/copy.c:927
+#: src/copy.c:932
#, c-format
msgid "will not overwrite just-created %s with %s"
msgstr "n'crasera pas %s qui vient d'tre cr par %s"
-#: src/copy.c:938
+#: src/copy.c:943
#, c-format
msgid "cannot overwrite directory %s with non-directory"
msgstr "ne peut craser le rpertoire %s par un non-rpertoire"
-#: src/copy.c:999
+#: src/copy.c:1004
#, c-format
msgid "cannot overwrite directory %s"
msgstr "ne peut craser le rpertoire %s"
-#: src/copy.c:1008
+#: src/copy.c:1013
#, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "ne peut dplacer le rpertoire dans un non-rpertoire: %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 dtruire la source: %s n'a pas t dplac."
-#: 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 dtruire 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 rpertoire %s dans lui-mme %s"
-#: src/copy.c:1143
+#: src/copy.c:1161
#, c-format
msgid "will not create hard link %s to directory %s"
msgstr "ne peut crer un lien direct %s vers le rpertoire %s"
-#: src/copy.c:1169
+#: src/copy.c:1187
#, c-format
msgid "cannot create hard link %s to %s"
msgstr "ne peut crer 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 dplacer %s vers un sous-rpertoire de lui-mme %s"
-#: src/copy.c:1266
+#: src/copy.c:1284
#, c-format
msgid "cannot move %s to %s"
msgstr "ne peut dplacer %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 dplacement inter-priphrique: %s vers %s; incapable de dtruire "
"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 crer des liens symboliques relatifs\n"
"seulement que dans le rpertoire courant."
-#: src/copy.c:1390
+#: src/copy.c:1408
#, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "ne peut crer un lien symbolique %s vers %s"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, c-format
msgid "cannot create link %s"
msgstr "ne peut crer 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 crer le fifo %s"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, c-format
msgid "cannot create special file %s"
msgstr "ne peut crer le fichier spcial %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 crer 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 prservation du propritaire pour %s"
-#: src/copy.c:1502
+#: src/copy.c:1520
#, c-format
msgid "%s has unknown file type"
msgstr "%s possde un type de fichier inconnu."
-#: src/copy.c:1535
+#: src/copy.c:1553
#, c-format
msgid "preserving times for %s"
msgstr "prservation des dates pour %s"
-#: src/copy.c:1560
+#: src/copy.c:1578
#, c-format
msgid "failed to lookup file %s"
msgstr "chec de reprage du fichier `%s'"
-#: src/copy.c:1565
+#: src/copy.c:1583
#, c-format
msgid "failed to preserve authorship for %s"
msgstr "chec de prservation du propritaire 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 dsarchiver %s"
-#: src/copy.c:1610
+#: src/copy.c:1628
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s -> %s (dsarchivage)\n"
@@ -2417,7 +2428,7 @@ msgstr ""
" de systme de fichiers\n"
" -v (ignore)\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 dnombrer 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"
" systmes 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 bientt 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 rsum et toutes les entres."
-#: src/du.c:703
+#: src/du.c:705
msgid "warning: summarizing is the same as using --max-depth=0"
msgstr ""
"AVERTISSEMENT: le rsum est identique si l'option --max-dept=0 est utilise"
-#: 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"
"caractre d'une expression rgulire 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 numrique"
-#: src/expr.c:613
+#: src/expr.c:638
msgid "division by zero"
msgstr "division par zro"
@@ -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 numrotation de ligne invalide: %s"
msgid "invalid line numbering format: %s"
msgstr "format de numrotation 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 ""
"xcuter 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 zros de tte\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 SParateur au lieu de non-blanc "
-"par les transitions d'espace blancs\n"
+"pour les transitions d'espace\n"
" -T, --temporary-directory=RP utiliser le RPertoire pour les fichiers "
"temporaires, non pas $TMPDIR ou %s\n"
" options multiples pour spcifier de "
"multiples rpertoires\n"
" -u, --unique avec -c: vrifier 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 rptition une ligne de caractres telle que spcifie\n"
"par CHANE 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 a8359f4ed..b9dc4a020 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 <scannell@SLU.EDU>\n"
"Language-Team: Irish <ga@li.org>\n"
"MIME-Version: 1.0\n"
@@ -155,7 +155,7 @@ msgstr "tomhas bloc"
msgid "failed to return to initial working directory"
msgstr "nl aon fhil ar an chad 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 fidir an chomhadlann %s a chruth"
@@ -255,19 +255,19 @@ msgstr "n fidir U+%04X a thiont chuig an fhoireann carachtar itiil"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "n fidir U+%04X a thiont chuig an fhoireann carachtar itiil: %s"
-#: lib/userspec.c:148
+#: lib/userspec.c:147
msgid "invalid user"
msgstr "sideoir neamhbhail"
-#: lib/userspec.c:149
+#: lib/userspec.c:148
msgid "invalid group"
msgstr "grpa neamhbhail"
-#: lib/userspec.c:151
+#: lib/userspec.c:150
msgid "cannot get the login group of a numeric UID"
msgstr "nl aon fhil ar an ghrpa don UID uimhriil seo"
-#: lib/userspec.c:153
+#: lib/userspec.c:152
msgid "cannot omit both user and group"
msgstr "n fidir an t-sideoir agus an grpa araon a fhgil ar lr"
@@ -393,15 +393,15 @@ msgstr ""
msgid "invalid argument: %s"
msgstr "argint neamhbhail: %s"
-#: lib/xmemcoll.c:54 src/expr.c:711
+#: lib/xmemcoll.c:54 src/expr.c:740
msgid "string comparison failed"
msgstr "Teipeadh comparid idir teaghrin"
-#: 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 fidir 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 comparid idir na teaghrin %s agus %s."
@@ -415,7 +415,7 @@ msgstr "Rinneadh comparid idir na teaghrin %s agus %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
@@ -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 "norbh fhidir an mhodh de %s a athr go %04lo (%s)\n"
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "coimedadh 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 "nl %s ar fil"
-#: 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 fidir an chomhadlann %s a lamh"
@@ -717,7 +717,7 @@ msgstr "n fidir an chomhadlann %s a lamh"
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 fidir an framhchomhadlann a athr go %s"
msgid "cannot chdir to root directory"
msgstr "n fidir chdir a dhanamh go dt an fhramhchomhadlann"
-#: 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 fidir an t-ord %s a rith"
@@ -969,18 +969,29 @@ msgstr ""
"Taispein suim seicela CRC agus lon 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 "sid: %s [ROGHA]... COMHAD_AR_CLE COMHAD_AR_DHEIS\n"
+msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
+msgstr "sid: %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 ""
"Dan comparid idir COMHAD_AR_CLE agus COMHAD_AR_DHEIS lne ar lne.\n"
@@ -994,7 +1005,7 @@ msgstr ""
msgid "cannot open %s for reading"
msgstr "n fidir %s a oscailt chun lamh"
-#: 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 fidir %s a `fstat'"
msgid "skipping file %s, as it was replaced while being copied"
msgstr "ag gabhil thar an chomhad %s; bh s curtha as it agus chipeil"
-#: 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 fidir %s a scriosadh"
msgid "cannot create regular file %s"
msgstr "n fidir gnthchomhad %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 lamh %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 fidir %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 scrobh %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 dnadh %s"
-#: src/copy.c:630
+#: src/copy.c:635
#, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
msgstr "%s: forscrobh %s agus sraigh modh %04lo? "
-#: src/copy.c:636
+#: src/copy.c:641
#, c-format
msgid "%s: overwrite %s? "
msgstr "%s: forscrobh %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 fidir %s a `stat'"
-#: src/copy.c:841
+#: src/copy.c:846
#, c-format
msgid "omitting directory %s"
msgstr "ag fgil na comhadlainne %s ar lr"
-#: 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 nos m n uair amhin"
-#: 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 canna"
-#: src/copy.c:910
+#: src/copy.c:915
#, c-format
msgid "cannot overwrite non-directory %s with directory %s"
msgstr ""
"n fidir forscrobh a dhanamh 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 "diltaodh forscrobh 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 fidir forscrobh a dhanamh ar %s (comhadlann) le gnthchomhad"
-#: src/copy.c:999
+#: src/copy.c:1004
#, c-format
msgid "cannot overwrite directory %s"
msgstr "n fidir an chomhadlann %s a fhorscrobh"
-#: src/copy.c:1008
+#: src/copy.c:1013
#, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "n fidir comhadlann a aistri go dt gnthchomhad: %s -> %s"
-#: src/copy.c:1031
+#: src/copy.c:1036
#, c-format
msgid "backing up %s would destroy source; %s not moved"
msgstr "scriosfadh cltaca de %s an comhad foinse; n aistrodh %s"
-#: src/copy.c:1032
+#: src/copy.c:1037
#, c-format
msgid "backing up %s would destroy source; %s not copied"
msgstr "scriosfadh cltaca de %s an comhad foinse; n chipeladh %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 fidir cltaca a dhanamh ar %s"
-#: src/copy.c:1086 src/ln.c:314
+#: src/copy.c:1091 src/ln.c:314
#, c-format
msgid " (backup: %s)"
msgstr " (cltaca: %s)"
-#: src/copy.c:1136
+#: src/copy.c:1154
#, c-format
msgid "cannot copy a directory, %s, into itself, %s"
msgstr ""
"n fidir an chomhadlann %s a chipeil isteach sa chomhadlann fin, %s"
-#: src/copy.c:1143
+#: src/copy.c:1161
#, c-format
msgid "will not create hard link %s to directory %s"
msgstr "n chruthfar 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 fidir 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 fidir an chomhadlann %s a aistri go dt fochomhadlann d chuid fin, %s"
-#: src/copy.c:1266
+#: src/copy.c:1284
#, c-format
msgid "cannot move %s to %s"
msgstr "n fidir %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 glasanna teipthe: %s go %s; n fidir an sprioc a scriosadh"
-#: src/copy.c:1306
+#: src/copy.c:1324
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "n fidir nasc siombalach ciorclach %s a chipeil"
-#: src/copy.c:1383
+#: src/copy.c:1401
#, c-format
msgid "%s: can make relative symbolic links only in current directory"
msgstr ""
"%s: n folir naisc siombalacha coibhneasta a dhanamh sa chomhadlann oibre"
-#: src/copy.c:1390
+#: src/copy.c:1408
#, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "n fidir nasc siombalach a dhanamh %s go %s"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, c-format
msgid "cannot create link %s"
msgstr "n fidir 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 fidir an `fifo' %s a chruth"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, c-format
msgid "cannot create special file %s"
msgstr "n fidir 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 fidir nasc siombalach %s a lamh"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, c-format
msgid "cannot create symbolic link %s"
msgstr "n fidir 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 "norbh fhidir an inireacht de %s a chaomhn"
-#: src/copy.c:1502
+#: src/copy.c:1520
#, c-format
msgid "%s has unknown file type"
msgstr "t %s de chinel 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 "norbh fhidir 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 fidir d-chltaca a dhanamh ar %s"
-#: src/copy.c:1610
+#: src/copy.c:1628
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s -> %s (d-chltaca)\n"
@@ -2358,7 +2369,7 @@ msgstr ""
" -x, --exclude-type=CINEL n taispein crais comhaid den chinel CINEL\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 COSN ms 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 mid san ireamh gach uair ms 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 taispein ach an tsuim iomln\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 "iomln"
-#: 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 fidir coimri a dhanamh agus gach iontril a thaispeint"
-#: 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 chile"
@@ -2846,7 +2859,7 @@ msgstr ""
msgid "syntax error"
msgstr "earrid chomhrire"
-#: 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 ionadaochta do-iompartha: `%s': n iniompartha `^'\n"
"a sid ar tosach slonn ionadaochta bunsach; ag danamh neamhshuim air"
-#: src/expr.c:607 src/expr.c:646
+#: src/expr.c:632 src/expr.c:674
msgid "non-numeric argument"
msgstr "argint neamhuimhriil"
-#: 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 "sid: %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 "rimseleithead lne-uimhreach neamhbhail: %s"
msgid "invalid line numbering format: %s"
msgstr "incrimint lne-uimhreach neamhbhail: %s"
-#: src/nohup.c:53
+#: src/nohup.c:54
#, c-format
msgid ""
"Usage: %s COMMAND [ARG]...\n"
@@ -4626,7 +4634,7 @@ msgstr ""
"sid: %s ORD [ARGINT]...\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 fidir %s a oscailt"
-#: src/nohup.c:131
+#: src/nohup.c:132
msgid "failed to redirect standard output"
msgstr "norbh fhidir aschur caighdenach 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 "norbh fhidir earrid chaighdenach 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=MID maoln promhchuimhne = MID\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 sid CAR in ionad athr neamh- go sps bn\n"
" -T, --temporary-directory=COMHADLANN cuir comhaid sealadacha i "
"gCOMHADLANN\n"
-" in ionad $TMPDIR n %s. Comharthaonn an "
+" in ionad $TMPDIR n %s; comharthaonn an "
"rogha\n"
" seo go leor comhadlanna go leor\n"
-" -u, --unique le -c: deimhnigh srtil gan dblaigh\n"
-" i ngach cs eile, n taispein ach lnte "
-"uathla\n"
+" -u, --unique le -c: deimhnigh srtil gan dblaigh;\n"
+" gan -c, n taispein ach lnte uathla\n"
#: src/sort.c:319
msgid " -z, --zero-terminated end lines with 0 byte, not newline\n"
@@ -8680,5 +8691,8 @@ msgstr ""
"Priontil lne ars agus ars le gach TEAGHRN ceaptha, n `y'.\n"
"\n"
+#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
+#~ msgstr "sid: %s [ROGHA]... COMHAD_AR_CLE COMHAD_AR_DHEIS\n"
+
#~ msgid "*** invalid date/time ***"
#~ msgstr "*** dta/am neamhbhail ***"
diff --git a/po/gl.po b/po/gl.po
index 0ef552259..593229964 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 <jtarrio@trasno.net>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -150,7 +150,7 @@ msgstr "tamao de bloque"
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 numrico"
-#: 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 comparacin 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 informacin da versin e sar\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 traduccin a <proxecto@trasno.net>.\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 comprobacin CRC e o nmero 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 [OPCIN]... FICHEIRO_ESQUERDO FICHEIRO_DEREITO\n"
+msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
+msgstr "Uso: %s [OPCIN]... 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 lia 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 destruira 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 destruira 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 ligazn simblica cclica %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 ligazns simblicas 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 carcter"
-#: 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 "ligazn simblica"
-#: 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 descoecido"
-#: 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 vlida: \"%s\""
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "non se pode resumir e amosar tdalas 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 estndar"
-#: 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 carcter\n"
"cunha expresin regular bsica 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 lmite"
-#: 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 [OPCIN]... FICHEIRO1 FICHEIRO2\n"
-
#: src/join.c:162
#, fuzzy
msgid ""
@@ -4313,7 +4320,7 @@ msgstr "ancho do campo do nmero de lia incorrecto: \"%s\""
msgid "invalid line numbering format: %s"
msgstr "incremento de nmeros de lia 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 [OPCIN]\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 "sada estndar"
-#: 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 [OPCIN]... FICHEIRO_ESQUERDO FICHEIRO_DEREITO\n"
+
#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr "anchura non vlida: \"%s\""
diff --git a/po/hu.po b/po/hu.po
index a2b6dc775..09fb66a99 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 Kovcs <emese@gnome.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -155,7 +155,7 @@ msgstr "blokkmret"
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 kvetkez knyvtrat ltrehozni: %s"
@@ -236,19 +236,19 @@ msgstr "nem lehet helyi karakterkszletbe talaktani a kvetkezt: U+%04X"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "nem lehet U+%04X-t helyi karakterkszletbe talaktani: %s"
-#: lib/userspec.c:148
+#: lib/userspec.c:147
msgid "invalid user"
msgstr "rvnytelen felhasznl"
-#: lib/userspec.c:149
+#: lib/userspec.c:148
msgid "invalid group"
msgstr "rvnytelen csoport"
-#: lib/userspec.c:151
+#: lib/userspec.c:150
msgid "cannot get the login group of a numeric UID"
msgstr "az UID-hez tartoz bejelentkezsi csoportot nem lehet megllaptani"
-#: lib/userspec.c:153
+#: lib/userspec.c:152
msgid "cannot omit both user and group"
msgstr "nem lehet egyszerre a csoportot s a felhasznlt is elhagyni"
@@ -358,15 +358,15 @@ msgstr ""
msgid "invalid argument: %s"
msgstr "A `%s' argumentum rvnytelen ehhez: %s"
-#: lib/xmemcoll.c:54 src/expr.c:711
+#: lib/xmemcoll.c:54 src/expr.c:740
msgid "string comparison failed"
msgstr "karakterlnc-sszehasonlts 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 "lltsd be az LC_ALL='C' -t a problma elkerlshez."
-#: 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 sszehasonltott karakterlncok: %s s %s."
@@ -380,7 +380,7 @@ msgstr "Az sszehasonltott karakterlncok: %s 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
@@ -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 hibkat jelentsd a <bug-fileutils@gnu.org> cmen."
#: 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 jogosultsgainak megvltoztatsa %04lo -ra sikertelen (%s)\n"
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "%s jogosultsga maradt a kvetkez: %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: hozzfrs 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 kvetkez knyvtrat ltrehozni: %s"
@@ -654,7 +654,7 @@ msgstr "nem lehet a kvetkez knyvtrat ltrehozni: %s"
msgid "changing permissions of %s"
msgstr "%s jogosultsgainak megvltoztatsa"
-#: 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 kvetkez knyvtrba lpni: %s"
msgid "cannot chdir to root directory"
msgstr "nem lehet a kvetkez knyvtrba lpni: %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 trlse 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 "Hasznlat: %s [KAPCSOL]... [FJL]\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 megnyitsa olvassra 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 fjl kihagysa, mivel kicserltk msols kzben"
-#: 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 trlni a kvetkezt: `%s'"
msgid "cannot create regular file %s"
msgstr "nem lehet ltrehozni a kvetkez regulris fjlt: %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 olvassa"
-#: 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 rsa"
-#: 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 lezrsa"
-#: src/copy.c:630
+#: src/copy.c:635
#, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
msgstr "%s: %s fellrsa %04lo md figyelmen kvl hagysval? "
-#: src/copy.c:636
+#: src/copy.c:641
#, c-format
msgid "%s: overwrite %s? "
msgstr "%s: fellrod %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 knyvtr kihagysa"
-#: src/copy.c:855
+#: src/copy.c:860
#, c-format
msgid "warning: source file %s specified more than once"
msgstr "vigyzat: %s forrsfjl tbbszr 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 fjl"
-#: src/copy.c:910
+#: src/copy.c:915
#, c-format
msgid "cannot overwrite non-directory %s with directory %s"
msgstr "%s nem-knyvtrat nem lehet %s knyvtrral fellrni"
-#: src/copy.c:927
+#: src/copy.c:932
#, c-format
msgid "will not overwrite just-created %s with %s"
msgstr "az ppen ltrehozott %s-t nem fogom fellrni ezzel: %s"
-#: src/copy.c:938
+#: src/copy.c:943
#, c-format
msgid "cannot overwrite directory %s with non-directory"
msgstr "%s knyvtrat nem lehet nem-knyvtrral fellrni"
-#: src/copy.c:999
+#: src/copy.c:1004
#, c-format
msgid "cannot overwrite directory %s"
msgstr "nem lehet %s knyvtrat fellrni"
-#: src/copy.c:1008
+#: src/copy.c:1013
#, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "a knyvtrat nem lehet nem-knyvtrba thelyezni: %s -> %s"
-#: src/copy.c:1031
+#: src/copy.c:1036
#, c-format
msgid "backing up %s would destroy source; %s not moved"
msgstr ""
"biztonsgi ments %s-rl megsemmisten a forrst:\n"
"%s nem kerlt thelyezsre"
-#: src/copy.c:1032
+#: src/copy.c:1037
#, c-format
msgid "backing up %s would destroy source; %s not copied"
msgstr ""
"biztonsgi ments %s-rl megsemmisten a forrst:\n"
"%s nem kerlt msolsra"
-#: src/copy.c:1050 src/ln.c:279
+#: src/copy.c:1055 src/ln.c:279
#, c-format
msgid "cannot backup %s"
msgstr "%s biztonsgi mentse sikertelen"
-#: src/copy.c:1086 src/ln.c:314
+#: src/copy.c:1091 src/ln.c:314
#, c-format
msgid " (backup: %s)"
msgstr " (biztonsgi ments: %s)"
-#: src/copy.c:1136
+#: src/copy.c:1154
#, c-format
msgid "cannot copy a directory, %s, into itself, %s"
msgstr "%s knyvtrat nem lehet sajt magba (%s) msolni"
-#: src/copy.c:1143
+#: src/copy.c:1161
#, c-format
msgid "will not create hard link %s to directory %s"
msgstr "%2$s knyvtrra mutat %1$s hard link nem hozhat ltre"
-#: 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 ltrehozni"
-#: 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 sajt alknyvtrba (%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 ""
"eszkzkzi thelyezs sikertelen:\n"
"%s --> %s; cl trlse sikertelen"
-#: src/copy.c:1306
+#: src/copy.c:1324
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "%s krkrs linket nem lehet msolni"
-#: src/copy.c:1383
+#: src/copy.c:1401
#, c-format
msgid "%s: can make relative symbolic links only in current directory"
msgstr ""
"%s: relatv szimbolikus linkeket csak az aktulis\n"
"knyvtrban lehet ltrehozni"
-#: src/copy.c:1390
+#: src/copy.c:1408
#, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "nem lehet ltrehozni %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 kvetkez linket ltrehozni: %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 kvetkez fifot ltrehozni: %s"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, c-format
msgid "cannot create special file %s"
msgstr "nem lehet ltrehozni a kvetkez specilis fjlt: %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 kvetkez szimbolikus linket: %s"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, c-format
msgid "cannot create symbolic link %s"
msgstr "nem lehet ltrehozni a kvetkez 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 tulajdonosnak megtartsa"
-#: src/copy.c:1502
+#: src/copy.c:1520
#, c-format
msgid "%s has unknown file type"
msgstr "%s fjltpusa ismeretlen"
-#: src/copy.c:1535
+#: src/copy.c:1553
#, c-format
msgid "preserving times for %s"
msgstr "%s sszes idejnek megtartsa"
-#: src/copy.c:1560
+#: src/copy.c:1578
#, fuzzy, c-format
msgid "failed to lookup file %s"
msgstr "%s sszes idejnek megtartsa"
-#: src/copy.c:1565
+#: src/copy.c:1583
#, fuzzy, c-format
msgid "failed to preserve authorship for %s"
msgstr "%s tulajdonosnak megtartsa"
-#: src/copy.c:1584
+#: src/copy.c:1602
#, c-format
msgid "setting permissions for %s"
msgstr "%s jogosultsgainak belltsa"
-#: 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 biztonsgi ments visszalltsa sikertelen"
-#: src/copy.c:1610
+#: src/copy.c:1628
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s -> %s (biztonsgi ments visszalltsa)\n"
@@ -2171,7 +2182,7 @@ msgstr ""
" -x, --exclude-type=TPUS a megadott fjlrendszereket nem listzza ki\n"
" -v (figyelmen kvl 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 tbbszr szmolja a mretet, 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 alknyvtrakat nem szmolja bele\n"
" -s, --summarize argumentumonknt 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 knyvtr 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 "rvnytelen maximlis mlysg: %s"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr ""
"nem lehet egyszerre sszestst krni s minden bejegyzst megjelenteni"
-#: src/du.c:703
+#: src/du.c:705
msgid "warning: summarizing is the same as using --max-depth=0"
msgstr ""
"vigyzat: az sszests megegyezik a --max-depth=0 kapcsol hasznlatval"
-#: src/du.c:709
+#: src/du.c:711
#, c-format
msgid "warning: summarizing conflicts with --max-depth=%d"
msgstr "vigyzat: az sszests krse ellenkezik a --max-depth=%d kapcsolval"
@@ -2569,19 +2581,19 @@ msgstr ""
msgid "syntax error"
msgstr "rsi 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 szma"
-#: src/expr.c:613
+#: src/expr.c:638
msgid "division by zero"
msgstr ""
@@ -3042,11 +3054,6 @@ msgstr ""
"Az rvnyes rtkek a kvetkezk:\n"
"\n"
-#: src/join.c:158
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Hasznlat: %s [KAPCSOL]... [FJL]\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 "rvnytelen sorhossz: %s"
msgid "invalid line numbering format: %s"
msgstr "rvnytelen sorhossz: %s"
-#: src/nohup.c:53
+#: src/nohup.c:54
#, fuzzy, c-format
msgid ""
"Usage: %s COMMAND [ARG]...\n"
" or: %s OPTION\n"
msgstr "Hasznlat: %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 idejnek megtartsa"
-#: src/nohup.c:131
+#: src/nohup.c:132
#, fuzzy
msgid "failed to redirect standard output"
msgstr "szabvnyos kimenet"
-#: src/nohup.c:133
+#: src/nohup.c:134
#, fuzzy, c-format
msgid "appending output to %s"
msgstr "%s csoportjnak megvltoztatsa"
-#: 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"
@@ -7435,6 +7446,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
+#~ msgstr "Hasznlat: %s [KAPCSOL]... [FJL]\n"
+
+#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr "rvnytelen md: %s"
diff --git a/po/it.po b/po/it.po
index dd33bda63..ec2dd5709 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 <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\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"
@@ -8231,6 +8242,10 @@ msgstr ""
"\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 913889d1b..1b0f71473 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 <ma@yama-ga.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\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 "Ӥʸ %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
@@ -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 Υ⡼ɤ %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
#, 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 "ǥ쥯ȥ %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 "ɹ߼"
@@ -897,7 +897,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() ¹ԤǤޤ"
@@ -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 "ǥ쥯ȥ %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 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 "եλֹ椬ޤ: `%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"
@@ -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 fe2db2d0f..506a4ca59 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 <cwryu@debian.org>\n"
"Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\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 " ڿ %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 ""
"<%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 带 %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
#, 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 丮 chdir ϴ"
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' (stat) ϴ"
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 " ȣ ʵ : `%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"
@@ -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 5708db1ae..6948ae1b8 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 <kompyuta@kizito.freeuk.com>\n"
"Language-Team: Luganda <kompyuta@kizito.freeuk.com>\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 6eecec982..def74dfa7 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 <sebol@ikhlas.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\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 cc7b801e0..e2b74e3ad 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 <eivindt@multinet.no>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -154,7 +154,7 @@ msgstr "blokkstrrelse"
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 bde 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 %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
@@ -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 ""
"Rapportr feil til <bug-textutils@gnu.org>."
#: 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 utfre 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 HYRE_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 HYREFIL 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 ske 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 utfre 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 utfre 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: %s"
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 HYRE_FIL\n"
+
#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr "ugyldig bredde: %s"
diff --git a/po/nl.po b/po/nl.po
index ae994277b..35ff33616 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 <itimmermans@bigfoot.com>\n"
"Language-Team: Dutch <nl@li.org>\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 <nl@li.org>."
#: 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 kopiren"
-#: 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 kopiren 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 kopiren 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 kopiren 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 reservekopien\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 0a9506aee..b6163602c 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 <eivindt@multinet.no>\n"
"Language-Team: Norwegian <no@li.org>\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 utfre 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 ""
"Rapportr feil til <bug-textutils@gnu.org>."
#: 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 endre beskyttelse for %s til %04o (%s)\n"
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 utfre 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 utfre ioctl p %s"
@@ -677,7 +677,7 @@ msgstr "kan ikke utfre ioctl p %s"
msgid "changing permissions of %s"
msgstr "kan ikke utfre 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 utfre ioctl p %s"
msgid "cannot chdir to root directory"
msgstr "kan ikke utfre 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 utfre 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 HYRE_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 HYRE_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 utfre ioctl p %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"
@@ -942,209 +953,209 @@ msgstr "kan ikke utfre ioctl p %s"
msgid "cannot create regular file %s"
msgstr "kan ikke utfre 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 utfre 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 utfre ioctl p %s"
-#: src/copy.c:841
+#: src/copy.c:846
#, fuzzy, c-format
msgid "omitting directory %s"
msgstr "kan ikke utfre 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 utfre 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 utfre ioctl p %s"
-#: src/copy.c:999
+#: src/copy.c:1004
#, fuzzy, c-format
msgid "cannot overwrite directory %s"
msgstr "kan ikke utfre 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 utfre 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 utfre 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 gjre 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 utfre 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 utfre 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 utfre 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 utfre ioctl p %s"
-#: src/copy.c:1266
+#: src/copy.c:1284
#, fuzzy, c-format
msgid "cannot move %s to %s"
msgstr "kan ikke utfre 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 utfre ioctl p %s"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, fuzzy, c-format
msgid "cannot create link %s"
msgstr "kan ikke utfre 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 utfre ioctl p %s"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, fuzzy, c-format
msgid "cannot create special file %s"
msgstr "kan ikke utfre 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 utfre ioctl p %s"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, fuzzy, c-format
msgid "cannot create symbolic link %s"
msgstr "kan ikke utfre 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 utfre 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 utfre 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 strrelser 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 frste tegn av et vanlig regulrt 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: %s"
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 HYRE_FIL\n"
+
#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr "ugyldig felt-nummer: %s"
diff --git a/po/pl.po b/po/pl.po
index 308cda97f..888e75f11 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 <rzm@icm.edu.pl>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -158,7 +158,7 @@ msgstr "rozmiar bloku"
msgid "failed to return to initial working directory"
msgstr "nie udao si wrci do pocztkowego 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 mona utworzy katalogu %s"
@@ -239,19 +239,19 @@ msgstr "nie mona przeksztaci U+%04X do lokalnego zestawu znakw"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "nie mona przeksztaci U+%04X do lokalnego zestawu znakw: %s"
-#: lib/userspec.c:148
+#: lib/userspec.c:147
msgid "invalid user"
msgstr "bdny uytkownik"
-#: lib/userspec.c:149
+#: lib/userspec.c:148
msgid "invalid group"
msgstr "bdna grupa"
-#: lib/userspec.c:151
+#: lib/userspec.c:150
msgid "cannot get the login group of a numeric UID"
msgstr "Nie mona ustali grupy identyfikatora numerycznego UID"
-#: lib/userspec.c:153
+#: lib/userspec.c:152
msgid "cannot omit both user and group"
msgstr "nie mona pomin uytkownika i grupy rwnoczenie"
@@ -377,15 +377,15 @@ msgstr ""
msgid "invalid argument: %s"
msgstr "bdny argument: %s"
-#: lib/xmemcoll.c:54 src/expr.c:711
+#: lib/xmemcoll.c:54 src/expr.c:740
msgid "string comparison failed"
msgstr "nie udao si porwnanie acuchw znakw"
-#: 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 "Porwnywane acuchy znakw do %s i %s."
@@ -399,7 +399,7 @@ msgstr "Porwnywane acuchy znakw do %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
@@ -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 bdach wysyaj 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 udao si zmieni uprawnie do %s na %04lo (%s)\n"
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 dostpu 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 mona przeczyta katalogu %s"
@@ -703,7 +703,7 @@ msgstr "nie mona przeczyta katalogu %s"
msgid "changing permissions of %s"
msgstr "nie mona 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 "bd fts_read"
@@ -933,7 +933,7 @@ msgstr "nie mona zmieni katalogu root na %s"
msgid "cannot chdir to root directory"
msgstr "nie mona 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 mona uruchomic polecenia %s"
@@ -958,18 +958,29 @@ msgid ""
"\n"
msgstr "Wypisanie sumy CRC i liczby bajtw kadego 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 "Skadnia: %s [OPCJA]... LEWY_PLIK PRAWY_PLIK\n"
+msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
+msgstr "Skadnia: %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 ""
"Porwnanie posortowanych plikw LEWY_PLIK i PRAWY_PLIK linia po linii.\n"
@@ -983,7 +994,7 @@ msgstr ""
msgid "cannot open %s for reading"
msgstr "nie mona 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 mona wykona fstat na %s"
msgid "skipping file %s, as it was replaced while being copied"
msgstr "plik %s zosta ominity, 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 mona usun %s"
msgid "cannot create regular file %s"
msgstr "nie mona utworzy zwykego 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 mona 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 mona wykona stat na %s"
-#: src/copy.c:841
+#: src/copy.c:846
#, c-format
msgid "omitting directory %s"
msgstr "katalog %s zosta pominity"
-#: src/copy.c:855
+#: src/copy.c:860
#, c-format
msgid "warning: source file %s specified more than once"
msgstr "uwaga: plik rdowy %s pojawi si wicej 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 mona 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 mona zamaza wanie utworzonego %s plikiem %s"
-#: src/copy.c:938
+#: src/copy.c:943
#, c-format
msgid "cannot overwrite directory %s with non-directory"
msgstr "nie mona zamaza katalogu %s nie-katalogiem"
-#: src/copy.c:999
+#: src/copy.c:1004
#, c-format
msgid "cannot overwrite directory %s"
msgstr "nie mona zamaza katalogu %s"
-#: src/copy.c:1008
+#: src/copy.c:1013
#, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "nie mona 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 zniszczyoby rdo; %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 zniszczyoby rdo; %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 mona 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 mona 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 mona utworzy dowizania zwykego %s do katalogu %s"
-#: src/copy.c:1169
+#: src/copy.c:1187
#, c-format
msgid "cannot create hard link %s to %s"
msgstr "nie mona utworzy dowizania zwykego %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 mona przenie %s do wasnego podkatalogu %s"
-#: src/copy.c:1266
+#: src/copy.c:1284
#, c-format
msgid "cannot move %s to %s"
msgstr "nie mona 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 udao si przeniesienie midzy urzdzeniami: %s do %s; nie udao si "
"usuna pliku docelowego"
-#: src/copy.c:1306
+#: src/copy.c:1324
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "nie mona skopiowa cyklicznego dowizania 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: mona zrobi tylko wzgldne dowizanie symboliczne w biecym katalogu"
-#: src/copy.c:1390
+#: src/copy.c:1408
#, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "nie mona utworzy dowizania symbolicznego %s do %s"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, c-format
msgid "cannot create link %s"
msgstr "nie mona utworzy dowizania %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 mona utworzy potoku %s"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, c-format
msgid "cannot create special file %s"
msgstr "nie mona 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 mona przeczyta dowizania symbolicznego %s"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, c-format
msgid "cannot create symbolic link %s"
msgstr "nie mona utworzy dowizania 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 udao si zachowa wasnoci %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 udao si znale pliku %s"
-#: src/copy.c:1565
+#: src/copy.c:1583
#, c-format
msgid "failed to preserve authorship for %s"
msgstr "nie udao si zachowa autorstwa %s"
-#: src/copy.c:1584
+#: src/copy.c:1602
#, c-format
msgid "setting permissions for %s"
msgstr "nie mona 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 mona przywrci kopii zapasowej %s"
-#: src/copy.c:1610
+#: src/copy.c:1628
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s -> %s (przywrcenie kopii zapasowej)\n"
@@ -2363,7 +2374,7 @@ msgstr ""
" -x, --exclude-type=TYP pokazanie tylko systemw plikw 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 PLIKW - dowiza 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 jeeli plik ma\n"
" dowizania zwyke\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 uwzgldniania rozmiarw podkatalogw\n"
" -s, --summarize wypisanie tylko podsumowa dla kadego 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 ""
" poniej 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: uywaj --si zamiast -H; znaczenie opcji -H niedugo 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 "bdny maksymalny poziom zagbienia %s"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "nie mona rwnoczenie 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 moe by uyte razem z --max-depth=%d"
@@ -2853,7 +2866,7 @@ msgid "syntax error"
msgstr "bd skadni"
# troch niezrczne -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 wyraenia regularnego nie jest przenone;\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 ""
"Moliwe wartoci:\n"
"\n"
-#: src/join.c:158
-#, c-format
-msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Skadnia: %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 "bdna szeroko pola numeru linii: %s"
msgid "invalid line numbering format: %s"
msgstr "bdny 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 ""
"Skadnia: %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 ignorujcego sygnay 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 udao si otworzy %s"
-#: src/nohup.c:131
+#: src/nohup.c:132
msgid "failed to redirect standard output"
msgstr "nie udao si przekierowa standardowego wyjcia"
-#: src/nohup.c:133
+#: src/nohup.c:134
#, c-format
msgid "appending output to %s"
msgstr "doczanie wynikw 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 udao si przekierowa wyjcia standardowego bdu"
@@ -6029,12 +6041,12 @@ msgstr ""
" -w, --equal-width wypenienie zerami do rwnej szerokoci\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 gwnego bufora pamici\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 uycie SEPARATORA zamiast przejcia\n"
" odstp - nie-odstp\n"
-" -T, --temporary-directory=KATALOG uycie KATALOGU na pliki tymczasowe, "
-"nie\n"
-" $TMPDIR ani %s; wicej razy to wicej "
-"katalogw\n"
-" -u, --unique z -c: sprawdzenie cisego uporzdkowania\n"
+" -T, --temporary-directory=KATALOG uycie KATALOGU na pliki tymczasowe\n"
+" zamiast $TMPDIR lub %s; opcja uyta wicej "
+"razy\n"
+" definiuje wicej katalogw\n"
+" -u, --unique z -c: sprawdzenie cisego uporzdkowania;\n"
" bez -c: wypisanie tylko pierwszej z "
"identycznych\n"
" linii\n"
@@ -8801,3 +8813,6 @@ msgid ""
msgstr ""
"Powtarzanie na wyjciu linii ze wszystkimi podanymi ACUCH(AMI) albo `y'\n"
"\n"
+
+#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
+#~ msgstr "Skadnia: %s [OPCJA]... LEWY_PLIK PRAWY_PLIK\n"
diff --git a/po/pt.po b/po/pt.po
index 84be9aef9..16214f30d 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: Antnio Joo Serras Rendas <arendas@mail.telepac.pt>\n"
"Language-Team: Portugus <pt@li.org>\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 "no 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 invlido"
-#: lib/userspec.c:149
+#: lib/userspec.c:148
#, fuzzy
msgid "invalid group"
msgstr "opo invlida `%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 "no consigo mostrar s o utilizador e s o grupo"
@@ -354,15 +354,15 @@ msgstr ""
msgid "invalid argument: %s"
msgstr "argumento invlido `%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 informao de verso 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 "no 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 "no consigo obter a directoria actual"
@@ -637,7 +637,7 @@ msgstr "no consigo obter a directoria actual"
msgid "changing permissions of %s"
msgstr "aviso: no 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' no um ficheiro normal"
@@ -830,7 +830,7 @@ msgstr "aviso: no consigo mudar para a directoria %s"
msgid "cannot chdir to root directory"
msgstr "aviso: no 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 "no 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 "Utilizao: %s [OPO]... [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 "no 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 "no consigo alterar data"
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 "no consigo correr %s"
msgid "cannot create regular file %s"
msgstr "no 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 "no 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 "no consigo alterar data"
-#: src/copy.c:841
+#: src/copy.c:846
#, fuzzy, c-format
msgid "omitting directory %s"
msgstr "no 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' so 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: no 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: no posso escrever por cima de directoria com no-directoria"
-#: src/copy.c:938
+#: src/copy.c:943
#, fuzzy, c-format
msgid "cannot overwrite directory %s with non-directory"
msgstr "no consigo obter a directoria actual"
-#: src/copy.c:999
+#: src/copy.c:1004
#, fuzzy, c-format
msgid "cannot overwrite directory %s"
msgstr "no 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: no 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' no 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' no 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 "no 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 "no 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: no 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: no 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 "no 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: no consigo mudar para a directoria %s"
-#: src/copy.c:1266
+#: src/copy.c:1284
#, fuzzy, c-format
msgid "cannot move %s to %s"
msgstr "no 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: no consigo copiar ligao (link) simblica cclica"
-#: 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 ligaes (links) simblicas 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 "no consigo obter a directoria actual"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, fuzzy, c-format
msgid "cannot create link %s"
msgstr "no 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 "no consigo obter a directoria actual"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, fuzzy, c-format
msgid "cannot create special file %s"
msgstr "no 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 "no consigo ler ligao (link) simblica `%s'"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, fuzzy, c-format
msgid "cannot create symbolic link %s"
msgstr "no 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: no 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 "no 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 invlido `%s'"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "no 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 no-opo"
-#: src/expr.c:613
+#: src/expr.c:638
msgid "division by zero"
msgstr ""
@@ -2996,11 +3008,6 @@ msgstr ""
" caso contrrio\n"
" never, simple fazer \"backups\" simples sempre\n"
-#: src/join.c:158
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Utilizao: %s [OPO]... [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 invlido `%s'"
msgid "invalid line numbering format: %s"
msgstr "argumento inteiro invlido `%s'"
-#: src/nohup.c:53
+#: src/nohup.c:54
#, fuzzy, c-format
msgid ""
"Usage: %s COMMAND [ARG]...\n"
@@ -4085,28 +4092,32 @@ msgstr ""
"Utilizao: %s FORMATO [ARGUMENTO]...\n"
" ou: %s OPO\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 sada padro (stdout)"
-#: src/nohup.c:133
+#: src/nohup.c:134
#, fuzzy, c-format
msgid "appending output to %s"
msgstr "aviso: no 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"
@@ -7430,6 +7441,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
+#~ msgstr "Utilizao: %s [OPO]... [FICHEIRO]...\n"
+
+#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr "data invlida `%s'"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 730ebb669..7693d3489 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 <jcastro@vialink.com.br>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\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 "no possvel criar o diretrio %s"
@@ -242,19 +242,19 @@ msgstr "impossvel converter U+%04X para o conjunto local de caracteres"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "impossvel converter U+%04X para o conjunto local de caracteres: %s"
-#: lib/userspec.c:148
+#: lib/userspec.c:147
msgid "invalid user"
msgstr "usurio invlido"
-#: lib/userspec.c:149
+#: lib/userspec.c:148
msgid "invalid group"
msgstr "grupo invlido"
-#: 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 "no pode ignorar usurio e grupo"
@@ -364,15 +364,15 @@ msgstr ""
msgid "invalid argument: %s"
msgstr "argumento invlido %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 "impossvel 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 "imposvel ler diretrio %s"
@@ -685,7 +685,7 @@ msgstr "imposvel ler diretrio %s"
msgid "changing permissions of %s"
msgstr "mudando permisses 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 "impossvel mudar para o diretrio 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 "no pode executar a funo '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 [OPO]... 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 "no foi possvel 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 substitudo durante a cpia"
# , 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 "impossvel 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 "impossvel 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 "impossvel fazer stat em %s"
# , c-format
-#: src/copy.c:841
+#: src/copy.c:846
#, c-format
msgid "omitting directory %s"
msgstr "omitindo diretrio %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 so 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 "impossvel sobrescrever no-diretrio %s com diretrio %s"
-#: src/copy.c:927
+#: src/copy.c:932
#, c-format
msgid "will not overwrite just-created %s with %s"
msgstr "no sobrescrever recm-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 "impossvel sobrescrever diretrio %s com no-diretrio"
# , c-format
-#: src/copy.c:999
+#: src/copy.c:1004
#, c-format
msgid "cannot overwrite directory %s"
msgstr "impossvel sobrescrever diretrio %s"
# , c-format
-#: src/copy.c:1008
+#: src/copy.c:1013
#, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "imposvel mover diretrio para no-diretrio: %s -> %s"
-#: src/copy.c:1031
+#: src/copy.c:1036
#, c-format
msgid "backing up %s would destroy source; %s not moved"
msgstr "fazer cpia de %s iria destruir o original; `%s' no 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 no copiado"
-#: src/copy.c:1050 src/ln.c:279
+#: src/copy.c:1055 src/ln.c:279
#, c-format
msgid "cannot backup %s"
msgstr "impossvel 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 "impossvel copiar um diretrio, %s, para si prprio, %s"
# , c-format
-#: src/copy.c:1143
+#: src/copy.c:1161
#, c-format
msgid "will not create hard link %s to directory %s"
msgstr "no criar link fsico %s para diretrio %s"
# , c-format
-#: src/copy.c:1169
+#: src/copy.c:1187
#, c-format
msgid "cannot create hard link %s to %s"
msgstr "impossvel criar link fsico %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 "impossvel mover %s para um subdiretrio de si prprio, %s"
# , c-format
-#: src/copy.c:1266
+#: src/copy.c:1284
#, c-format
msgid "cannot move %s to %s"
msgstr "impossvel 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: impossvel remover destino"
-#: src/copy.c:1306
+#: src/copy.c:1324
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "impossvel copiar link simblico cclico %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 possvel fazer links simblicos no diretrio corrente"
# , c-format
-#: src/copy.c:1390
+#: src/copy.c:1408
#, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "impossvel criar link simblico %s para %s"
# , c-format
-#: src/copy.c:1401
+#: src/copy.c:1419
#, c-format
msgid "cannot create link %s"
msgstr "impossvel 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 "impossvel criar fifo %s"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, c-format
msgid "cannot create special file %s"
msgstr "impossvel 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 "impossvel ler link simblico %s"
# , c-format
-#: src/copy.c:1471
+#: src/copy.c:1489
#, c-format
msgid "cannot create symbolic link %s"
msgstr "impossvel criar link simblico %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 "impossvel preservar proprietrio 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 horrio para %s"
-#: src/copy.c:1560
+#: src/copy.c:1578
#, fuzzy, c-format
msgid "failed to lookup file %s"
msgstr "falha ao preservar horrio para %s"
-#: src/copy.c:1565
+#: src/copy.c:1583
#, c-format
msgid "failed to preserve authorship for %s"
msgstr "impossvel preservar autoria para %s"
# , c-format
-#: src/copy.c:1584
+#: src/copy.c:1602
#, c-format
msgid "setting permissions for %s"
msgstr "definindo permisses 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 "impossvel 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 mxima invlida %s"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "no possvel 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 ""
"ateno: BRE no portvel: `%s': usando `^' como primeiro caractere\n"
" da expresso regular bsica (BRE) no portvel; 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 no-numrico"
-#: src/expr.c:613
+#: src/expr.c:638
msgid "division by zero"
msgstr "diviso por zero"
@@ -3184,12 +3196,6 @@ msgstr ""
" caso contrrio\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 [OPO]... 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 no vlido: `%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 [OPO]\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 horrio para %s"
-#: src/nohup.c:131
+#: src/nohup.c:132
#, fuzzy
msgid "failed to redirect standard output"
msgstr "fechando sada padro"
-#: 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"
@@ -8030,6 +8040,10 @@ msgid ""
msgstr ""
# , c-format
+#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
+#~ msgstr "Uso: %s [OPO]... ARQUIVO1 ARQUIVO2\n"
+
+# , c-format
#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr "nmero de campo invlido: `%s'"
diff --git a/po/ru.po b/po/ru.po
index 5351c7e7e..5941235fe 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 <ost@tatnipi.ru>\n"
"Language-Team: Russian <ru@li.org>\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 " 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 " , "
@@ -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 " %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
@@ -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 " %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"
@@ -674,7 +674,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 " "
@@ -896,7 +896,7 @@ msgstr " %s"
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 " 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"
@@ -970,213 +981,213 @@ 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 " %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 " : `%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"
@@ -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 cc81ae5bd..54437039b 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 <stano@trillian.eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -154,7 +154,7 @@ msgstr "vekos 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 "nie je mon vytvori adresr %s"
@@ -238,19 +238,19 @@ msgstr "nie je mon konvertova U+%04X do loklnej znakovej sady"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "nie je mon konvertova U+%04X do loklnej znakovej sady"
-#: lib/userspec.c:148
+#: lib/userspec.c:147
msgid "invalid user"
msgstr "neplatn pouvate"
-#: 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 mon uri skupinu selnho UID"
-#: lib/userspec.c:153
+#: lib/userspec.c:152
msgid "cannot omit both user and group"
msgstr "nie je mon vynecha pouvatea 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 vypsa informciu o verzii a skoni\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 prv sboru %s na %04lo (%s) zlyhala\n"
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "prva sboru %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 mon 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 mon vytvori adresr %s"
@@ -689,7 +689,7 @@ msgstr "nie je mon vytvori adresr %s"
msgid "changing permissions of %s"
msgstr "nie je mon zmeni prva %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 mon vojs do adresra, %s"
msgid "cannot chdir to root directory"
msgstr "nie je mon vojs do adresra, %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 mon 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 "Pouitie: %s [PREPNA]... AV_SBOR PRAV_SBOR\n"
+msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
+msgstr "Pouitie: %s [PREPNA]... SBOR1 SBOR2\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 ""
" Porovnva sbory AV_SBOR a PRAV_SBOR, ktorch riadky s usporiadan\n"
@@ -946,7 +957,7 @@ msgstr ""
msgid "cannot open %s for reading"
msgstr "nie je mon 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 mon nastavi dtum"
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 mon vytvori adresr %s"
msgid "cannot create regular file %s"
msgstr "nie je mon vytvori doasn sbor"
-#: 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 mon 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 zpise %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 "uzatvranie %s (fd=%d)"
-#: src/copy.c:630
+#: src/copy.c:635
#, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
msgstr "%s: prepsa %s bez ohadu na prva %04lo? "
-#: src/copy.c:636
+#: src/copy.c:641
#, c-format
msgid "%s: overwrite %s? "
msgstr "%s: prepsa %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 mon vytvori adresr %s"
-#: src/copy.c:841
+#: src/copy.c:846
#, fuzzy, c-format
msgid "omitting directory %s"
msgstr "nie je mon vytvori adresr %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 sbor"
-#: src/copy.c:910
+#: src/copy.c:915
#, fuzzy, c-format
msgid "cannot overwrite non-directory %s with directory %s"
msgstr "nie je mon vojs do adresra, %s"
-#: src/copy.c:927
+#: src/copy.c:932
#, fuzzy, c-format
msgid "will not overwrite just-created %s with %s"
msgstr "nie je mon prepsa ne-adresr %s adresrom %s"
-#: src/copy.c:938
+#: src/copy.c:943
#, fuzzy, c-format
msgid "cannot overwrite directory %s with non-directory"
msgstr "nie je mon vytvori adresr %s"
-#: src/copy.c:999
+#: src/copy.c:1004
#, fuzzy, c-format
msgid "cannot overwrite directory %s"
msgstr "nie je mon vytvori adresr %s"
-#: src/copy.c:1008
+#: src/copy.c:1013
#, fuzzy, c-format
msgid "cannot move directory onto non-directory: %s -> %s"
msgstr "nie je mon vojs do adresra, %s"
-#: src/copy.c:1031
+#: src/copy.c:1036
#, c-format
msgid "backing up %s would destroy source; %s not moved"
msgstr "vytvorenie zlonej kpie %s by zniilo 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 zlonej kpie %s by zniilo zdroj; %s nebol skoprovan"
-#: 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 mon spusti %s"
-#: src/copy.c:1086 src/ln.c:314
+#: src/copy.c:1091 src/ln.c:314
#, c-format
msgid " (backup: %s)"
msgstr "(zloha: %s)"
-#: src/copy.c:1136
+#: src/copy.c:1154
#, fuzzy, c-format
msgid "cannot copy a directory, %s, into itself, %s"
msgstr "nie je mon vytvori adresr %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 mon vojs do adresra, %s"
-#: src/copy.c:1169
+#: src/copy.c:1187
#, fuzzy, c-format
msgid "cannot create hard link %s to %s"
msgstr "nie je mon vytvori adresr %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 mon vojs do adresra, %s"
-#: src/copy.c:1266
+#: src/copy.c:1284
#, fuzzy, c-format
msgid "cannot move %s to %s"
msgstr "ioctl na `%s' nie je mon 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 mon skoprova 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: relatvne symbolick odkazy je mon vytvori iba v aktulnom adresri"
-#: src/copy.c:1390
+#: src/copy.c:1408
#, fuzzy, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "nie je mon vytvori adresr %s"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, fuzzy, c-format
msgid "cannot create link %s"
msgstr "nie je mon vytvori adresr %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 mon vytvori adresr %s"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, fuzzy, c-format
msgid "cannot create special file %s"
msgstr "pozcia 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 mon vykona"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, fuzzy, c-format
msgid "cannot create symbolic link %s"
msgstr "nie je mon vytvori adresr %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 "zachovvam vlastnctvo %s"
-#: src/copy.c:1502
+#: src/copy.c:1520
#, c-format
msgid "%s has unknown file type"
msgstr "%s je neznmy typ souboru"
-#: src/copy.c:1535
+#: src/copy.c:1553
#, c-format
msgid "preserving times for %s"
msgstr "zachovvam asy %s"
-#: src/copy.c:1560
+#: src/copy.c:1578
#, fuzzy, c-format
msgid "failed to lookup file %s"
msgstr "zachovvam asy %s"
-#: src/copy.c:1565
+#: src/copy.c:1583
#, fuzzy, c-format
msgid "failed to preserve authorship for %s"
msgstr "zachovvam vlastnctvo %s"
-#: src/copy.c:1584
+#: src/copy.c:1602
#, fuzzy, c-format
msgid "setting permissions for %s"
msgstr "nie je mon zmeni prva %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 mon spusti %s"
-#: src/copy.c:1610
+#: src/copy.c:1628
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s -> %s (obnovenie zlohy)\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 poloky: `%s'"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "nie je mon sasne sumarizova a vypisova vetky poloky"
-#: src/du.c:703
+#: src/du.c:705
msgid "warning: summarizing is the same as using --max-depth=0"
msgstr "varovanie: sumarizcia 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: sumarizcia 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: neprenositen BRE (zkladn regulrny vraz): `%s': pouitie\n"
"znaku `^' na zaiatku nie je prenositen 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 vdy tvori jednoduch zlon kpie sborov \n"
-#: src/join.c:158
-#, c-format
-msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Pouitie: %s [PREPNA]... SBOR1 SBOR2\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 rka sla riadku: `%s'"
msgid "invalid line numbering format: %s"
msgstr "chybn hodnota prrastku 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 ""
"Pouitie: %s [SBOR]...\n"
" alebo: %s [VOBA]\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 "zachovvam asy %s"
-#: src/nohup.c:131
+#: src/nohup.c:132
#, fuzzy
msgid "failed to redirect standard output"
msgstr "tandardn vstup"
-#: src/nohup.c:133
+#: src/nohup.c:134
#, fuzzy, c-format
msgid "appending output to %s"
msgstr "nie je mon zmeni pouvatea 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 "Pouitie: %s [PREPNA]... AV_SBOR PRAV_SBOR\n"
+
#, fuzzy
#~ msgid "*** invalid date/time ***"
#~ msgstr "chybn slo poloky: `%s'"
diff --git a/po/sl.po b/po/sl.po
index acb6406ad..0d0c300c2 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 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 <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -154,7 +154,7 @@ msgstr "velikost bloka"
msgid "failed to return to initial working directory"
msgstr "vrnitev v zaetni delovni imenik neuspena"
-#: 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 mogoe ustvariti"
@@ -237,19 +237,19 @@ msgstr "znaka s kodo U+%04X ni mogoe pretvoriti v lokalni nabor znakov"
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 uporabniko 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 tevilnemu UID, ni mogoe ugotoviti"
-#: lib/userspec.c:153
+#: lib/userspec.c:152
msgid "cannot omit both user and group"
msgstr "ni mogoe 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 teavo."
-#: 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 ""
"izpiemo 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 ""
"Poroila 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 zaite datoteke %s v %04lo (%s) neuspeen\n"
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "zaita 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 mogoe prebrati"
@@ -677,7 +677,7 @@ msgstr "imenika %s ni mogoe prebrati"
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 mono prestaviti na %s"
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 mogoe odstraniti %s"
@@ -925,18 +925,29 @@ msgstr ""
"Izpiemo nadzorno vsoto in dolino 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 mogoe 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 ugotoviti s fstat"
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 mogoe odstraniti %s"
msgid "cannot create regular file %s"
msgstr "ni mogoe 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 mogoe"
-#: 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 piemo prek %s navzlic zaiti %04lo? "
-#: src/copy.c:636
+#: src/copy.c:641
#, c-format
msgid "%s: overwrite %s? "
msgstr "%s: naj piemo 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 "izpuamo 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 mogoe 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 uniila 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 uniila 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 mogoe 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 mogoe 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 mogoe 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 mogoe 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 mogoe prepisati cikline 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 mogoe samo znotraj imenika"
-#: src/copy.c:1390
+#: src/copy.c:1408
#, c-format
msgid "cannot create symbolic link %s to %s"
msgstr "ni mogoe ustvariti simbolne povezave %s na %s"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, c-format
msgid "cannot create link %s"
msgstr "ni mogoe 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 mogoe ustvariti FIFO %s"
-#: src/copy.c:1434
+#: src/copy.c:1452
#, c-format
msgid "cannot create special file %s"
msgstr "ni mogoe 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 mogoe prebrati simbolne povezave %s"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, c-format
msgid "cannot create symbolic link %s"
msgstr "ni mogoe 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 "lastnitvo 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 mogoe 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 datotenih 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 vekrat\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 najveja globina %s"
-#: src/du.c:696
+#: src/du.c:698
msgid "cannot both summarize and show all entries"
msgstr "monosti se izkljuujeta - 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 izkljuuje 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-tevilni 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. Monosti 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 irina polja s tevilko vrstice: ,%s`"
msgid "invalid line numbering format: %s"
msgstr "neveljaven vrstini 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 0ebabdf6f..44f7c2f94 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,14 +4,14 @@
# Thomas Olsson <cid95tho@lustudat.student.lu.se>, 1997.
# Daniel Resare <daniel@resare.com> 1999, 2000.
# Gran Uddeborg <goeran@uddeborg.se>, 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: Gran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
@@ -155,7 +155,7 @@ msgstr "blockstorlek"
msgid "failed to return to initial working directory"
msgstr "kunde inte tervnda 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 teckenuppsttning"
msgid "cannot convert U+%04X to local character set: %s"
msgstr "kan inte konvertera U+%04X till lokal teckenuppsttning: %s"
-#: lib/userspec.c:148
+#: lib/userspec.c:147
msgid "invalid user"
msgstr "ogiltig anvndare"
-#: 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 fr ett numeriskt UID"
-#: lib/userspec.c:153
+#: lib/userspec.c:152
msgid "cannot omit both user and group"
msgstr "kan inte utelmna bde anvndare 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 "strngjmfrelse 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 "Stt LC_ALL='C' fr 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 jmfrda strngarna var %s och %s."
@@ -396,7 +396,7 @@ msgstr "De jmfrda strngarna var %s och %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
@@ -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 versttningen till <sv@li.org>.\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 ndra rttigheterna p %s till %04lo (%s)\n"
msgid "mode of %s retained as %04lo (%s)\n"
msgstr "rttigheterna hos %s r ofrndrat %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 ppekat att det inte r s stor mening att markera detta fr
# versttning.
-#: 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 lsa katalog %s"
@@ -702,7 +702,7 @@ msgstr "kan inte lsa katalog %s"
msgid "changing permissions of %s"
msgstr "ndrar rttigheter 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 ndra rotkatalog till %s"
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 kra kommando %s"
@@ -952,18 +952,29 @@ msgstr ""
"Skriv CRC-kontrollsumma och byteantal fr 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 "Anvndning: %s [FLAGGA]... VNSTER_FIL HGER_FIL\n"
+msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
+msgstr "Anvndning: %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 ""
"Jmfr de sorterade filerna VNSTER_FIL och HGER_FIL rad fr rad.\n"
@@ -977,7 +988,7 @@ msgstr ""
msgid "cannot open %s for reading"
msgstr "kan inte ppna %s fr lsning"
-#: 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 gra fstat p %s"
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 "lser %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 gra 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 "stnger %s"
-#: src/copy.c:630
+#: src/copy.c:635
#, c-format
msgid "%s: overwrite %s, overriding mode %04lo? "
msgstr "%s: skriva ver %s och drmed sidostta rttigheterna %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: kllfil %s angiven mer n en gng"
-#: 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 "skerhetskopiering av %s skulle frstra kllan; %s inte flyttad"
-#: src/copy.c:1032
+#: src/copy.c:1037
#, c-format
msgid "backing up %s would destroy source; %s not copied"
msgstr "skerhetskopiering av %s skulle frstra kllan; %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 gra skerhetskopia %s"
-#: src/copy.c:1086 src/ln.c:314
+#: src/copy.c:1091 src/ln.c:314
#, c-format
msgid " (backup: %s)"
msgstr "(skerhetskopia: %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 sjlv, %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 hrd lnk %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 hrd lnk %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 sjlv, %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 mlet"
-#: src/copy.c:1306
+#: src/copy.c:1324
#, c-format
msgid "cannot copy cyclic symbolic link %s"
msgstr "kan inte kopiera cyklisk symbolisk lnk %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 lnkar 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 lnk %s till %s"
-#: src/copy.c:1401
+#: src/copy.c:1419
#, c-format
msgid "cannot create link %s"
msgstr "kan inte skapa lnk %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 lsa symbolisk lnk %s"
-#: src/copy.c:1471
+#: src/copy.c:1489
#, c-format
msgid "cannot create symbolic link %s"
msgstr "kan inte skapa symbolisk lnk %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 oknd 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 frfattarskap fr %s"
-#: src/copy.c:1584
+#: src/copy.c:1602
#, c-format
msgid "setting permissions for %s"
msgstr "stter rttigheter 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 avskerhetskopiera %s"
-#: src/copy.c:1610
+#: src/copy.c:1628
#, c-format
msgid "%s -> %s (unbackup)\n"
msgstr "%s -> %s (terta skerhetskopia)\n"
@@ -2030,9 +2041,9 @@ msgid "cannot set date"
msgstr "kan inte stlla klockan"
#: src/date.c:529
-#, fuzzy, c-format
+#, c-format
msgid "time %s is out of range"
-msgstr "filposition utanfr intervallet"
+msgstr "tiden %s r utanfr tilltet 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 utelmna 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 flj FILer som r symboliska lnkar\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 rkna storlek flera gnger fr hrda lnkar\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 fr 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: anvnd --si, inte -H. Betydelsen av -H kommer snart ndras\n"
"till att bli samma som den fr --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 anvnda --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 str 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"
"grundlggande reguljrt 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 miljvariabeln VERSION_CONTROL. Den kan ha fljande vrden:\n"
"\n"
-#: src/join.c:158
-#, c-format
-msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
-msgstr "Anvndning: %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 radnumrets flt: %s"
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 ""
"Anvndning: %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 ""
"Kr 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 "lgger 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 FRSTA eller KNING utelmnas, stts de till 1. FRSTA, KNING och\n"
-"SISTA tolkas som flyttal. KNING ska vara positivt om FRSTA r\n"
-"mindre n SISTA och negativt annars. Nr argumentet FORMAT anges\n"
-"mste det innehlla precis en av flyttalsformattyperna %e, %f, %g\n"
-"(samma som i printf).\n"
+"Om FRSTA eller KNING utelmnas, stts de till 1. Det vill sga, en\n"
+"utelmnad KNING stts till 1 ven nr SISTA r mindre n FRSTA.\n"
+"FRSTA, KNING och SISTA tolkas som flyttal. KNING r normalt\n"
+"positivt om FRSTA r mindre n SISTA och KNING r normalt negativt\n"
+"om FRSTA r strre n SISTA. Nr argumentet FORMAT anges mste det\n"
+"innehlla 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 anvnd STORLEK fr 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 anvnd KAT fr tillflliga filer, ej "
"$TMPDIR\n"
-" eller %s\n"
-" -u, --unique med -c: kontrollera strikt ordningsfljd\n"
-" annars: skriv ut endast den frsta av flera "
+" eller %s;\n"
+" flera argument anger flera kataloger\n"
+" -u, --unique med -c, kontrollera strikt ordningsfljd;\n"
+" utan -c, skriv ut endast den frsta av flera "
"lika\n"
#: src/sort.c:319
@@ -8390,7 +8405,7 @@ msgstr "pm"
#: src/uptime.c:142
#, c-format
msgid " ??:???? up "
-msgstr ""
+msgstr " ??:???? igng "
#: src/uptime.c:144
#, c-format
@@ -8646,5 +8661,5 @@ msgstr ""
"Skriv gng p gng en rad med alla specifierade STRNG(ar), eller \"y\"\n"
"\n"
-#~ msgid "*** invalid date/time ***"
-#~ msgstr "*** ogiltigt datum/tid ***"
+#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n"
+#~ msgstr "Anvndning: %s [FLAGGA]... VNSTER_FIL HGER_FIL\n"
diff --git a/po/tr.po b/po/tr.po
index 0500b959d..ca6322bc5 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 <deniz@arayan.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\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ı <gnu-tr-u12a@lists.sourceforge.net> 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 749194d4e..000c390da 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 <anthony@thizlinux.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\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 ""
"请向 <bug-fileutils@gnu.org> 报告错误。"
#: 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"
@@ -7320,6 +7331,10 @@ msgid ""
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 46573f97b..67172dcda 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 <maddog@linux.org.hk>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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’"