svn commit: r245128 - in stable/9/contrib/xz: . po src/common src/liblzma/api/lzma src/liblzma/simple src/xz
Martin Matuska
mm at svn.freebsd.org
Mon Jan 7 11:11:06 UTC 2013
Author: mm
Date: Mon Jan 7 11:11:04 2013
New Revision: 245128
URL: http://svnweb.freebsd.org/changeset/base/245128
Log:
MFC r244601:
Update contrib/xz to version 5.0.4
Modified:
stable/9/contrib/xz/AUTHORS
stable/9/contrib/xz/ChangeLog
stable/9/contrib/xz/README
stable/9/contrib/xz/THANKS
stable/9/contrib/xz/po/de.po
stable/9/contrib/xz/po/fr.po
stable/9/contrib/xz/po/it.po
stable/9/contrib/xz/po/pl.po
stable/9/contrib/xz/src/common/sysdefs.h
stable/9/contrib/xz/src/liblzma/api/lzma/version.h
stable/9/contrib/xz/src/liblzma/simple/simple_coder.c
stable/9/contrib/xz/src/liblzma/simple/simple_private.h
stable/9/contrib/xz/src/xz/args.c
stable/9/contrib/xz/src/xz/coder.c
stable/9/contrib/xz/src/xz/message.c
stable/9/contrib/xz/src/xz/xz.1
Directory Properties:
stable/9/contrib/xz/ (props changed)
Modified: stable/9/contrib/xz/AUTHORS
==============================================================================
--- stable/9/contrib/xz/AUTHORS Mon Jan 7 07:33:48 2013 (r245127)
+++ stable/9/contrib/xz/AUTHORS Mon Jan 7 11:11:04 2013 (r245128)
@@ -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.
Modified: stable/9/contrib/xz/ChangeLog
==============================================================================
--- stable/9/contrib/xz/ChangeLog Mon Jan 7 07:33:48 2013 (r245127)
+++ stable/9/contrib/xz/ChangeLog Mon Jan 7 11:11:04 2013 (r245128)
@@ -1,3 +1,335 @@
+commit 20778053a07eb90c159c1377ca8dc05a90fd530b
+Author: Lasse Collin <lasse.collin at 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 at 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 at tukaani.org>
+Date: Fri Jun 22 10:25:09 2012 +0300
+
+ Update NEWS for 5.0.4.
+
+commit 711fa680f552a4003df73b37e6dc4d6e00b47bcd
+Author: Lasse Collin <lasse.collin at 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 at 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 at 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 at 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 at 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 at 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 at 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 at tukaani.org>
+Date: Tue May 29 22:26:27 2012 +0300
+
+ Translations: Update the German translation.
+
+commit c66808d1f55d0149ed57c536cc9b52e9c8b583bc
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date: Tue May 29 22:12:57 2012 +0300
+
+ Translations: Update Polish translation.
+
+commit 556c22dfed195c1466b298183b850d6c28544900
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date: Tue May 29 13:10:36 2012 +0300
+
+ Preliminary NEWS for 5.0.4.
+
+commit dd13b66bf582f49d3aec36e3410ff8541b7506da
+Author: Lasse Collin <lasse.collin at 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 at tukaani.org>
+Date: Mon May 28 15:38:32 2012 +0300
+
+ Update THANKS.
+
+commit 86e57e4bfefe3fd8e13615c41604165bb2359501
+Author: Lasse Collin <lasse.collin at 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 at 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 at 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 at tukaani.org>
+Date: Thu May 10 21:15:17 2012 +0300
+
+ Update THANKS.
+
+commit 35e9c58abb0ce3993da844aaeaa3e7231cd2be8f
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date: Thu May 10 21:14:16 2012 +0300
+
+ Docs: Cleanup line wrapping a bit.
+
+commit 532b3e4c568a228309b56f95c13435fd078dbe02
+Author: Benno Schulenberg <bensberg at 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 at justemail.net>
+
+commit afb6ce8c82ffef8f2505a3759da72a733c7b0b8f
+Author: Lasse Collin <lasse.collin at 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 at tukaani.org>
+Date: Thu Apr 19 15:25:26 2012 +0300
+
+ liblzma: Remove outdated comments.
+
+commit f55db9c187651094f43881c49db2b2d9ffee6b80
+Author: Lasse Collin <lasse.collin at 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 at 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 at tukaani.org>
+Date: Wed Feb 22 14:23:13 2012 +0200
+
+ Update THANKS.
+
+commit b7ad23fa78646036c0290cd91eada939c9a31526
+Author: Lasse Collin <lasse.collin at 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 at tukaani.org>
+Date: Wed Feb 22 12:08:43 2012 +0200
+
+ Update THANKS.
+
+commit c6fa03a427e3d1320794102cee3ff4f5ae00eb36
+Author: Lasse Collin <lasse.collin at 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 at 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 at 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 at 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 at 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 at tukaani.org>
+Date: Thu Nov 3 17:08:02 2011 +0200
+
+ Update THANKS.
+
+commit 55fd02f83ecd6cbd6925a3e8a3d43b8d4ef2a17c
+Author: Lasse Collin <lasse.collin at 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 at tukaani.org>
+Date: Tue Sep 6 12:03:41 2011 +0300
+
+ Build: Fix "make check" on Windows.
+
+commit 0f25758459c74c366a73f35d47ee12b75890bb79
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date: Tue Aug 9 21:19:13 2011 +0300
+
+ Update THANKS.
+
+commit 70f03b51ffcb783646b20de8d97b6986c4280eec
+Author: Lasse Collin <lasse.collin at 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 at 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 at 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 at users.sourceforge.net>
Date: Fri Nov 5 12:56:11 2010 +0100
Modified: stable/9/contrib/xz/README
==============================================================================
--- stable/9/contrib/xz/README Mon Jan 7 07:33:48 2013 (r245127)
+++ stable/9/contrib/xz/README Mon Jan 7 11:11:04 2013 (r245128)
@@ -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,
Modified: stable/9/contrib/xz/THANKS
==============================================================================
--- stable/9/contrib/xz/THANKS Mon Jan 7 07:33:48 2013 (r245127)
+++ stable/9/contrib/xz/THANKS Mon Jan 7 11:11:04 2013 (r245128)
@@ -14,16 +14,19 @@ has been important. :-) In alphabetical
- 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
- 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
- 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
- Christian von Roques
- Jukka Salmi
- Alexandre Sauvé
+ - Benno Schulenberg
- Andreas Schwab
- Dan Shechter
- Stuart Shelton
Modified: stable/9/contrib/xz/po/de.po
==============================================================================
--- stable/9/contrib/xz/po/de.po Mon Jan 7 07:33:48 2013 (r245127)
+++ stable/9/contrib/xz/po/de.po Mon Jan 7 11:11:04 2013 (r245128)
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: XZ Utils 4.999.9beta\n"
"Report-Msgid-Bugs-To: lasse.collin at 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 at systemlinux.org>\n"
"Language-Team: German\n"
@@ -96,7 +96,7 @@ msgid "%s: File seems to have been moved
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 Ve
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 .x
#. 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 ""
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-stable-9
mailing list