diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-12-21 20:47:57 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-12-21 20:47:57 +0000 |
| commit | 11adf5d1a55793f14889ef0ff675695c4fb97f41 (patch) | |
| tree | d911ac84624f875875dcad1d175031acf909aca0 | |
| parent | 01cf4e6286ee76f1fe6be0766968d5eb5170f040 (diff) | |
| download | src-test2-vendor/xz/5.0.4.tar.gz src-test2-vendor/xz/5.0.4.zip | |
Update vendor/xz from v5.0 branch to 5.0.4vendor/xz/5.0.4
Git commit: 20778053a07eb90c159c1377ca8dc05a90fd530b
| -rw-r--r-- | AUTHORS | 6 | ||||
| -rw-r--r-- | ChangeLog | 332 | ||||
| -rw-r--r-- | README | 54 | ||||
| -rw-r--r-- | THANKS | 7 | ||||
| -rw-r--r-- | po/de.po | 169 | ||||
| -rw-r--r-- | po/fr.po | 237 | ||||
| -rw-r--r-- | po/it.po | 311 | ||||
| -rw-r--r-- | po/pl.po | 150 | ||||
| -rw-r--r-- | src/common/sysdefs.h | 9 | ||||
| -rw-r--r-- | src/liblzma/api/lzma/version.h | 2 | ||||
| -rw-r--r-- | src/liblzma/simple/simple_coder.c | 5 | ||||
| -rw-r--r-- | src/liblzma/simple/simple_private.h | 3 | ||||
| -rw-r--r-- | src/xz/args.c | 2 | ||||
| -rw-r--r-- | src/xz/coder.c | 5 | ||||
| -rw-r--r-- | src/xz/message.c | 14 | ||||
| -rw-r--r-- | src/xz/xz.1 | 21 |
16 files changed, 854 insertions, 473 deletions
@@ -16,11 +16,11 @@ Authors of XZ Utils Some scripts have been adapted from gzip. The original versions were written by Jean-loup Gailly, Charles Levert, and Paul Eggert. - Andrew Dudman helped adapting the script and their man pages for + Andrew Dudman helped adapting the scripts and their man pages for XZ Utils. - The GNU Autotools based build system contains files from many authors, - which I'm not trying list here. + The GNU Autotools-based build system contains files from many authors, + which I'm not trying to list here. Several people have contributed fixes or reported bugs. Most of them are mentioned in the file THANKS. diff --git a/ChangeLog b/ChangeLog index 07464225e649..140106eb3d66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,335 @@ +commit 20778053a07eb90c159c1377ca8dc05a90fd530b +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Fri Jun 22 14:36:16 2012 +0300 + + xz: Update man page date to match the latest update. + +commit 2cefa84af676da37d7e9c466d55d46c67ab00c22 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Fri Jun 22 10:25:43 2012 +0300 + + Bump version and soname for 5.0.4. + +commit 433fec191a17e45690809e54146ea7a773f54cff +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Fri Jun 22 10:25:09 2012 +0300 + + Update NEWS for 5.0.4. + +commit 711fa680f552a4003df73b37e6dc4d6e00b47bcd +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Mon Jun 18 21:27:47 2012 +0300 + + Docs: Language fix to 01_compress_easy.c. + + Thanks to Jonathan Nieder. + +commit 3d7ab1dc61a75c560828be5df96598388b771456 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Jun 14 20:15:30 2012 +0300 + + Fix the top-level Makefile.am for the new example programs. + +commit ef8b8e5f111469b5bc005975f7abb9abbd372b25 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Jun 14 10:52:33 2012 +0300 + + Docs: Add new example programs. + + These have more comments than the old examples and + human-readable error messages. More tutorial-like examples + are needed but these are a start. + +commit 75c149bc8045a26f8bc719cb8ed20668dab79091 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Jun 14 10:33:27 2012 +0300 + + Docs: Move xz_pipe_comp.c and xz_pipe_decomp.c to doc/examples_old. + + It is good to keep these around to so that if someone has + copied the decompressor bug from xz_pipe_decomp.c he has + an example how to easily fix it. + +commit 456307ebf947a5f50bd995d617b99c1215572308 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Jun 14 10:33:01 2012 +0300 + + Docs: Fix a bug in xz_pipe_decomp.c example program. + +commit 4c310b8a29bc257e6ccbd2310f12f258678f3fef +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu May 31 15:53:25 2012 +0300 + + Translations: Update the Italian translation. + + Thanks to Milo Casagrande. + +commit ec32b79366dc47a55ea877589df9e8509ba113a7 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Wed May 30 23:15:07 2012 +0300 + + Translations: Update the French translation. + + Thanks to Adrien Nader. + +commit dd06f40e4dd7649525e4f28d890dc238a3aa37e5 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue May 29 22:26:27 2012 +0300 + + Translations: Update the German translation. + +commit c66808d1f55d0149ed57c536cc9b52e9c8b583bc +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue May 29 22:12:57 2012 +0300 + + Translations: Update Polish translation. + +commit 556c22dfed195c1466b298183b850d6c28544900 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue May 29 13:10:36 2012 +0300 + + Preliminary NEWS for 5.0.4. + +commit dd13b66bf582f49d3aec36e3410ff8541b7506da +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Mon May 28 20:42:11 2012 +0300 + + liblzma: Fix possibility of incorrect LZMA_BUF_ERROR. + + lzma_code() could incorrectly return LZMA_BUF_ERROR if + all of the following was true: + + - The caller knows how many bytes of output to expect + and only provides that much output space. + + - When the last output bytes are decoded, the + caller-provided input buffer ends right before + the LZMA2 end of payload marker. So LZMA2 won't + provide more output anymore, but it won't know it + yet and thus won't return LZMA_STREAM_END yet. + + - A BCJ filter is in use and it hasn't left any + unfiltered bytes in the temp buffer. This can happen + with any BCJ filter, but in practice it's more likely + with filters other than the x86 BCJ. + + Another situation where the bug can be triggered happens + if the uncompressed size is zero bytes and no output space + is provided. In this case the decompression can fail even + if the whole input file is given to lzma_code(). + + A similar bug was fixed in XZ Embedded on 2011-09-19. + +commit a0223bf796fdaad51a11ad02c4195c694849cc78 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Mon May 28 15:38:32 2012 +0300 + + Update THANKS. + +commit 86e57e4bfefe3fd8e13615c41604165bb2359501 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Mon May 28 15:37:43 2012 +0300 + + xz: Don't show a huge number in -vv when memory limit is disabled. + +commit 13e44a94da19d1ef14832ff12d3877a6fd2c54c0 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Sun May 27 22:30:17 2012 +0300 + + xz: Document the "summary" lines of --robot -lvv. + + This documents only the columns that are in v5.0. + The new columns added in the master branch aren't + necessarily stable yet. + +commit 2f90345e13ab8fea4de45a4f1caa73ebc63a62e7 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Sun May 27 21:53:20 2012 +0300 + + xz: Fix output of verbose --robot --list modes. + + It printed the filename in "filename (x/y)" format + which it obviously shouldn't do in robot mode. + +commit 8d4864f53ffae5d862c691a0b334a6b69bc5366e +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu May 10 21:15:17 2012 +0300 + + Update THANKS. + +commit 35e9c58abb0ce3993da844aaeaa3e7231cd2be8f +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu May 10 21:14:16 2012 +0300 + + Docs: Cleanup line wrapping a bit. + +commit 532b3e4c568a228309b56f95c13435fd078dbe02 +Author: Benno Schulenberg <bensberg@justemail.net> +Date: Tue Mar 13 22:04:04 2012 +0100 + + Fix a few typos and add some missing articles in some documents. + + Also hyphenate several compound adjectives. + + Signed-off-by: Benno Schulenberg <bensberg@justemail.net> + +commit afb6ce8c82ffef8f2505a3759da72a733c7b0b8f +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Sun Apr 29 11:51:25 2012 +0300 + + Windows: Update notes about static linking with MSVC. + +commit 7c3ba2ed5c3c878d4a14ca549b46dbff60c6d565 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Apr 19 15:25:26 2012 +0300 + + liblzma: Remove outdated comments. + +commit f55db9c187651094f43881c49db2b2d9ffee6b80 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Apr 19 14:17:52 2012 +0300 + + DOS: Link against DJGPP's libemu to support FPU emulation. + + This way xz should work on 386SX and 486SX. Floating point + only is needed for verbose output in xz. + +commit 203edff4c761dbd7cac76ea66e4eed501c23e7a3 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Apr 19 13:58:55 2012 +0300 + + Docs: Update MINIX 3 information in INSTALL. + +commit f0a8f95c215628967b7cf9bd9b0a9e4172f50bb4 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Wed Feb 22 14:23:13 2012 +0200 + + Update THANKS. + +commit b7ad23fa78646036c0290cd91eada939c9a31526 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Wed Feb 22 14:02:34 2012 +0200 + + Fix exit status of xzgrep when grepping binary files. + + When grepping binary files, grep may exit before it has + read all the input. In this case, gzip -q returns 2 (eating + SIGPIPE), but xz and bzip2 show SIGPIPE as the exit status + (e.g. 141). This causes wrong exit status when grepping + xz- or bzip2-compressed binary files. + + The fix checks for the special exit status that indicates SIGPIPE. + It uses kill -l which should be supported everywhere since it + is in both SUSv2 (1997) and POSIX.1-2008. + + Thanks to James Buren for the bug report. + +commit 4e19fbb04a0035030406482319e264426459eb24 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Wed Feb 22 12:08:43 2012 +0200 + + Update THANKS. + +commit c6fa03a427e3d1320794102cee3ff4f5ae00eb36 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu May 24 18:47:52 2012 +0300 + + Fix compiling with IBM XL C on AIX. + +commit 7b6ffc98645e1b3b302b6680be0a901d1ebf7358 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu May 24 18:37:08 2012 +0300 + + Build: Upgrade m4/acx_pthread.m4 to the latest version. + + It was renamed to ax_pthread.m4 in Autoconf Archive. + +commit bfac2be5023994fcc53de2844e7dd3af61910dc2 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue Jan 10 17:13:03 2012 +0200 + + Tests: Fix a compiler warning with _FORTIFY_SOURCE. + + Reported here: + http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385 + +commit df85e156716a4eecb7e2978691f03f729444d998 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Mon Dec 19 21:21:29 2011 +0200 + + Docs: Explain the stable releases better in README. + +commit d06d32f108c8278c25c24b2e8666bda7b2ec23b5 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Fri Nov 4 17:57:16 2011 +0200 + + xz: Fix a typo in a comment. + + Thanks to Bela Lubkin. + +commit 636fdcfbf542f1e84db2c4736004d84be4b12c84 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Nov 3 17:08:02 2011 +0200 + + Update THANKS. + +commit 55fd02f83ecd6cbd6925a3e8a3d43b8d4ef2a17c +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Thu Nov 3 17:07:22 2011 +0200 + + xz: Fix xz on EBCDIC systems. + + Thanks to Chris Donawa. + +commit 4052f36053b931bad847a36aabf1a07d0034e297 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue Sep 6 12:03:41 2011 +0300 + + Build: Fix "make check" on Windows. + +commit 0f25758459c74c366a73f35d47ee12b75890bb79 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue Aug 9 21:19:13 2011 +0300 + + Update THANKS. + +commit 70f03b51ffcb783646b20de8d97b6986c4280eec +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue Aug 9 21:16:44 2011 +0300 + + Workaround unusual SIZE_MAX on SCO OpenServer. + +commit f138bdf76a70029e8360062a0b227936b83b24c9 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Sat Aug 6 20:37:28 2011 +0300 + + Run the scripts with the correct shell in test_scripts.sh. + + The scripts are now made executable in the build tree. + This way the scripts can be run like programs in + test_scripts.sh. Previously test_scripts.sh always + used sh but it's not correct if @POSIX_SHELL@ is set + to something else by configure. + + Thanks to Jonathan Nieder for the patch. + +commit 2c144a0365c84dbf1b6722466746d42f2563a319 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: Sun Jul 31 11:01:47 2011 +0300 + + Fix exit status of "xzdiff foo.xz bar.xz". + + xzdiff was clobbering the exit status from diff in a case + statement used to analyze the exit statuses from "xz" when + its operands were two compressed files. Save and restore + diff's exit status to fix this. + + The bug is inherited from zdiff in GNU gzip and was fixed + there on 2009-10-09. + + Thanks to Jonathan Nieder for the patch and + to Peter Pallinger for reporting the bug. + commit edf339227a966f24aebe1845fcca9429b8f6e318 Author: Anders F Bjorklund <afb@users.sourceforge.net> Date: Fri Nov 5 12:56:11 2010 +0100 @@ -5,7 +5,7 @@ XZ Utils 0. Overview 1. Documentation 1.1. Overall documentation - 1.2. Documentation for command line tools + 1.2. Documentation for command-line tools 1.3. Documentation for liblzma 2. Version numbering 3. Reporting bugs @@ -17,21 +17,21 @@ XZ Utils 0. Overview ----------- - XZ Utils provide a general-purpose data compression library and - command line tools. The native file format is the .xz format, but + XZ Utils provide a general-purpose data-compression library plus + command-line tools. The native file format is the .xz format, but also the legacy .lzma format is supported. The .xz format supports - multiple compression algorithms, which are called "filters" in + multiple compression algorithms, which are called "filters" in the context of XZ Utils. The primary filter is currently LZMA2. With typical files, XZ Utils create about 30 % smaller files than gzip. To ease adapting support for the .xz format into existing applications and scripts, the API of liblzma is somewhat similar to the API of the - popular zlib library. For the same reason, the command line tool xz - has similar command line syntax than that of gzip. + popular zlib library. For the same reason, the command-line tool xz + has a command-line syntax similar to that of gzip. - When aiming for the highest compression ratio, LZMA2 encoder uses + When aiming for the highest compression ratio, the LZMA2 encoder uses a lot of CPU time and may use, depending on the settings, even - hundreds of megabytes of RAM. However, in fast modes, LZMA2 encoder + hundreds of megabytes of RAM. However, in fast modes, the LZMA2 encoder competes with bzip2 in compression speed, RAM usage, and compression ratio. @@ -44,8 +44,8 @@ XZ Utils since that needs to be done only once to benefit many people. With some file types, combining (or "chaining") LZMA2 with an - additional filter can improve compression ratio. A filter chain may - contain up to four filters, although usually only one two is used. + additional filter can improve the compression ratio. A filter chain may + contain up to four filters, although usually only one or two are used. For example, putting a BCJ (Branch/Call/Jump) filter before LZMA2 in the filter chain can improve compression ratio of executable files. @@ -88,9 +88,9 @@ XZ Utils packages. -1.2. Documentation for command line tools +1.2. Documentation for command-line tools - The command line tools are documented as man pages. In source code + The command-line tools are documented as man pages. In source code releases (and possibly also in some binary packages), the man pages are also provided in plain text (ASCII only) and PDF formats in the directory "doc/man" to make the man pages more accessible to those @@ -109,8 +109,8 @@ XZ Utils written yet. For now, if you have never used liblzma, libbzip2, or zlib, I - recommend learning *basics* of zlib API. Once you know that, it - should be easier to learn liblzma. + recommend learning the *basics* of the zlib API. Once you know that, + it should be easier to learn liblzma. http://zlib.net/manual.html http://zlib.net/zlib_how.html @@ -124,23 +124,27 @@ XZ Utils - X is the major version. When this is incremented, the library API and ABI break. - - Y is the minor version. It is incremented when new features are - added without breaking existing API or ABI. Even Y indicates - stable release and odd Y indicates unstable (alpha or beta - version). + - Y is the minor version. It is incremented when new features + are added without breaking the existing API or ABI. An even Y + indicates a stable release and an odd Y indicates unstable + (alpha or beta version). - - Z is the revision. This has different meaning for stable and + - Z is the revision. This has a different meaning for stable and unstable releases: + * Stable: Z is incremented when bugs get fixed without adding - any new features. + any new features. This is intended to be convenient for + downstream distributors that want bug fixes but don't want + any new features to minimize the risk of introducing new bugs. + * Unstable: Z is just a counter. API or ABI of features added in earlier unstable releases having the same X.Y may break. - S indicates stability of the release. It is missing from the - stable releases where Y is an even number. When Y is odd, S + stable releases, where Y is an even number. When Y is odd, S is either "alpha" or "beta" to make it very clear that such versions are not stable releases. The same X.Y.Z combination is - not used for more than one stability level i.e. after X.Y.Zalpha, + not used for more than one stability level, i.e. after X.Y.Zalpha, the next version can be X.Y.(Z+1)beta but not X.Y.Zbeta. @@ -176,7 +180,7 @@ XZ Utils Don't send core dump files or any executables. If you have a small example file(s) (total size less than 256 KiB), please include it/them as an attachment. If you have bigger test files, put them - online somewhere and include an URL to the file(s) in the bug report. + online somewhere and include a URL to the file(s) in the bug report. Always include the exact version number of XZ Utils in the bug report. If you are using a snapshot from the git repository, use "git describe" @@ -193,7 +197,7 @@ XZ Utils The messages from the xz tool have been translated into a few languages. Before starting to translate into a new language, ask - the author that someone else hasn't already started working on it. + the author whether someone else hasn't already started working on it. Test your translation. Testing includes comparing the translated output to the original English version by running the same commands @@ -214,7 +218,7 @@ XZ Utils Note especially the following: - The output of --help and --long-help must look nice on - a 80-column terminal. It's OK to add extra lines if needed. + an 80-column terminal. It's OK to add extra lines if needed. - In contrast, don't add extra lines to error messages and such. They are often preceded with e.g. a filename on the same line, @@ -14,16 +14,19 @@ has been important. :-) In alphabetical order: - Jakub Bogusz - Maarten Bosmans - Trent W. Buck + - James Buren - David Burklund - Daniel Mealha Cabrita - Milo Casagrande - Marek Černocký + - Chris Donawa - Andrew Dudman - Markus Duft - İsmail Dönmez - Robert Elz - Gilles Espinasse - Denis Excoffier + - Michael Felt - Mike Frysinger - Jason Gorski - Juan Manuel Guerrero @@ -38,8 +41,10 @@ has been important. :-) In alphabetical order: - Peter Lawler - Hin-Tak Leung - Andraž 'ruskie' Levstik + - Cary Lewis - Wim Lewis - Lorenzo De Liso + - Bela Lubkin - Gregory Margo - Jim Meyering - Rafał Mużyło @@ -48,6 +53,7 @@ has been important. :-) In alphabetical order: - Jonathan Nieder - Andre Noll - Peter O'Gorman + - Peter Pallinger - Igor Pavlov - Diego Elio Pettenò - Elbert Pol @@ -58,6 +64,7 @@ has been important. :-) In alphabetical order: - Christian von Roques - Jukka Salmi - Alexandre Sauvé + - Benno Schulenberg - Andreas Schwab - Dan Shechter - Stuart Shelton @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: XZ Utils 4.999.9beta\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2010-09-11 17:07+0200\n" +"POT-Creation-Date: 2012-05-29 17:20+0200\n" "PO-Revision-Date: 2010-09-07 20:27+0200\n" "Last-Translator: <maan@systemlinux.org>\n" "Language-Team: German\n" @@ -96,7 +96,7 @@ msgid "%s: File seems to have been moved, not removing" msgstr "" "%s: Datei scheint umbenannt worden zu sein, daher wird sie nicht gelöscht" -#: src/xz/file_io.c:144 src/xz/file_io.c:590 +#: src/xz/file_io.c:144 src/xz/file_io.c:589 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Kann nicht löschen: %s" @@ -126,59 +126,59 @@ msgstr "%s: Überspringe symbolischen Verweis" msgid "%s: Is a directory, skipping" msgstr "%s: Überspringe Verzeichnis" -#: src/xz/file_io.c:462 +#: src/xz/file_io.c:461 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Keine reguläre Datei, überspringe" -#: src/xz/file_io.c:479 +#: src/xz/file_io.c:478 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Datei hat das setuid oder setgid Bit gesetzt, überspringe" -#: src/xz/file_io.c:486 +#: src/xz/file_io.c:485 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Datei hat sticky Bit gesetzt, überspringe" -#: src/xz/file_io.c:493 +#: src/xz/file_io.c:492 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Eingabedatei hat mehr als einen hard link, überspringe" -#: src/xz/file_io.c:714 +#: src/xz/file_io.c:713 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "" "Fehler beim Wiederherstellen des O_APPEND flags bei Standard Output: %s" -#: src/xz/file_io.c:726 +#: src/xz/file_io.c:725 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Fehler beim Schießen der Datei: %s" -#: src/xz/file_io.c:762 src/xz/file_io.c:946 +#: src/xz/file_io.c:761 src/xz/file_io.c:945 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "" "%s: Positionierungsfehler beim Versuch eine sparse Datei zu erzeugen: %s" -#: src/xz/file_io.c:821 +#: src/xz/file_io.c:820 #, c-format msgid "%s: Read error: %s" msgstr "%s: Lesefehler: %s" -#: src/xz/file_io.c:844 +#: src/xz/file_io.c:843 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Fehler beim Lesen der Dateinamen: %s" -#: src/xz/file_io.c:854 +#: src/xz/file_io.c:853 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Unerwartetes Ende der Datei" -#: src/xz/file_io.c:904 +#: src/xz/file_io.c:903 #, c-format msgid "%s: Write error: %s" msgstr "%s: Schreibfehler: %s" @@ -212,7 +212,7 @@ msgstr "Kein" #. but the Check ID is known (here 2). This and other "Unknown-N" #. strings are used in tables, so the width must not exceed ten #. columns with a fixed-width font. It's OK to omit the dash if -#. you need space for one extra letter. +#. you need space for one extra letter, but don't use spaces. #: src/xz/list.c:69 msgid "Unknown-2" msgstr "Unbek.2" @@ -275,41 +275,41 @@ msgstr "%s: Zu klein um ein gültiges .xz file zu sein" #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:603 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " Str. Blöcke Kompr. Unkompr. Verh. Check Dateiname" -#: src/xz/list.c:652 +#: src/xz/list.c:643 #, c-format msgid " Streams: %s\n" msgstr " Ströme: %s\n" -#: src/xz/list.c:654 +#: src/xz/list.c:645 #, c-format msgid " Blocks: %s\n" msgstr " Blöcke: %s\n" -#: src/xz/list.c:656 +#: src/xz/list.c:647 #, c-format msgid " Compressed size: %s\n" msgstr " Größe komprimiert: %s\n" -#: src/xz/list.c:659 +#: src/xz/list.c:650 #, c-format msgid " Uncompressed size: %s\n" msgstr " Größe unkomprimiert: %s\n" -#: src/xz/list.c:662 +#: src/xz/list.c:653 #, c-format msgid " Ratio: %s\n" msgstr " Verhältnis: %s\n" -#: src/xz/list.c:664 +#: src/xz/list.c:655 #, c-format msgid " Check: %s\n" msgstr " Check: %s\n" -#: src/xz/list.c:665 +#: src/xz/list.c:656 #, c-format msgid " Stream padding: %s\n" msgstr " Strom Auffüllung: %s\n" @@ -317,7 +317,7 @@ msgstr " Strom Auffüllung: %s\n" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:684 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize " @@ -329,7 +329,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:739 #, c-format msgid "" " Blocks:\n" @@ -347,53 +347,53 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:751 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " CheckWert %*s Kopf Schalter KompGröße Speicher Filter" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:829 src/xz/list.c:998 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Benötigter Speicher: %s MiB\n" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:831 src/xz/list.c:1000 #, c-format msgid " Sizes in headers: %s\n" msgstr " Größe in Köpfen: %s\n" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:832 src/xz/list.c:1001 msgid "Yes" msgstr "Ja" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:832 src/xz/list.c:1001 msgid "No" msgstr "Nein" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:977 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s Datei\n" msgstr[1] "%s Dateien\n" -#: src/xz/list.c:999 +#: src/xz/list.c:990 msgid "Totals:" msgstr "Gesamt:" -#: src/xz/list.c:1000 +#: src/xz/list.c:991 #, c-format msgid " Number of files: %s\n" msgstr " Anzahl Dateien: %s\n" -#: src/xz/list.c:1072 +#: src/xz/list.c:1063 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "" "--list funktioniert nur mit .xz Dateien (--format=xz oder --format=auto)" -#: src/xz/list.c:1078 +#: src/xz/list.c:1069 msgid "--list does not support reading from standard input" msgstr "--list unterstützt kein Lesen der Standardeingabe" @@ -428,60 +428,73 @@ msgstr "" "Lesen der Standardeingabe ist nicht möglich, wenn die Dateinamen auch von " "der Standardeingabe gelesen werden" -#: src/xz/message.c:800 src/xz/message.c:844 +#. TRANSLATORS: This is the program name in the beginning +#. of the line in messages. Usually it becomes "xz: ". +#. This is a translatable string because French needs +#. a space before a colon. +#: src/xz/message.c:733 +#, c-format +msgid "%s: " +msgstr "" + +#: src/xz/message.c:796 src/xz/message.c:846 msgid "Internal error (bug)" msgstr "Interner Fehler (Bug)" -#: src/xz/message.c:807 +#: src/xz/message.c:803 msgid "Cannot establish signal handlers" msgstr "Kann Signal Routine nicht setzen" -#: src/xz/message.c:816 +#: src/xz/message.c:812 msgid "No integrity check; not verifying file integrity" msgstr "Kein Integritäts-Check; werde Datei-Integrität nicht überprüfen" -#: src/xz/message.c:819 +#: src/xz/message.c:815 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "" "Typ des Integritäts-Checks nicht unterstützt; werde Datei-Integrität nicht " "überprüfen" -#: src/xz/message.c:826 +#: src/xz/message.c:822 msgid "Memory usage limit reached" msgstr "Speicher-Limit erreicht" -#: src/xz/message.c:829 +#: src/xz/message.c:825 msgid "File format not recognized" msgstr "Datei Format nicht erkannt" -#: src/xz/message.c:832 +#: src/xz/message.c:828 msgid "Unsupported options" msgstr "Optionen nicht unterstützt" -#: src/xz/message.c:835 +#: src/xz/message.c:831 msgid "Compressed data is corrupt" msgstr "Komprimierte Daten sind korrupt" -#: src/xz/message.c:838 +#: src/xz/message.c:834 msgid "Unexpected end of input" msgstr "Unerwartetes Eingabe Ende" -#: src/xz/message.c:886 +#: src/xz/message.c:867 +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "%s MiB Speicher wird benötigt. Der Begrenzer ist deaktiviert." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB Speicher wird benötigt. Limit ist %s." -#: src/xz/message.c:1053 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Filter Kette: %s\n" -#: src/xz/message.c:1063 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Versuchen Sie `%s --help' für mehr Informationen." -#: src/xz/message.c:1089 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -492,18 +505,18 @@ msgstr "" "Komprimiert oder dekomprimiert .xz DATEI(EN).\n" "\n" -#: src/xz/message.c:1096 +#: src/xz/message.c:1105 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Obligatorische Argumente für lange Optionen sind auch für kurze Optionen\n" "zwingend.\n" -#: src/xz/message.c:1100 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr " Operationsmodus:\n" -#: src/xz/message.c:1103 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -515,7 +528,7 @@ msgstr "" " -t, --test überprüfe Datei Integrität\n" " -l, --list liste Datei Informationen" -#: src/xz/message.c:1109 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -523,7 +536,7 @@ msgstr "" "\n" " Operationsmodifikatoren:\n" -#: src/xz/message.c:1112 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -535,7 +548,7 @@ msgstr "" " -c, --stdout schreibe nach Standard Output und lösche nicht die\n" " Eingabedateien" -#: src/xz/message.c:1118 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -554,7 +567,7 @@ msgstr "" " --files0=[DATEI] wie --files, aber benutze den Null Charakter als " "Trenner" -#: src/xz/message.c:1126 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -562,7 +575,7 @@ msgstr "" "\n" " Grundlegende Optionen für Dateiformat und Kompression:\n" -#: src/xz/message.c:1128 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -578,7 +591,7 @@ msgstr "" "`crc32',\n" " `crc64' (Voreinstellung), oder `sha256'" -#: src/xz/message.c:1135 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor " "*and*\n" @@ -591,7 +604,7 @@ msgstr "" "des\n" " Dekomprimierers, wenn Sie 7-9 benutzen!" -#: src/xz/message.c:1139 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU " "time;\n" @@ -602,7 +615,7 @@ msgstr "" " verhältnis zu verbessern. Das beeinflusst nicht den\n" " Speicherbedarf des Dekomprimierers." -#: src/xz/message.c:1144 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -619,7 +632,7 @@ msgstr "" "RAM,\n" " oder 0 für Grundeinstellungen." -#: src/xz/message.c:1151 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage " "limit,\n" @@ -631,7 +644,7 @@ msgstr "" "statt\n" " die Einstellungen nach unten anzupassen." -#: src/xz/message.c:1157 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -639,7 +652,7 @@ msgstr "" "\n" " User-definierte Filter Kette für Kompression (alternativ zu Voreinstellung):" -#: src/xz/message.c:1166 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero " @@ -683,7 +696,7 @@ msgstr "" " depth=NUM Maximale Suchtiefe; 0=automatisch\n" " (Voreinstellung)" -#: src/xz/message.c:1181 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -706,7 +719,7 @@ msgstr "" " start=NUM Start-Offset für Konversion\n" " (Voreinstellung=0)" -#: src/xz/message.c:1193 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -720,7 +733,7 @@ msgstr "" "voneinander\n" " subtrahiert werden (1-256; 1)" -#: src/xz/message.c:1201 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -728,7 +741,7 @@ msgstr "" "\n" " Andere Optionen:\n" -#: src/xz/message.c:1204 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors " "too\n" @@ -740,25 +753,25 @@ msgstr "" "noch\n" " gesprächiger zu sein" -#: src/xz/message.c:1209 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn Warnungen verändern nicht den exit status" -#: src/xz/message.c:1211 +#: src/xz/message.c:1220 msgid "" " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot benutze Maschinen-lesbare Meldungen (nützlich für\n" " Skripte)" -#: src/xz/message.c:1214 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently " "active\n" " memory usage limits, and exit" msgstr " --info-memory zeige Speicherlimit an und terminiere" -#: src/xz/message.c:1217 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -767,7 +780,7 @@ msgstr "" " Optionen)\n" " -H, --long-help zeige diese lange Hilfe an und terminiere" -#: src/xz/message.c:1221 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -777,11 +790,11 @@ msgstr "" "fortgeschrittene\n" " Optionen an)" -#: src/xz/message.c:1226 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version zeige Versionsnummer an und terminiere" -#: src/xz/message.c:1228 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -794,7 +807,7 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1234 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" @@ -802,7 +815,7 @@ msgstr "" "Melde Übersetzungsfehler an <maan@systemlinux.org> (in englisch oder " "deutsch).\n" -#: src/xz/message.c:1236 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "%s Homepage: <%s>\n" @@ -840,7 +853,7 @@ msgstr "" "Der ausgewählte Algorithmus zum Auffinden von Übereinstimmungen braucht " "mindestens nice=%<PRIu32>" -#: src/xz/suffix.c:79 src/xz/suffix.c:164 +#: src/xz/suffix.c:101 src/xz/suffix.c:194 #, c-format msgid "" "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" @@ -848,17 +861,17 @@ msgstr "" "%s: Mit --format=raw ist --sufix=.SUF notwendig, falls nicht nach stdout " "geschrieben wird" -#: src/xz/suffix.c:99 +#: src/xz/suffix.c:121 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Dateiname hat unbekannte Endung, überspringe" -#: src/xz/suffix.c:154 +#: src/xz/suffix.c:175 src/xz/suffix.c:184 #, c-format msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Datei hat bereits `%s' Endung, überspringe" -#: src/xz/suffix.c:205 +#: src/xz/suffix.c:235 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Ungültige Datei Endung" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xz-utils\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2011-05-21 14:35+0200\n" +"POT-Creation-Date: 2012-05-30 22:10+0200\n" "PO-Revision-Date: 2010-09-24 21;12+0200\n" "Last-Translator: Adrien Nader <camaradetux@gmail.com>\n" "Language-Team: None\n" @@ -16,69 +16,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n" -#: src/xz/args.c:338 +#: src/xz/args.c:333 #, c-format msgid "%s: Unknown file format type" msgstr "%s : Format de fichier inconnu" -#: src/xz/args.c:361 src/xz/args.c:369 +#: src/xz/args.c:356 src/xz/args.c:364 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s : Type de vérification d'intégrité inconnu" -#: src/xz/args.c:396 +#: src/xz/args.c:382 msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Un seul fichier peut être spécifié avec `--files' ou `--files0'." -#: src/xz/args.c:459 +#: src/xz/args.c:445 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "La variable d'environnement %s contient trop d'arguments" -#: src/xz/coder.c:105 +#: src/xz/coder.c:95 msgid "Maximum number of filters is four" msgstr "Le nombre maximal de filtres est quatre" -#: src/xz/coder.c:118 +#: src/xz/coder.c:108 msgid "Memory usage limit is too low for the given filter setup." msgstr "La limite d'utilisation mémoire est trop basse pour la configuration de filtres donnée." -#: src/xz/coder.c:148 +#: src/xz/coder.c:129 msgid "Using a preset in raw mode is discouraged." msgstr "Utiliser un préréglage en mode `raw' est déconseillé." -#: src/xz/coder.c:150 +#: src/xz/coder.c:131 msgid "The exact options of the presets may vary between software versions." msgstr "Le détail des préréglages peut varier entre différentes versions du logiciel." -#: src/xz/coder.c:176 +#: src/xz/coder.c:157 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Le format .lzma ne prend en charge que le filtre LZMA1" -#: src/xz/coder.c:184 +#: src/xz/coder.c:165 msgid "LZMA1 cannot be used with the .xz format" msgstr "Le filtre LZMA1 ne peut être utilisé avec le format .xz" -#: src/xz/coder.c:203 -#, c-format -msgid "Using up to %<PRIu32> threads." -msgstr "Jusqu'à %<PRIu32> threads seront utilisés." - -#: src/xz/coder.c:216 +#: src/xz/coder.c:182 msgid "Unsupported filter chain or filter options" msgstr "Enchaînement ou options de filtres non pris en charge" -#: src/xz/coder.c:224 +#: src/xz/coder.c:190 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "La décompression nécessitera %s MiB de mémoire." -#: src/xz/coder.c:259 -#, c-format -msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" -msgstr "Nombre de threads réduit de %s à %s pour ne pas dépasser la limite d'utilisation mémoire de %s MiB" - -#: src/xz/coder.c:313 +#: src/xz/coder.c:247 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Taille du dictionnaire LZMA%c réduite de %s MiB à %s MiB pour ne pas dépasser la limite d'utilisation mémoire de %s MiB" @@ -93,111 +83,111 @@ msgstr "Taille du dictionnaire LZMA%c réduite de %s MiB à %s MiB pour ne pas d #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:136 +#: src/xz/file_io.c:137 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s : Le fichier a apparemment été déplacé, suppression annulée" -#: src/xz/file_io.c:143 src/xz/file_io.c:635 +#: src/xz/file_io.c:144 src/xz/file_io.c:589 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s : Impossible de supprimer : %s" -#: src/xz/file_io.c:168 +#: src/xz/file_io.c:169 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s : Impossible de modifier le propriétaire du fichier : %s" -#: src/xz/file_io.c:174 +#: src/xz/file_io.c:175 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s : Impossible de modifier le groupe propriétaire du fichier : %s" -#: src/xz/file_io.c:193 +#: src/xz/file_io.c:194 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s : Impossible de modifier les permissions du fichier : %s" -#: src/xz/file_io.c:340 src/xz/file_io.c:423 +#: src/xz/file_io.c:337 src/xz/file_io.c:420 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s est un lien symbolique : ignoré" -#: src/xz/file_io.c:468 +#: src/xz/file_io.c:455 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s est un répertoire : ignoré" -#: src/xz/file_io.c:474 +#: src/xz/file_io.c:461 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s n'est pas un fichier régulier : ignoré" -#: src/xz/file_io.c:491 +#: src/xz/file_io.c:478 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s : Le fichier possède les bits `setuid' ou `setgid' : ignoré" -#: src/xz/file_io.c:498 +#: src/xz/file_io.c:485 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s : Le fichier possède le bit `sticky' : ignoré" -#: src/xz/file_io.c:505 +#: src/xz/file_io.c:492 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s : Le fichier d'entrée a plus d'un lien matériel : ignoré" -#: src/xz/file_io.c:761 +#: src/xz/file_io.c:713 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Impossible de rétablir le drapeau O_APPEND sur la sortie standard : %s" -#: src/xz/file_io.c:773 +#: src/xz/file_io.c:725 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s : Impossible de fermer le fichier : %s" -#: src/xz/file_io.c:809 src/xz/file_io.c:1008 +#: src/xz/file_io.c:761 src/xz/file_io.c:945 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s : Impossible de se déplacer dans le fichier pour créer un 'sparse file' : %s" -#: src/xz/file_io.c:883 +#: src/xz/file_io.c:820 #, c-format msgid "%s: Read error: %s" msgstr "%s : Erreur d'écriture : %s" -#: src/xz/file_io.c:906 +#: src/xz/file_io.c:843 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s : Impossible de se déplacer dans le fichier : %s" -#: src/xz/file_io.c:916 +#: src/xz/file_io.c:853 #, c-format msgid "%s: Unexpected end of file" msgstr "%s : Fin de fichier inattendue" -#: src/xz/file_io.c:966 +#: src/xz/file_io.c:903 #, c-format msgid "%s: Write error: %s" msgstr "%s : Erreur d'écriture : %s" -#: src/xz/hardware.c:101 +#: src/xz/hardware.c:100 msgid "Disabled" msgstr "Désactivé" #. TRANSLATORS: Test with "xz --info-memory" to see if #. the alignment looks nice. -#: src/xz/hardware.c:120 +#: src/xz/hardware.c:119 msgid "Total amount of physical memory (RAM): " msgstr "Quantité totale de mémoire physique (RAM) : " -#: src/xz/hardware.c:122 +#: src/xz/hardware.c:121 msgid "Memory usage limit for compression: " msgstr "Limite d'utilisation pour la compression : " -#: src/xz/hardware.c:124 +#: src/xz/hardware.c:123 msgid "Memory usage limit for decompression: " msgstr "Limite d'utilisation pour la décompression : " @@ -275,41 +265,41 @@ msgstr "%s : Trop petit pour être un fichier xz valide." #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:603 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Flux Blocs Compressé Décompressé Ratio Vérif Nom de fichier" -#: src/xz/list.c:652 +#: src/xz/list.c:643 #, c-format msgid " Streams: %s\n" msgstr " Flux : %s\n" -#: src/xz/list.c:654 +#: src/xz/list.c:645 #, c-format msgid " Blocks: %s\n" msgstr " Blocs : %s\n" -#: src/xz/list.c:656 +#: src/xz/list.c:647 #, c-format msgid " Compressed size: %s\n" msgstr " Taille compressé : %s\n" -#: src/xz/list.c:659 +#: src/xz/list.c:650 #, c-format msgid " Uncompressed size: %s\n" msgstr " Taille décompressé : %s\n" -#: src/xz/list.c:662 +#: src/xz/list.c:653 #, c-format msgid " Ratio: %s\n" msgstr " Ratio : %s\n" -#: src/xz/list.c:664 +#: src/xz/list.c:655 #, c-format msgid " Check: %s\n" msgstr " Vérification : %s\n" -#: src/xz/list.c:665 +#: src/xz/list.c:656 #, c-format msgid " Stream padding: %s\n" msgstr " Octets de rembourrage du flux : %s\n" @@ -317,7 +307,7 @@ msgstr " Octets de rembourrage du flux : %s\n" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:684 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" @@ -327,7 +317,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:739 #, c-format msgid "" " Blocks:\n" @@ -343,52 +333,52 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:751 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " ValVérif %*sEn-tête Drapeaux TailleComp UtilMém Filtres" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:829 src/xz/list.c:998 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Mémoire nécessaire : %s MiB\n" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:831 src/xz/list.c:1000 #, c-format msgid " Sizes in headers: %s\n" msgstr " Tailles stockées dans l'en-tête : %s\n" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:832 src/xz/list.c:1001 msgid "Yes" msgstr "Oui" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:832 src/xz/list.c:1001 msgid "No" msgstr "Non" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:977 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s fichier\n" msgstr[1] "%s fichiers\n" -#: src/xz/list.c:999 +#: src/xz/list.c:990 msgid "Totals:" msgstr "Totaux :" -#: src/xz/list.c:1000 +#: src/xz/list.c:991 #, c-format msgid " Number of files: %s\n" msgstr " Nombre de fichiers : %s\n" -#: src/xz/list.c:1072 +#: src/xz/list.c:1063 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list ne marche que sur les fichiers .xz (--format=xz ou --format=auto)" -#: src/xz/list.c:1078 +#: src/xz/list.c:1069 msgid "--list does not support reading from standard input" msgstr "--list est incompatible avec la lecture sur l'entrée standard" @@ -460,22 +450,27 @@ msgstr "Les données compressées sont corrompues" msgid "Unexpected end of input" msgstr "Fin des données inattendue " -#: src/xz/message.c:885 +#: src/xz/message.c:867 +#, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "%s MiB de mémoire sont nécessaires. La limite est désactivée." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB de mémoire sont nécessaires, la limite étant %s." -#: src/xz/message.c:1052 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s : Enchaînement de filtres : %s\n" -#: src/xz/message.c:1062 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Utilisez `%s --help' pour plus d'informations." -#: src/xz/message.c:1088 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -486,17 +481,17 @@ msgstr "" "Compresse ou decompresse FICHIER(s) au format .xz.\n" "\n" -#: src/xz/message.c:1095 +#: src/xz/message.c:1105 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Les arguments obligatoires pour les options longues le sont aussi pour les\n" "options courtes.\n" -#: src/xz/message.c:1099 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr " Mode d'opération :\n" -#: src/xz/message.c:1102 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -508,7 +503,7 @@ msgstr "" " -t, --test tester l'intégrité du fichier compressé\n" " -l, --list lister les informations à propos des fichiers .xz" -#: src/xz/message.c:1108 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -516,7 +511,7 @@ msgstr "" "\n" " Modifictauers :\n" -#: src/xz/message.c:1111 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -528,15 +523,7 @@ msgstr "" " -c, --stdout écrire sur la sortie standard et ne pas supprimer les\n" " fichiers d'entrée" -#: src/xz/message.c:1117 -msgid "" -" --single-stream decompress only the first stream, and silently\n" -" ignore possible remaining input data" -msgstr "" -" --single-stream décompresser uniquement le premier flux et ignorer\n" -" silenciseusement les données éventuellement restantes" - -#: src/xz/message.c:1120 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -552,7 +539,7 @@ msgstr "" " et doivent être suivis d'un caractère de retour à la ligne\n" " --files0[=FILE] comme --files mais avec un caractère null comme séparateur" -#: src/xz/message.c:1129 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -560,7 +547,7 @@ msgstr "" "\n" " Options basiques de format de fichier et de compression :\n" -#: src/xz/message.c:1131 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -572,7 +559,7 @@ msgstr "" " -C, --check=CHECK type de vérification d'intégrité : `none' (à utiliser avec\n" " précaution), `crc32', `crc64' (par défaut) ou `sha256'" -#: src/xz/message.c:1138 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -581,7 +568,7 @@ msgstr "" " l'utilisation mémoire du compresseur *et* du décompresseur\n" " avant d'utiliser 7, 8 ou 9 !" -#: src/xz/message.c:1142 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -590,17 +577,7 @@ msgstr "" " de temps processeur sans affecter les besoins mémoire du\n" " décompresseur" -#: src/xz/message.c:1147 -msgid "" -" --block-size=SIZE\n" -" when compressing to the .xz format, start a new block\n" -" after every SIZE bytes of input; 0=disabled (default)" -msgstr "" -" --block-size=SIZE\n" -" pour une compression au format .xz, entamer un nouveau\n" -" bloc après SIZE octets d'entrée ; 0=désactivé (par défaut)" - -#: src/xz/message.c:1151 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -616,7 +593,7 @@ msgstr "" " décompression ou les deux ; LIMIT est en octets, % de\n" " RAM, ou 0 pour les valeurs par défaut" -#: src/xz/message.c:1158 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -625,7 +602,7 @@ msgstr "" " d'utilisation mémoire, renvoyer une erreur plutôt que de\n" " diminuer les réglages" -#: src/xz/message.c:1164 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -633,7 +610,7 @@ msgstr "" "\n" " Enchaînement de filtres de compression personnalisé (au lieu des préréglages) :" -#: src/xz/message.c:1173 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" @@ -662,7 +639,7 @@ msgstr "" " depth=NUM profondeur de recherche maximale ;\n" " 0=automatique (par défaut)" -#: src/xz/message.c:1188 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -684,7 +661,7 @@ msgstr "" " OPTS valides pour tous les filtres BCJ :\n" " start=NUM start offset for conversions (default=0)" -#: src/xz/message.c:1200 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -696,7 +673,7 @@ msgstr "" " dist=NUM distance entre les octets soustraits\n" " les uns aux autres (1-256 ; 1)" -#: src/xz/message.c:1208 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -704,7 +681,7 @@ msgstr "" "\n" " Autres options :\n" -#: src/xz/message.c:1211 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -713,17 +690,17 @@ msgstr "" " aussi supprimer les erreur\n" " -v, --verbose être bavard ; spécifier deux fois pour l'être davantage" -#: src/xz/message.c:1216 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn les avertissements ne modifient pas le code de sortie" -#: src/xz/message.c:1218 +#: src/xz/message.c:1220 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot utiliser des messages lisibles par un programme\n" " (utile pour les scripts)" -#: src/xz/message.c:1221 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -731,7 +708,7 @@ msgstr "" " --info-memory affiche la quantité totale de RAM et la limite actuelle\n" " en mémoire puis quitte" -#: src/xz/message.c:1224 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -739,7 +716,7 @@ msgstr "" " -h, --help affiche l'aide courte (ne liste que les options de base)\n" " -H, --long-help affiche l'aide longue (ceci) puis quitte" -#: src/xz/message.c:1228 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -747,11 +724,11 @@ msgstr "" " -h, --help affiche l'aide courte (ceci) puis quitte\n" " -H, --long-help affiche l'aide longue (liste aussi les options avancées)" -#: src/xz/message.c:1233 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version affiche le numéro de version puis quitte" -#: src/xz/message.c:1235 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -763,14 +740,14 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1241 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Signaler les bogues à <%s> (en anglais ou en finlandais).\n" "Signaler les bogues de traduction à <camaradetux@gmail.com>.\n" -#: src/xz/message.c:1243 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "%s page du projet : <%s>\n" @@ -804,22 +781,22 @@ msgstr "La somme de lc et lp ne doit pas dépasser 4" msgid "The selected match finder requires at least nice=%<PRIu32>" msgstr "Le `match finder' choisi nécessite au moins nice=%<PRIu32>" -#: src/xz/suffix.c:133 src/xz/suffix.c:258 +#: src/xz/suffix.c:101 src/xz/suffix.c:194 #, c-format msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s : Avec --format=raw, --suffix=.SUF est nécessaire sauf lors de l'écriture vers stdout" -#: src/xz/suffix.c:164 +#: src/xz/suffix.c:121 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s : Le fichier a un suffixe inconnu, ignoré" -#: src/xz/suffix.c:185 +#: src/xz/suffix.c:175 src/xz/suffix.c:184 #, c-format msgid "%s: File already has `%s' suffix, skipping" msgstr "%s : Le fichier a déjà le suffixe '%s', ignoré" -#: src/xz/suffix.c:393 +#: src/xz/suffix.c:235 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Suffixe de nom de fichier invalide" @@ -862,3 +839,25 @@ msgstr "Impossible d'écrire vers la sortie standard" #: src/common/tuklib_exit.c:42 msgid "Unknown error" msgstr "Erreur inconnue" + +#~ msgid "Using up to %<PRIu32> threads." +#~ msgstr "Jusqu'à %<PRIu32> threads seront utilisés." + +#~ msgid "Adjusted the number of threads from %s to %s to not exceed the memory usage limit of %s MiB" +#~ msgstr "Nombre de threads réduit de %s à %s pour ne pas dépasser la limite d'utilisation mémoire de %s MiB" + +#~ msgid "" +#~ " --single-stream decompress only the first stream, and silently\n" +#~ " ignore possible remaining input data" +#~ msgstr "" +#~ " --single-stream décompresser uniquement le premier flux et ignorer\n" +#~ " silenciseusement les données éventuellement restantes" + +#~ msgid "" +#~ " --block-size=SIZE\n" +#~ " when compressing to the .xz format, start a new block\n" +#~ " after every SIZE bytes of input; 0=disabled (default)" +#~ msgstr "" +#~ " --block-size=SIZE\n" +#~ " pour une compression au format .xz, entamer un nouveau\n" +#~ " bloc après SIZE octets d'entrée ; 0=désactivé (par défaut)" @@ -2,83 +2,80 @@ # This file is in the public domain # Gruppo traduzione italiano di Ubuntu-it <gruppo-traduzione@ubuntu-it.org>, 2009, 2010 # Lorenzo De Liso <blackz@ubuntu.com>, 2010. -# Milo Casagrande <milo@ubuntu.com>, 2009, 2010, 2011. +# Milo Casagrande <milo@ubuntu.com>, 2009, 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: xz-utils\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-27 11:42+0200\n" -"PO-Revision-Date: 2011-05-27 11:43+0200\n" +"Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" +"POT-Creation-Date: 2012-05-29 13:50+0300\n" +"PO-Revision-Date: 2012-05-31 09:57+0800\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" "X-Launchpad-Export-Date: 2010-08-16 19:16+0000\n" "X-Generator: Launchpad (build Unknown)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../src/xz/args.c:333 +#: src/xz/args.c:333 #, c-format msgid "%s: Unknown file format type" msgstr "%s: tipo di formato del file sconosciuto" -#: ../src/xz/args.c:356 ../src/xz/args.c:364 +#: src/xz/args.c:356 src/xz/args.c:364 #, c-format msgid "%s: Unsupported integrity check type" msgstr "%s: tipo di controllo integrità non supportato" -#: ../src/xz/args.c:382 +#: src/xz/args.c:382 msgid "Only one file can be specified with `--files' or `--files0'." msgstr "Solo un file può essere specificato con \"--files\" o \"--files0\"." -#: ../src/xz/args.c:445 +#: src/xz/args.c:445 #, c-format msgid "The environment variable %s contains too many arguments" msgstr "La variabile d'ambiente %s contiene troppi argomenti" -#: ../src/xz/coder.c:95 +#: src/xz/coder.c:95 msgid "Maximum number of filters is four" msgstr "Il numero massimo di filtri è quattro" -#: ../src/xz/coder.c:108 +#: src/xz/coder.c:108 msgid "Memory usage limit is too low for the given filter setup." msgstr "" "Il limite dell'uso della memoria è troppo basso per l'impostazione del " "filtro dato." -#. The message is shown only if warnings are allowed -#. but the exit status isn't changed. -#: ../src/xz/coder.c:129 +#: src/xz/coder.c:129 msgid "Using a preset in raw mode is discouraged." msgstr "Non è consigliato usare un preset nella modalità raw." -#: ../src/xz/coder.c:131 +#: src/xz/coder.c:131 msgid "The exact options of the presets may vary between software versions." msgstr "" "Le opzioni esatte per i preset possono variare tra le versioni del software." -#: ../src/xz/coder.c:157 +#: src/xz/coder.c:157 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Il formato .lzma supporta solo il filtro LZMA1" -#: ../src/xz/coder.c:165 +#: src/xz/coder.c:165 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 non può essere usato con il formato .xz" -#: ../src/xz/coder.c:182 +#: src/xz/coder.c:182 msgid "Unsupported filter chain or filter options" msgstr "Catena di filtri od opzioni del filtro non supportata" -#: ../src/xz/coder.c:190 +#: src/xz/coder.c:190 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "L'estrazione necessita di %s MiB di memoria." -#. Tell the user that we decreased the dictionary size. -#: ../src/xz/coder.c:247 +#: src/xz/coder.c:247 #, c-format msgid "" "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the " @@ -97,128 +94,119 @@ msgstr "" #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: ../src/xz/file_io.c:137 +#: src/xz/file_io.c:137 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: sembra che il file sia stato spostato, non viene rimosso" -#: ../src/xz/file_io.c:144 ../src/xz/file_io.c:589 +#: src/xz/file_io.c:144 src/xz/file_io.c:589 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: impossibile rimuovere: %s" -#: ../src/xz/file_io.c:169 +#: src/xz/file_io.c:169 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: impossibile impostare il proprietario del file: %s" -#: ../src/xz/file_io.c:175 +#: src/xz/file_io.c:175 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: impossibile impostare il gruppo del file: %s" -#: ../src/xz/file_io.c:194 +#: src/xz/file_io.c:194 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: impossibile impostare i permessi del file: %s" -#: ../src/xz/file_io.c:337 ../src/xz/file_io.c:420 +#: src/xz/file_io.c:337 src/xz/file_io.c:420 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: è un collegamento simbolico, viene saltato" -#: ../src/xz/file_io.c:455 +#: src/xz/file_io.c:455 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: è una directory, viene saltata" -#: ../src/xz/file_io.c:461 +#: src/xz/file_io.c:461 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: non è un file regolare, viene saltato" -#. gzip rejects setuid and setgid files even -#. when --force was used. bzip2 doesn't check -#. for them, but calls fchown() after fchmod(), -#. and many systems automatically drop setuid -#. and setgid bits there. -#. -#. We accept setuid and setgid files if -#. --force was used. We drop these bits -#. explicitly in io_copy_attr(). -#: ../src/xz/file_io.c:478 +#: src/xz/file_io.c:478 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: il file ha il bit setuid o setgid impostato, viene saltato" -#: ../src/xz/file_io.c:485 +#: src/xz/file_io.c:485 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: il file ha lo sticky bit impostato, viene saltato" -#: ../src/xz/file_io.c:492 +#: src/xz/file_io.c:492 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: il file di input ha più di un collegamento fisico, viene saltato" -#: ../src/xz/file_io.c:713 +#: src/xz/file_io.c:713 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Errore nel ripristinare la flag O_APPEND sullo standard output: %s" -#: ../src/xz/file_io.c:725 +#: src/xz/file_io.c:725 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: chiusura del file non riuscita: %s" -#: ../src/xz/file_io.c:761 ../src/xz/file_io.c:945 +#: src/xz/file_io.c:761 src/xz/file_io.c:945 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "" "%s: posizionamento non riuscito nel tentativo di creare un file sparso: %s" -#: ../src/xz/file_io.c:820 +#: src/xz/file_io.c:820 #, c-format msgid "%s: Read error: %s" msgstr "%s: errore di lettura: %s" -#: ../src/xz/file_io.c:843 +#: src/xz/file_io.c:843 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: errore nel cercare il file: %s" -#: ../src/xz/file_io.c:853 +#: src/xz/file_io.c:853 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: fine del file inaspettata" -#: ../src/xz/file_io.c:903 +#: src/xz/file_io.c:903 #, c-format msgid "%s: Write error: %s" msgstr "%s: errore di scrittura: %s" -#: ../src/xz/hardware.c:100 +#: src/xz/hardware.c:100 msgid "Disabled" msgstr "Disabilitato" #. TRANSLATORS: Test with "xz --info-memory" to see if #. the alignment looks nice. -#: ../src/xz/hardware.c:119 +#: src/xz/hardware.c:119 msgid "Total amount of physical memory (RAM): " msgstr "Quantità totale di memoria fisica (RAM): " -#: ../src/xz/hardware.c:121 +#: src/xz/hardware.c:121 msgid "Memory usage limit for compression: " msgstr "Limite utilizzo memoria per la compressione: " -#: ../src/xz/hardware.c:123 +#: src/xz/hardware.c:123 msgid "Memory usage limit for decompression: " msgstr "Limite utilizzo memoria per l'estrazione: " #. TRANSLATORS: Indicates that there is no integrity check. #. This string is used in tables, so the width must not #. exceed ten columns with a fixed-width font. -#: ../src/xz/list.c:62 +#: src/xz/list.c:62 msgid "None" msgstr "Nessuno" @@ -227,60 +215,60 @@ msgstr "Nessuno" #. strings are used in tables, so the width must not exceed ten #. columns with a fixed-width font. It's OK to omit the dash if #. you need space for one extra letter, but don't use spaces. -#: ../src/xz/list.c:69 +#: src/xz/list.c:69 msgid "Unknown-2" msgstr "Sconosc2" -#: ../src/xz/list.c:70 +#: src/xz/list.c:70 msgid "Unknown-3" msgstr "Sconosc3" -#: ../src/xz/list.c:72 +#: src/xz/list.c:72 msgid "Unknown-5" msgstr "Sconosc5" -#: ../src/xz/list.c:73 +#: src/xz/list.c:73 msgid "Unknown-6" msgstr "Sconosc6" -#: ../src/xz/list.c:74 +#: src/xz/list.c:74 msgid "Unknown-7" msgstr "Sconosc7" -#: ../src/xz/list.c:75 +#: src/xz/list.c:75 msgid "Unknown-8" msgstr "Sconosc8" -#: ../src/xz/list.c:76 +#: src/xz/list.c:76 msgid "Unknown-9" msgstr "Sconosc9" -#: ../src/xz/list.c:78 +#: src/xz/list.c:78 msgid "Unknown-11" msgstr "Sconosc11" -#: ../src/xz/list.c:79 +#: src/xz/list.c:79 msgid "Unknown-12" msgstr "Sconosc12" -#: ../src/xz/list.c:80 +#: src/xz/list.c:80 msgid "Unknown-13" msgstr "Sconosc13" -#: ../src/xz/list.c:81 +#: src/xz/list.c:81 msgid "Unknown-14" msgstr "Sconosc14" -#: ../src/xz/list.c:82 +#: src/xz/list.c:82 msgid "Unknown-15" msgstr "Sconosc15" -#: ../src/xz/list.c:126 +#: src/xz/list.c:126 #, c-format msgid "%s: File is empty" msgstr "%s: il file è vuoto" -#: ../src/xz/list.c:131 +#: src/xz/list.c:131 #, c-format msgid "%s: Too small to be a valid .xz file" msgstr "%s: troppo piccolo per essere un file .xz valido" @@ -289,51 +277,49 @@ msgstr "%s: troppo piccolo per essere un file .xz valido" #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: ../src/xz/list.c:612 +#: src/xz/list.c:603 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " Strm Blocc. Compresso Estratto Rapp. Contr Nome file" -#: ../src/xz/list.c:652 +#: src/xz/list.c:643 #, c-format msgid " Streams: %s\n" msgstr " Stream: %s\n" -#: ../src/xz/list.c:654 +#: src/xz/list.c:645 #, c-format msgid " Blocks: %s\n" msgstr " Blocchi: %s\n" -#: ../src/xz/list.c:656 +#: src/xz/list.c:647 #, c-format msgid " Compressed size: %s\n" msgstr " Dim. compresso: %s\n" -#: ../src/xz/list.c:659 +#: src/xz/list.c:650 #, c-format msgid " Uncompressed size: %s\n" msgstr " Dim. estratto: %s\n" -#: ../src/xz/list.c:662 +#: src/xz/list.c:653 #, c-format msgid " Ratio: %s\n" msgstr " Rapporto: %s\n" -#: ../src/xz/list.c:664 +#: src/xz/list.c:655 #, c-format msgid " Check: %s\n" msgstr " Controllo: %s\n" -#: ../src/xz/list.c:665 +#: src/xz/list.c:656 #, c-format msgid " Stream padding: %s\n" msgstr " Padding dello stream: %s\n" -#. Print information about the Streams. -#. #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: ../src/xz/list.c:693 +#: src/xz/list.c:684 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize " @@ -345,7 +331,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: ../src/xz/list.c:748 +#: src/xz/list.c:739 #, c-format msgid "" " Blocks:\n" @@ -363,74 +349,66 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: ../src/xz/list.c:760 +#: src/xz/list.c:751 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " Val.cont %*s Header Flag Dim.compr. Uso mem. Filtri" -#: ../src/xz/list.c:838 ../src/xz/list.c:1007 +#: src/xz/list.c:829 src/xz/list.c:998 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Memoria necessaria: %s MiB\n" -#: ../src/xz/list.c:840 ../src/xz/list.c:1009 +#: src/xz/list.c:831 src/xz/list.c:1000 #, c-format msgid " Sizes in headers: %s\n" msgstr " Dim. negli header: %s\n" -#: ../src/xz/list.c:841 ../src/xz/list.c:1010 +#: src/xz/list.c:832 src/xz/list.c:1001 msgid "Yes" msgstr "Sì" -#: ../src/xz/list.c:841 ../src/xz/list.c:1010 +#: src/xz/list.c:832 src/xz/list.c:1001 msgid "No" msgstr "No" -#. Since we print totals only when there are at least two files, -#. the English message will always use "%s files". But some other -#. languages need different forms for different plurals so we -#. have to translate this with ngettext(). -#. #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: ../src/xz/list.c:986 +#: src/xz/list.c:977 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s file\n" msgstr[1] "%s file\n" -#: ../src/xz/list.c:999 +#: src/xz/list.c:990 msgid "Totals:" msgstr "Totali:" -#: ../src/xz/list.c:1000 +#: src/xz/list.c:991 #, c-format msgid " Number of files: %s\n" msgstr " Numero di file: %s\n" -#: ../src/xz/list.c:1072 +#: src/xz/list.c:1063 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list funziona solamente con file .xz (--format=xz o --format=auto)" -#: ../src/xz/list.c:1078 +#: src/xz/list.c:1069 msgid "--list does not support reading from standard input" msgstr "--list non è in grado di leggere dallo standard input" -#: ../src/xz/main.c:89 +#: src/xz/main.c:89 #, c-format msgid "%s: Error reading filenames: %s" msgstr "%s: errore nel leggere i nomi dei file: %s" -#: ../src/xz/main.c:96 +#: src/xz/main.c:96 #, c-format msgid "%s: Unexpected end of input when reading filenames" msgstr "%s: fine dell'input durante la lettura dei nomi dei file non attesa" -#. A null character was found when using --files, -#. which expects plain text input separated with -#. newlines. -#: ../src/xz/main.c:120 +#: src/xz/main.c:120 #, c-format msgid "" "%s: Null character found when reading filenames; maybe you meant to use `--" @@ -439,11 +417,11 @@ msgstr "" "%s: nessun carattere trovato durante la lettura dei nomi dei file; forse si " "intendeva usare \"--files0\" invece di \"--files\"?" -#: ../src/xz/main.c:174 +#: src/xz/main.c:174 msgid "Compression and decompression with --robot are not supported yet." msgstr "La compressione e l'estrazione con --robot non sono ancora supportate." -#: ../src/xz/main.c:231 +#: src/xz/main.c:231 msgid "" "Cannot read data from standard input when reading filenames from standard " "input" @@ -455,68 +433,71 @@ msgstr "" #. of the line in messages. Usually it becomes "xz: ". #. This is a translatable string because French needs #. a space before a colon. -#: ../src/xz/message.c:733 +#: src/xz/message.c:733 #, c-format msgid "%s: " msgstr "%s: " -#: ../src/xz/message.c:796 ../src/xz/message.c:846 +#: src/xz/message.c:796 src/xz/message.c:846 msgid "Internal error (bug)" msgstr "Errore interno (bug)" -#: ../src/xz/message.c:803 +#: src/xz/message.c:803 msgid "Cannot establish signal handlers" msgstr "Impossibile stabilire i gestori dei segnali" -#: ../src/xz/message.c:812 +#: src/xz/message.c:812 msgid "No integrity check; not verifying file integrity" msgstr "" "Nessun controllo d'integrità; l'integrità del file non viene verificata" -#: ../src/xz/message.c:815 +#: src/xz/message.c:815 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "" "Tipo di controllo di integrità non supportato; l'integrità del file non " "viene verificata" -#: ../src/xz/message.c:822 +#: src/xz/message.c:822 msgid "Memory usage limit reached" msgstr "Limite di utilizzo della memoria raggiunto" -#: ../src/xz/message.c:825 +#: src/xz/message.c:825 msgid "File format not recognized" msgstr "Formato di file non riconosciuto" -#: ../src/xz/message.c:828 +#: src/xz/message.c:828 msgid "Unsupported options" msgstr "Opzioni non supportate" -#: ../src/xz/message.c:831 +#: src/xz/message.c:831 msgid "Compressed data is corrupt" msgstr "I dati compressi sono danneggiati" -#: ../src/xz/message.c:834 +#: src/xz/message.c:834 msgid "Unexpected end of input" msgstr "Fine dell'input non attesa" -#: ../src/xz/message.c:885 +#: src/xz/message.c:867 +#, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "%s MiB di memoria sono richiesti. Alcun limite impostato." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB di memoria sono richiesti. Il limite è %s." -#: ../src/xz/message.c:1052 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: catena di filtri: %s\n" -#. Print this with V_WARNING instead of V_ERROR to prevent it from -#. showing up when --quiet has been specified. -#: ../src/xz/message.c:1062 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Provare \"%s --help\" per maggiori informazioni." -#: ../src/xz/message.c:1088 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -527,18 +508,18 @@ msgstr "" "Comprime o estrae i FILE nel formato .xz.\n" "\n" -#: ../src/xz/message.c:1095 +#: src/xz/message.c:1105 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle " "brevi.\n" -#: ../src/xz/message.c:1099 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr " Modalità di operazione:\n" -#: ../src/xz/message.c:1102 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -550,7 +531,7 @@ msgstr "" " -t, --test Verifica l'integrità dei file compressi\n" " -l, --list Elenca informazioni sui file .xz" -#: ../src/xz/message.c:1108 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -558,7 +539,7 @@ msgstr "" "\n" " Modificatori di operazioni:\n" -#: ../src/xz/message.c:1111 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -571,7 +552,7 @@ msgstr "" " -c, --stdout Scrive sullo standard output e non elimina i file di " "input" -#: ../src/xz/message.c:1117 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -591,7 +572,7 @@ msgstr "" " di newline\n" " --files0=[FILE] Come --files ma usa il carattere null come terminatore" -#: ../src/xz/message.c:1125 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -599,7 +580,7 @@ msgstr "" "\n" " Formato file di base e opzioni di compressione:\n" -#: ../src/xz/message.c:1127 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -614,7 +595,7 @@ msgstr "" "attenzione),\n" " \"crc32\", \"crc64\" (predefinito) o \"sha256\"" -#: ../src/xz/message.c:1134 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor " "*and*\n" @@ -627,7 +608,7 @@ msgstr "" "prima\n" " di usare 7-9" -#: ../src/xz/message.c:1138 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU " "time;\n" @@ -638,7 +619,7 @@ msgstr "" "di\n" " memoria in fase di estrazione" -#: ../src/xz/message.c:1143 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -656,7 +637,7 @@ msgstr "" "byte,\n" " % della memoria RAM oppure 0 per il valore predefinito" -#: ../src/xz/message.c:1150 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage " "limit,\n" @@ -668,7 +649,7 @@ msgstr "" " utilizzo della memoria, lancia un errore invece di\n" " utilizzare valori più piccoli" -#: ../src/xz/message.c:1156 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -677,7 +658,7 @@ msgstr "" " Catena di filtri personalizzati per la compressione (alternative per\n" " l'utilizzo di preset):" -#: ../src/xz/message.c:1165 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero " @@ -720,7 +701,7 @@ msgstr "" "0=automatica\n" " (predefinito)" -#: ../src/xz/message.c:1180 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -743,7 +724,7 @@ msgstr "" " start=NUM Offset iniziale per le conversioni\n" " (predefinito=0)" -#: ../src/xz/message.c:1192 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -755,7 +736,7 @@ msgstr "" " dist=NUM Distanza tra byte sottratti\n" " gli uni dagli altri (1-256; 1)" -#: ../src/xz/message.c:1200 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -763,7 +744,7 @@ msgstr "" "\n" " Altre opzioni:\n" -#: ../src/xz/message.c:1203 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors " "too\n" @@ -776,16 +757,16 @@ msgstr "" "ancora\n" " più prolisso" -#: ../src/xz/message.c:1208 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn Gli avvisi non influenzano lo stato d'uscita" -#: ../src/xz/message.c:1210 +#: src/xz/message.c:1220 msgid "" " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot Usa messaggi analizzabili (utile per gli script)" -#: ../src/xz/message.c:1213 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently " "active\n" @@ -795,7 +776,7 @@ msgstr "" "attuale\n" " attivo di utilizzo della memore ed esce" -#: ../src/xz/message.c:1216 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -803,7 +784,7 @@ msgstr "" " -h, --help Stampa l'aiuto breve (elenca solo le opzioni di base)\n" " -H, --long-help Stampa questo lungo aiuto ed esce" -#: ../src/xz/message.c:1220 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -811,11 +792,11 @@ msgstr "" " -h, --help Stampa questo breve aiuto ed esce\n" " -H, --long-help Stampa l'aiuto lungo (elenca anche le opzioni avanzate)" -#: ../src/xz/message.c:1225 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version Stampa il numero della versione ed esce" -#: ../src/xz/message.c:1227 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -827,51 +808,51 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: ../src/xz/message.c:1233 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Segnalare i bug a <%s> (in inglese o finlandese).\n" "Segnalare i bug di traduzione a <tp@lists.linux.it>.\n" -#: ../src/xz/message.c:1235 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "Sito web di %s: <%s>\n" -#: ../src/xz/options.c:86 +#: src/xz/options.c:86 #, c-format msgid "%s: Options must be `name=value' pairs separated with commas" msgstr "" "%s: le opzioni devono essere coppie \"nome=valore\" separate da virgole" -#: ../src/xz/options.c:93 +#: src/xz/options.c:93 #, c-format msgid "%s: Invalid option name" msgstr "%s: nome opzione non valido" -#: ../src/xz/options.c:113 +#: src/xz/options.c:113 #, c-format msgid "%s: Invalid option value" msgstr "%s: valore dell'opzione non valido" -#: ../src/xz/options.c:247 +#: src/xz/options.c:247 #, c-format msgid "Unsupported LZMA1/LZMA2 preset: %s" msgstr "Preset LZMA/LZMA2 non supportato: %s" -#: ../src/xz/options.c:355 +#: src/xz/options.c:355 msgid "The sum of lc and lp must not exceed 4" msgstr "La somma di lc e lp non deve superare 4" -#: ../src/xz/options.c:359 +#: src/xz/options.c:359 #, c-format msgid "The selected match finder requires at least nice=%<PRIu32>" msgstr "" "Lo strumento per cercare corrispondenze selezionato richiede almeno nice=" "%<PRIu32>" -#: ../src/xz/suffix.c:101 ../src/xz/suffix.c:194 +#: src/xz/suffix.c:101 src/xz/suffix.c:194 #, c-format msgid "" "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" @@ -879,59 +860,59 @@ msgstr "" "%s: con --format=raw, --suffix=.SUF è richiesto a meno che non si scriva " "sullo stdout" -#: ../src/xz/suffix.c:121 +#: src/xz/suffix.c:121 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: il nome del file ha un suffisso sconosciuto, viene saltato" -#: ../src/xz/suffix.c:175 ../src/xz/suffix.c:184 +#: src/xz/suffix.c:175 src/xz/suffix.c:184 #, c-format msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: il file ha già il suffisso \"%s\", viene saltato" -#: ../src/xz/suffix.c:235 +#: src/xz/suffix.c:235 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: suffisso del nome del file non valido" -#: ../src/xz/util.c:61 +#: src/xz/util.c:61 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: il valore non è un numero intero decimale non-negativo" -#: ../src/xz/util.c:103 +#: src/xz/util.c:103 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: suffisso del moltiplicatore non valido" -#: ../src/xz/util.c:105 +#: src/xz/util.c:105 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "" "I suffissi validi sono \"KiB\" (2^10), \"MiB\" (2^20), e \"GiB\" (2^30)." -#: ../src/xz/util.c:122 +#: src/xz/util.c:122 #, c-format msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]" msgstr "" "Il valore dell'opzione \"%s\" deve essere nell'intervallo [%<PRIu64>, " "%<PRIu64>]" -#: ../src/xz/util.c:247 +#: src/xz/util.c:247 msgid "Empty filename, skipping" msgstr "Nome file vuoto, viene saltato" -#: ../src/xz/util.c:261 +#: src/xz/util.c:261 msgid "Compressed data cannot be read from a terminal" msgstr "I dati compressi non possono essere letti da un terminale" -#: ../src/xz/util.c:274 +#: src/xz/util.c:274 msgid "Compressed data cannot be written to a terminal" msgstr "I dati compressi non possono essere scritti ad un terminale" -#: ../src/common/tuklib_exit.c:39 +#: src/common/tuklib_exit.c:39 msgid "Writing to standard output failed" msgstr "Scrittura sullo standard ouput non riuscita" -#: ../src/common/tuklib_exit.c:42 +#: src/common/tuklib_exit.c:42 msgid "Unknown error" msgstr "Errore sconosciuto" @@ -1,13 +1,13 @@ # Polish translation for xz. # This file is in the public domain. -# Jakub Bogusz <qboosh@pld-linux.org>, 2011. +# Jakub Bogusz <qboosh@pld-linux.org>, 2011-2012. # msgid "" msgstr "" -"Project-Id-Version: xz 5.0.1\n" +"Project-Id-Version: xz 5.0.2\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2011-01-28 20:01+0200\n" -"PO-Revision-Date: 2011-02-02 16:51+0100\n" +"POT-Creation-Date: 2012-05-29 13:50+0300\n" +"PO-Revision-Date: 2012-05-29 18:15+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -265,41 +265,41 @@ msgstr "%s: Za mały na poprawny plik .xz" #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:603 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Strum. Bloki Spakowany Rozpakowany Wsp. Kontrola Nazwa pliku" -#: src/xz/list.c:652 +#: src/xz/list.c:643 #, c-format msgid " Streams: %s\n" msgstr " Strumienie: %s\n" -#: src/xz/list.c:654 +#: src/xz/list.c:645 #, c-format msgid " Blocks: %s\n" msgstr " Bloki: %s\n" -#: src/xz/list.c:656 +#: src/xz/list.c:647 #, c-format msgid " Compressed size: %s\n" msgstr " Rozmiar spakowany: %s\n" -#: src/xz/list.c:659 +#: src/xz/list.c:650 #, c-format msgid " Uncompressed size: %s\n" msgstr " Rozmiar rozpakowany: %s\n" -#: src/xz/list.c:662 +#: src/xz/list.c:653 #, c-format msgid " Ratio: %s\n" msgstr " Współczynnik: %s\n" -#: src/xz/list.c:664 +#: src/xz/list.c:655 #, c-format msgid " Check: %s\n" msgstr " Kontrola spójności: %s\n" -#: src/xz/list.c:665 +#: src/xz/list.c:656 #, c-format msgid " Stream padding: %s\n" msgstr " Wyrównanie strumienia: %s\n" @@ -307,7 +307,7 @@ msgstr " Wyrównanie strumienia: %s\n" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:684 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" @@ -317,7 +317,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:739 #, c-format msgid "" " Blocks:\n" @@ -333,32 +333,32 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:751 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " S.kontr. %*sNagłówek Flagi Rozm. spak. Uż.pamięci Filtry" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:829 src/xz/list.c:998 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Wymagana pamięć: %s MiB\n" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:831 src/xz/list.c:1000 #, c-format msgid " Sizes in headers: %s\n" msgstr " Rozmiar w nagłówkach: %s\n" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:832 src/xz/list.c:1001 msgid "Yes" msgstr "Tak" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:832 src/xz/list.c:1001 msgid "No" msgstr "Nie" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:977 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -366,20 +366,20 @@ msgstr[0] "%s plik\n" msgstr[1] "%s pliki\n" msgstr[2] "%s plików\n" -#: src/xz/list.c:999 +#: src/xz/list.c:990 msgid "Totals:" msgstr "Sumarycznie:" -#: src/xz/list.c:1000 +#: src/xz/list.c:991 #, c-format msgid " Number of files: %s\n" msgstr " Liczba plików: %s\n" -#: src/xz/list.c:1072 +#: src/xz/list.c:1063 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list działa tylko z plikami .xz (--format=xz lub --format=auto)" -#: src/xz/list.c:1078 +#: src/xz/list.c:1069 msgid "--list does not support reading from standard input" msgstr "--list nie obsługuje odczytu ze standardowego wejścia" @@ -406,58 +406,72 @@ msgstr "Kompresja i dekompresja z opcją --robot nie jest jeszcze obsługiwana." msgid "Cannot read data from standard input when reading filenames from standard input" msgstr "Nie można odczytać danych ze standardowego wejścia przy czytaniu nazw plików ze standardowego wejścia" -#: src/xz/message.c:792 src/xz/message.c:842 +#. TRANSLATORS: This is the program name in the beginning +#. of the line in messages. Usually it becomes "xz: ". +#. This is a translatable string because French needs +#. a space before a colon. +#: src/xz/message.c:733 +#, c-format +msgid "%s: " +msgstr "%s: " + +#: src/xz/message.c:796 src/xz/message.c:846 msgid "Internal error (bug)" msgstr "Błąd wewnętrzny" -#: src/xz/message.c:799 +#: src/xz/message.c:803 msgid "Cannot establish signal handlers" msgstr "Nie można ustawić obsługi sygnałów" -#: src/xz/message.c:808 +#: src/xz/message.c:812 msgid "No integrity check; not verifying file integrity" msgstr "Brak kontroli spójności; poprawność plików nie będzie weryfikowana" -#: src/xz/message.c:811 +#: src/xz/message.c:815 msgid "Unsupported type of integrity check; not verifying file integrity" msgstr "Nieobsługiwany typ kontroli spójności; poprawność plików nie będzie weryfikowana" -#: src/xz/message.c:818 +#: src/xz/message.c:822 msgid "Memory usage limit reached" msgstr "Osiągnięto limit użycia pamięci" -#: src/xz/message.c:821 +#: src/xz/message.c:825 msgid "File format not recognized" msgstr "Nie rozpoznany format pliku" -#: src/xz/message.c:824 +#: src/xz/message.c:828 msgid "Unsupported options" msgstr "Nieobsługiwane opcje" -#: src/xz/message.c:827 +#: src/xz/message.c:831 msgid "Compressed data is corrupt" msgstr "Dane skompresowane są uszkodzone" -#: src/xz/message.c:830 +#: src/xz/message.c:834 msgid "Unexpected end of input" msgstr "Nieoczekiwany koniec wejścia" -#: src/xz/message.c:881 +#: src/xz/message.c:867 +#, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "Wymagane jest %s MiB pamięci. Limit jest wyłączony." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Wymagane jest %s MiB pamięci. Limit to %s." -#: src/xz/message.c:1048 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Łańcuch filtrów: %s\n" -#: src/xz/message.c:1058 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Polecenie `%s --help' pokaże więcej informacji." -#: src/xz/message.c:1084 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -468,17 +482,17 @@ msgstr "" "Kompresja lub dekompresja PLIKÓW w formacie .xz.\n" "\n" -#: src/xz/message.c:1091 +#: src/xz/message.c:1105 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Argumenty obowiązkowe dla opcji długich są obowiązkowe również dla opcji\n" "krótkich.\n" -#: src/xz/message.c:1095 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr " Tryb pracy:\n" -#: src/xz/message.c:1098 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -490,7 +504,7 @@ msgstr "" " -t, --test sprawdzenie spójności plików skompresowanych\n" " -l, --list wypisanie informacji o plikach .xz" -#: src/xz/message.c:1104 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -498,7 +512,7 @@ msgstr "" "\n" " Modyfikatory operacji:\n" -#: src/xz/message.c:1107 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -508,7 +522,7 @@ msgstr "" " -f, --force nadpisywanie plików wyjściowych i (de)kompresja dowiązań\n" " -c, --stdout zapis na standardowe wyjście, nieusuwanie plików wej." -#: src/xz/message.c:1113 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -524,7 +538,7 @@ msgstr "" " wejścia; muszą być zakończone znakiem nowej linii\n" " --files0[=PLIK] podobnie do --files, ale znakiem kończącym musi być NUL" -#: src/xz/message.c:1121 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -532,7 +546,7 @@ msgstr "" "\n" " Podstawowe opcje formatu pliku i kompresji:\n" -#: src/xz/message.c:1123 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -544,7 +558,7 @@ msgstr "" " -C, --check=TEST typ kontroli spójności: `none' (ostrożnie!),\n" " `crc32', `crc64' (domyślny) lub `sha256'" -#: src/xz/message.c:1130 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -553,7 +567,7 @@ msgstr "" " użyciem wartości 7-9 należy wziąć pod uwagę wykorzystanie\n" " pamięci przy kompresji *oraz* dekompresji!" -#: src/xz/message.c:1134 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -562,7 +576,7 @@ msgstr "" " ilości czasu procesora; nie wpływa na wymagania\n" " pamięciowe dekompresora" -#: src/xz/message.c:1139 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -578,7 +592,7 @@ msgstr "" " dekompresji lub obu; LIMIT jest w bajtach, % RAM lub 0\n" " dla limitów domyślnych" -#: src/xz/message.c:1146 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -587,7 +601,7 @@ msgstr "" " pamięci, zostanie zgłoszony błąd zamiast zmniejszania\n" " ustawień" -#: src/xz/message.c:1152 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -595,7 +609,7 @@ msgstr "" "\n" " Łańcuch własnych filtrów do kompresji (alternatywa do używania -0 .. -9):" -#: src/xz/message.c:1161 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" @@ -624,7 +638,7 @@ msgstr "" " mf=NAZWA dopasowywacz (hc3, hc4, bt2, bt3, bt4; bt4)\n" " depth=ILE maks. głębokość szukania; 0=auto (domyślne)" -#: src/xz/message.c:1176 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -646,7 +660,7 @@ msgstr "" " Poprawne OPCJE dla wszystkich filtrów BCJ:\n" " start=ILE offset początku konwersji (domyślnie=0)" -#: src/xz/message.c:1188 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -658,7 +672,7 @@ msgstr "" " dist=ILE odległość między bajtami odejmowanymi od\n" " siebie (1-256; 1)" -#: src/xz/message.c:1196 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -666,7 +680,7 @@ msgstr "" "\n" " Inne opcje:\n" -#: src/xz/message.c:1199 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -674,15 +688,15 @@ msgstr "" " -q, --quiet pominięcie ostrzeżeń; dwukrotne podanie pomija też błędy\n" " -v, --verbose więcej informacji; dwukrotne podanie to jeszcze więcej" -#: src/xz/message.c:1204 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn ostrzeżenia nie mają wpływu na status zakończenia" -#: src/xz/message.c:1206 +#: src/xz/message.c:1220 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot komunikaty w formacie dla maszyny (do skryptów)" -#: src/xz/message.c:1209 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -690,7 +704,7 @@ msgstr "" " --info-memory wyświetlenie całkowitej ilości pamięci RAM oraz aktualnie\n" " aktywnych limitów pamięci i zakończenie pracy" -#: src/xz/message.c:1212 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -698,7 +712,7 @@ msgstr "" " -h, --help wyświetlenie krótkiego opisu (tylko podstawowe opcje)\n" " -H, --long-help wyświetlenie tego długiego opisu i zakończenie" -#: src/xz/message.c:1216 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -706,11 +720,11 @@ msgstr "" " -h, --help wyświetlenie tego krótkiego opisu i zakończenie\n" " -H, --long-help wyświetlenie długiego opisu (także opcje zaawansowane)" -#: src/xz/message.c:1221 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version wyświetlenie informacji o wersji i zakończenie" -#: src/xz/message.c:1223 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -722,7 +736,7 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1229 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" @@ -731,7 +745,7 @@ msgstr "" "Błędy w tłumaczeniu prosimy zgłaszać na adres\n" "<translation-team-pl@lists.sourceforge.net>.\n" -#: src/xz/message.c:1231 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "Strona domowa %s: <%s>\n" @@ -765,22 +779,22 @@ msgstr "Suma lc i lp nie może przekroczyć 4" msgid "The selected match finder requires at least nice=%<PRIu32>" msgstr "Wybrany dopasowywacz wymaga przynajmniej nice=%<PRIu32>" -#: src/xz/suffix.c:104 src/xz/suffix.c:189 +#: src/xz/suffix.c:101 src/xz/suffix.c:194 #, c-format msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout" msgstr "%s: Przy --format=raw i zapisie do pliku wymagana jest opcja --suffix=.ROZ" -#: src/xz/suffix.c:124 +#: src/xz/suffix.c:121 #, c-format msgid "%s: Filename has an unknown suffix, skipping" msgstr "%s: Nazwa pliku ma nieznane rozszerzenie, pominięto" -#: src/xz/suffix.c:179 +#: src/xz/suffix.c:175 src/xz/suffix.c:184 #, c-format msgid "%s: File already has `%s' suffix, skipping" msgstr "%s: Plik już ma rozszerzenie `%s', pominięto" -#: src/xz/suffix.c:230 +#: src/xz/suffix.c:235 #, c-format msgid "%s: Invalid filename suffix" msgstr "%s: Błędne rozszerzenie nazwy pliku" diff --git a/src/common/sysdefs.h b/src/common/sysdefs.h index 69370ba42106..5ea6bdae4aed 100644 --- a/src/common/sysdefs.h +++ b/src/common/sysdefs.h @@ -103,9 +103,12 @@ # define UINT64_MAX UINT64_C(18446744073709551615) #endif -// Interix has broken header files, which typedef size_t to unsigned long, -// but a few lines later define SIZE_MAX to INT32_MAX. -#ifdef __INTERIX +// Incorrect(?) SIZE_MAX: +// - Interix headers typedef size_t to unsigned long, +// but a few lines later define SIZE_MAX to INT32_MAX. +// - SCO OpenServer (x86) headers typedef size_t to unsigned int +// but define SIZE_MAX to INT32_MAX. +#if defined(__INTERIX) || defined(_SCO_DS) # undef SIZE_MAX #endif diff --git a/src/liblzma/api/lzma/version.h b/src/liblzma/api/lzma/version.h index 92266637760a..629e8e1a5be8 100644 --- a/src/liblzma/api/lzma/version.h +++ b/src/liblzma/api/lzma/version.h @@ -22,7 +22,7 @@ */ #define LZMA_VERSION_MAJOR 5 #define LZMA_VERSION_MINOR 0 -#define LZMA_VERSION_PATCH 3 +#define LZMA_VERSION_PATCH 4 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE #ifndef LZMA_VERSION_COMMIT diff --git a/src/liblzma/simple/simple_coder.c b/src/liblzma/simple/simple_coder.c index 37de7fa1a0c5..a02b039aa0bb 100644 --- a/src/liblzma/simple/simple_coder.c +++ b/src/liblzma/simple/simple_coder.c @@ -35,9 +35,6 @@ copy_or_code(lzma_coder *coder, lzma_allocator *allocator, } else { // Call the next coder in the chain to provide us some data. - // We don't care about uncompressed_size here, because - // the next filter in the chain will do it for us (since - // we don't change the size of the data). const lzma_ret ret = coder->next.code( coder->next.coder, allocator, in, in_pos, in_size, @@ -110,7 +107,7 @@ simple_code(lzma_coder *coder, lzma_allocator *allocator, // filtered if the buffer sizes used by the application are reasonable. const size_t out_avail = out_size - *out_pos; const size_t buf_avail = coder->size - coder->pos; - if (out_avail > buf_avail) { + if (out_avail > buf_avail || buf_avail == 0) { // Store the old position so that we know from which byte // to start filtering. const size_t out_start = *out_pos; diff --git a/src/liblzma/simple/simple_private.h b/src/liblzma/simple/simple_private.h index a69f82785fba..fcf9f7c1980f 100644 --- a/src/liblzma/simple/simple_private.h +++ b/src/liblzma/simple/simple_private.h @@ -22,8 +22,7 @@ struct lzma_coder_s { /// Next filter in the chain lzma_next_coder next; - /// True if the next coder in the chain has returned LZMA_STREAM_END - /// or if we have processed uncompressed_size bytes. + /// True if the next coder in the chain has returned LZMA_STREAM_END. bool end_was_reached; /// True if filter() should encode the data; false to decode. diff --git a/src/xz/args.c b/src/xz/args.c index 4bd84a0c141c..34761d45d67e 100644 --- a/src/xz/args.c +++ b/src/xz/args.c @@ -438,7 +438,7 @@ parse_environment(args_info *args, char *argv0, const char *varname) } else if (prev_was_space) { prev_was_space = false; - // Keep argc small enough to fit into a singed int + // Keep argc small enough to fit into a signed int // and to keep it usable for memory allocation. if (++argc == my_min( INT_MAX, SIZE_MAX / sizeof(char *))) diff --git a/src/xz/coder.c b/src/xz/coder.c index b123ec5bf2b7..69b1225d946d 100644 --- a/src/xz/coder.c +++ b/src/xz/coder.c @@ -284,7 +284,10 @@ coder_set_compression_settings(void) static bool is_format_xz(void) { - return strm.avail_in >= 6 && memcmp(in_buf.u8, "\3757zXZ", 6) == 0; + // Specify the magic as hex to be compatible with EBCDIC systems. + static const uint8_t magic[6] = { 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00 }; + return strm.avail_in >= sizeof(magic) + && memcmp(in_buf.u8, magic, sizeof(magic)) == 0; } diff --git a/src/xz/message.c b/src/xz/message.c index 80c86a49c3db..0a7a522f7afa 100644 --- a/src/xz/message.c +++ b/src/xz/message.c @@ -211,7 +211,7 @@ message_set_files(unsigned int files) static void print_filename(void) { - if (files_total != 1 || filename != stdin_filename) { + if (!opt_robot && (files_total != 1 || filename != stdin_filename)) { signals_block(); FILE *file = opt_mode == MODE_LIST ? stdout : stderr; @@ -859,6 +859,17 @@ message_mem_needed(enum message_verbosity v, uint64_t memusage) // the user might need to +1 MiB to get high enough limit.) memusage = round_up_to_mib(memusage); + uint64_t memlimit = hardware_memlimit_get(opt_mode); + + // Handle the case when there is no memory usage limit. + // This way we don't print a weird message with a huge number. + if (memlimit == UINT64_MAX) { + message(v, _("%s MiB of memory is required. " + "The limiter is disabled."), + uint64_to_str(memusage, 0)); + return; + } + // With US-ASCII: // 2^64 with thousand separators + " MiB" suffix + '\0' = 26 + 4 + 1 // But there may be multibyte chars so reserve enough space. @@ -867,7 +878,6 @@ message_mem_needed(enum message_verbosity v, uint64_t memusage) // Show the memory usage limit as MiB unless it is less than 1 MiB. // This way it's easy to notice errors where one has typed // --memory=123 instead of --memory=123MiB. - uint64_t memlimit = hardware_memlimit_get(opt_mode); if (memlimit < (UINT32_C(1) << 20)) { snprintf(memlimitstr, sizeof(memlimitstr), "%s B", uint64_to_str(memlimit, 1)); diff --git a/src/xz/xz.1 b/src/xz/xz.1 index f1c9135d1592..8edc456c241f 100644 --- a/src/xz/xz.1 +++ b/src/xz/xz.1 @@ -5,7 +5,7 @@ .\" This file has been put into the public domain. .\" You can do whatever you want with this file. .\" -.TH XZ 1 "2010-10-04" "Tukaani" "XZ Utils" +.TH XZ 1 "2012-05-27" "Tukaani" "XZ Utils" . .SH NAME xz, unxz, xzcat, lzma, unlzma, lzcat \- Compress or decompress .xz and .lzma files @@ -1836,6 +1836,25 @@ headers. .PD .PP The columns of the +.B summary +lines: +.PD 0 +.RS +.IP 2. 4 +Amount of memory (in bytes) required to decompress +this file with this +.B xz +version +.IP 3. 4 +.B yes +or +.B no +indicating if all block headers have both compressed size and +uncompressed size stored in them +.RE +.PD +.PP +The columns of the .B totals line: .PD 0 |