Bumped version and liblzma soname to 5.0.2.

Updated NEWS for 5.0.2.
Update INSTALL with another note about IRIX.
2026-02-04 19:31:17 +01:00 · 2011-04-01 08:47:46 +03:00 · 2011-04-01 08:47:20 +03:00 · 2011-03-31 15:07:08 +03:00 · 2011-03-31 13:08:10 +03:00 · 2011-03-31 13:08:05 +03:00
23 changed files with 1027 additions and 98 deletions
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -118,7 +118,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.

-STRIP_FROM_PATH        =
+STRIP_FROM_PATH        = @top_srcdir@/src

 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
--- a/4
+++ b/4
@@ -68,6 +68,10 @@ XZ Utils Installation
    the -O2 optimization flag ("make check" fails). Using -O1 should
    work.

+    A problem has been reported when using shared liblzma. Passing
+    --disable-shared to configure works around this. Alternatively,
+    putting "-64" to CFLAGS to build a 64-bit version might help too.
+

 1.2.2. MINIX 3

--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,11 @@ dist_doc_DATA = \
 	doc/xz-file-format.txt \
 	doc/lzma-file-format.txt

+examplesdir = $(docdir)/examples
+dist_examples_DATA = \
+	doc/examples/xz_pipe_comp.c \
+	doc/examples/xz_pipe_decomp.c
+
 EXTRA_DIST = \
 	extra \
 	dos \
--- a/32
+++ b/32
@@ -2,6 +2,38 @@
 XZ Utils User-Visible Changes
 =============================

+5.0.2 (2011-04-01)
+
+    * LZMA2 decompressor now correctly accepts LZMA2 streams with no
+      uncompressed data. Previously it considered them corrupt. The
+      bug can affect applications that use raw LZMA2 streams. It is
+      very unlikely to affect .xz files because no compressor creates
+      .xz files with empty LZMA2 streams. (Empty .xz files are a
+      different thing than empty LZMA2 streams.)
+
+    * "xz --suffix=.foo filename.foo" now refuses to compress the
+      file due to it already having the suffix .foo. It was already
+      documented on the man page, but the code lacked the test.
+
+    * "xzgrep -l foo bar.xz" works now.
+
+    * Polish translation was added.
+
+
+5.0.1 (2011-01-29)
+
+    * xz --force now (de)compresses files that have setuid, setgid,
+      or sticky bit set and files that have multiple hard links.
+      The man page had it documented this way already, but the code
+      had a bug.
+
+    * gzip and bzip2 support in xzdiff was fixed.
+
+    * Portability fixes
+
+    * Minor fix to Czech translation
+
+
 5.0.0 (2010-10-23)

    Only the most important changes compared to 4.999.9beta are listed
--- a/5
+++ b/5
@@ -10,6 +10,8 @@ has been important. :-) In alphabetical order:
  - Karl Berry
  - Anders F. Björklund
  - Emmanuel Blot
+  - Martin Blumenstingl
+  - Jakub Bogusz
  - Trent W. Buck
  - David Burklund
  - Daniel Mealha Cabrita
@@ -22,6 +24,7 @@ has been important. :-) In alphabetical order:
  - Gilles Espinasse
  - Denis Excoffier
  - Mike Frysinger
+  - Juan Manuel Guerrero
  - Joachim Henke
  - Peter Ivanov
  - Jouk Jansen
@@ -34,6 +37,7 @@ has been important. :-) In alphabetical order:
  - Hin-Tak Leung
  - Andraž 'ruskie' Levstik
  - Lorenzo De Liso
+  - Gregory Margo
  - Jim Meyering
  - Rafał Mużyło
  - Adrien Nader
@@ -46,6 +50,7 @@ has been important. :-) In alphabetical order:
  - Mikko Pouru
  - Robert Readman
  - Bernhard Reutner-Fischer
+  - Cristian Rodríguez
  - Christian von Roques
  - Jukka Salmi
  - Alexandre Sauvé
--- a/configure.ac
+++ b/configure.ac
@@ -283,7 +283,7 @@ if test "x$enable_assembler" = xyes; then
 	case $host_os in
 		# Darwin should work too but only if not creating universal
 		# binaries. Solaris x86 could work too but I cannot test.
-		linux* | *bsd* | mingw* | cygwin*)
+		linux* | *bsd* | mingw* | cygwin* | *djgpp*)
 			case $host_cpu in
 				i?86)   enable_assembler=x86 ;;
 				x86_64) enable_assembler=x86_64 ;;
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1,4 @@
 cs
 de
 it
+pl
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xz-utils\n"
 "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2010-09-17 18:33+0200\n"
-"PO-Revision-Date: 2010-09-17 18:54+0200\n"
+"POT-Creation-Date: 2010-12-03 11:25+0100\n"
+"PO-Revision-Date: 2010-12-03 11:32+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <diskuze@lists.l10n.cz>\n"
 "Language: cs\n"
@@ -160,7 +160,7 @@ msgstr "%s: Selhalo zavření souboru: %s"
 #, c-format
 msgid "%s: Seeking failed when trying to create a sparse file: %s"
 msgstr ""
-"%s: Selhalo nastavení pozice při pokusu o vytvoření záložního souboru: %s"
+"%s: Selhalo nastavení pozice při pokusu o vytvoření souboru řídké matice: %s"

 #: src/xz/file_io.c:821
 #, c-format
@@ -427,59 +427,59 @@ msgstr ""
 "Ze standardního vstupu nelze číst data, když se ze standardního vstupu "
 "načítají názvy souborů"

-#: src/xz/message.c:800 src/xz/message.c:844
+#: src/xz/message.c:792 src/xz/message.c:842
 msgid "Internal error (bug)"
 msgstr "Interní chyba"

-#: src/xz/message.c:807
+#: src/xz/message.c:799
 msgid "Cannot establish signal handlers"
 msgstr "Nelze ustanovit ovladač signálu"

-#: src/xz/message.c:816
+#: src/xz/message.c:808
 msgid "No integrity check; not verifying file integrity"
 msgstr "Žádná kontrola integrity; integrita souboru se nebude ověřovat"

-#: src/xz/message.c:819
+#: src/xz/message.c:811
 msgid "Unsupported type of integrity check; not verifying file integrity"
 msgstr ""
 "Nepodporovaný typ kontroly integrity; integrita souboru se nebude ověřovat"

-#: src/xz/message.c:826
+#: src/xz/message.c:818
 msgid "Memory usage limit reached"
 msgstr "Dosaženo omezení použitelné paměti"

-#: src/xz/message.c:829
+#: src/xz/message.c:821
 msgid "File format not recognized"
 msgstr "Formát souboru nebyl rozpoznán"

-#: src/xz/message.c:832
+#: src/xz/message.c:824
 msgid "Unsupported options"
 msgstr "Nepodporovaná volba"

-#: src/xz/message.c:835
+#: src/xz/message.c:827
 msgid "Compressed data is corrupt"
 msgstr "Komprimovaná data jsou poškozená"

-#: src/xz/message.c:838
+#: src/xz/message.c:830
 msgid "Unexpected end of input"
 msgstr "Neočekávaný konec vstupu"

-#: src/xz/message.c:886
+#: src/xz/message.c:881
 #, c-format
 msgid "%s MiB of memory is required. The limit is %s."
 msgstr "Je vyžadováno %s MiB paměti. Limit je %s."

-#: src/xz/message.c:1053
+#: src/xz/message.c:1048
 #, c-format
 msgid "%s: Filter chain: %s\n"
 msgstr "%s: Omezující filtr: %s\n"

-#: src/xz/message.c:1063
+#: src/xz/message.c:1058
 #, c-format
 msgid "Try `%s --help' for more information."
 msgstr "Zkuste „%s --help“ pro více informací"

-#: src/xz/message.c:1089
+#: src/xz/message.c:1084
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -490,18 +490,18 @@ msgstr ""
 "Komprimuje nebo dekomprimuje SOUBORy ve formátu xz.\n"
 "\n"

-#: src/xz/message.c:1096
+#: src/xz/message.c:1091
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Povinné argumenty pro dlouhé přepínače jsou povinné rovněž pro krátké "
 "přepínače.\n"

-#: src/xz/message.c:1100
+#: src/xz/message.c:1095
 msgid " Operation mode:\n"
 msgstr "Operační režim:\n"

-#: src/xz/message.c:1103
+#: src/xz/message.c:1098
 msgid ""
 "  -z, --compress      force compression\n"
 "  -d, --decompress    force decompression\n"
@@ -513,7 +513,7 @@ msgstr ""
 " -t, --test            testovat integritu komprimovaného souboru\n"
 " -l, --list            vypsat informace o souborech .xz"

-#: src/xz/message.c:1109
+#: src/xz/message.c:1104
 msgid ""
 "\n"
 " Operation modifiers:\n"
@@ -521,7 +521,7 @@ msgstr ""
 "\n"
 "Modifikátory operací:\n"

-#: src/xz/message.c:1112
+#: src/xz/message.c:1107
 msgid ""
 "  -k, --keep          keep (don't delete) input files\n"
 "  -f, --force         force overwrite of output file and (de)compress links\n"
@@ -533,7 +533,7 @@ msgstr ""
 " -c, --stdout          zapisovat na standardní výstup a nemazat vstupní "
 "soubory"

-#: src/xz/message.c:1118
+#: src/xz/message.c:1113
 msgid ""
 "      --no-sparse     do not create sparse files when decompressing\n"
 "  -S, --suffix=.SUF   use the suffix `.SUF' on compressed files\n"
@@ -543,7 +543,7 @@ msgid ""
 "character\n"
 "      --files0[=FILE] like --files but use the null character as terminator"
 msgstr ""
-"     --no-sparse       nevytvářet při dekomprimaci záložní soubory\n"
+"     --no-sparse       nevytvářet při dekomprimaci soubory řídkých matic\n"
 " -S, --suffix=.PRIP    použít u komprimovaných souborů příponu „.PRIP“\n"
 "     --files[=SOUBOR]  číst názvy souborů, které se mají zpracovat, ze "
 "SOUBORu;\n"
@@ -553,7 +553,7 @@ msgstr ""
 "     --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový "
 "znak"

-#: src/xz/message.c:1126
+#: src/xz/message.c:1121
 msgid ""
 "\n"
 " Basic file format and compression options:\n"
@@ -561,7 +561,7 @@ msgstr ""
 "\n"
 "Základní přepínače pro formát souboru a komprimaci:\n"

-#: src/xz/message.c:1128
+#: src/xz/message.c:1123
 msgid ""
 "  -F, --format=FMT    file format to encode or decode; possible values are\n"
 "                      `auto' (default), `xz', `lzma', and `raw'\n"
@@ -574,7 +574,7 @@ msgstr ""
 "rozmyslem),\n"
 "                       „crc32“, „crc64“ (výchozí) nebo „sha256“"

-#: src/xz/message.c:1135
+#: src/xz/message.c:1130
 msgid ""
 "  -0 ... -9           compression preset; default is 6; take compressor "
 "*and*\n"
@@ -586,7 +586,7 @@ msgstr ""
 "                       hodnoty 7 – 9, vezměte do úvahy množství použité "
 "paměti"

-#: src/xz/message.c:1139
+#: src/xz/message.c:1134
 msgid ""
 "  -e, --extreme       try to improve compression ratio by using more CPU "
 "time;\n"
@@ -595,7 +595,7 @@ msgstr ""
 " -e, --extreme         zkusit zlepšit poměr komprimace využitím více času\n"
 "                       procesoru; nemá vliv na paměťové nároky dekomprimace"

-#: src/xz/message.c:1144
+#: src/xz/message.c:1139
 #, no-c-format
 msgid ""
 "      --memlimit-compress=LIMIT\n"
@@ -613,7 +613,7 @@ msgstr ""
 "paměti\n"
 "                       RAM nebo 0 pro výchozí"

-#: src/xz/message.c:1151
+#: src/xz/message.c:1146
 msgid ""
 "      --no-adjust     if compression settings exceed the memory usage "
 "limit,\n"
@@ -624,7 +624,7 @@ msgstr ""
 "použitelné\n"
 "                       paměti, předat chybu namísto snížení nastavení"

-#: src/xz/message.c:1157
+#: src/xz/message.c:1152
 msgid ""
 "\n"
 " Custom filter chain for compression (alternative for using presets):"
@@ -633,7 +633,7 @@ msgstr ""
 "Vlastní omezující filtr pro komprimaci (alternativa k použití "
 "přednastavených):"

-#: src/xz/message.c:1166
+#: src/xz/message.c:1161
 msgid ""
 "\n"
 "  --lzma1[=OPTS]      LZMA1 or LZMA2; OPTS is a comma-separated list of zero "
@@ -673,7 +673,7 @@ msgstr ""
 "                         depth=POČ  maximální hloubka prohledávání;\n"
 "                                    0 = automaticky (výchozí)"

-#: src/xz/message.c:1181
+#: src/xz/message.c:1176
 msgid ""
 "\n"
 "  --x86[=OPTS]        x86 BCJ filter (32-bit and 64-bit)\n"
@@ -695,7 +695,7 @@ msgstr ""
 "                       Platné volby pro všechny filtry BCJ:\n"
 "                         start=POČ  počáteční posun pro převody (výchozí=0)"

-#: src/xz/message.c:1193
+#: src/xz/message.c:1188
 msgid ""
 "\n"
 "  --delta[=OPTS]      Delta filter; valid OPTS (valid values; default):\n"
@@ -708,7 +708,7 @@ msgstr ""
 "odečítány\n"
 "                                    jeden od druhého (1 – 256; 1)"

-#: src/xz/message.c:1201
+#: src/xz/message.c:1196
 msgid ""
 "\n"
 " Other options:\n"
@@ -716,7 +716,7 @@ msgstr ""
 "\n"
 " Ostatní přepínače:\n"

-#: src/xz/message.c:1204
+#: src/xz/message.c:1199
 msgid ""
 "  -q, --quiet         suppress warnings; specify twice to suppress errors "
 "too\n"
@@ -727,18 +727,18 @@ msgstr ""
 " -v, --verbose         podrobnější zprávy; zadáním dvakrát, budou ještě\n"
 "                       podrobnější"

-#: src/xz/message.c:1209
+#: src/xz/message.c:1204
 msgid "  -Q, --no-warn       make warnings not affect the exit status"
 msgstr " -Q, --no-warn         způsobí, že varování neovlivní stav ukončení"

-#: src/xz/message.c:1211
+#: src/xz/message.c:1206
 msgid ""
 "      --robot         use machine-parsable messages (useful for scripts)"
 msgstr ""
 "     --robot           použít strojově analyzovatelné zprávy (užitečné pro\n"
 "                       skripty)"

-#: src/xz/message.c:1214
+#: src/xz/message.c:1209
 msgid ""
 "      --info-memory   display the total amount of RAM and the currently "
 "active\n"
@@ -748,7 +748,7 @@ msgstr ""
 "aktivní\n"
 "                       omezení použitelné paměti a skončit"

-#: src/xz/message.c:1217
+#: src/xz/message.c:1212
 msgid ""
 "  -h, --help          display the short help (lists only the basic options)\n"
 "  -H, --long-help     display this long help and exit"
@@ -757,7 +757,7 @@ msgstr ""
 "přepínače)\n"
 " -H, --long-help       zobrazit tuto úplnou nápovědu a skončit"

-#: src/xz/message.c:1221
+#: src/xz/message.c:1216
 msgid ""
 "  -h, --help          display this short help and exit\n"
 "  -H, --long-help     display the long help (lists also the advanced options)"
@@ -766,11 +766,11 @@ msgstr ""
 " -H, --long-help       zobrazit úplnou nápovědu (vypíše i pokročilé "
 "přepínače)"

-#: src/xz/message.c:1226
+#: src/xz/message.c:1221
 msgid "  -V, --version       display the version number and exit"
 msgstr " -V, --version         zobrazit číslo verze a skončit"

-#: src/xz/message.c:1228
+#: src/xz/message.c:1223
 msgid ""
 "\n"
 "With no FILE, or when FILE is -, read standard input.\n"
@@ -783,12 +783,12 @@ 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:1229
 #, c-format
 msgid "Report bugs to <%s> (in English or Finnish).\n"
 msgstr "Chyby hlaste na <%s> (v angličtině nebo finštině).\n"

-#: src/xz/message.c:1236
+#: src/xz/message.c:1231
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Domovská stránka %s: <%s>\n"
--- a/po/pl.po
+++ b/po/pl.po
@@ -0,0 +1,825 @@
+# Polish translation for xz.
+# This file is in the public domain.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xz 5.0.1\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"
+"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
+"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: src/xz/args.c:333
+#, c-format
+msgid "%s: Unknown file format type"
+msgstr "%s: Nieznany typ formatu pliku"
+
+#: src/xz/args.c:356 src/xz/args.c:364
+#, c-format
+msgid "%s: Unsupported integrity check type"
+msgstr "%s: Nieobsługiwany typ kontroli spójności"
+
+#: src/xz/args.c:382
+msgid "Only one file can be specified with `--files' or `--files0'."
+msgstr "Wraz z opcją `--files' lub `--files0' można podać tylko jeden plik."
+
+#: src/xz/args.c:445
+#, c-format
+msgid "The environment variable %s contains too many arguments"
+msgstr "Zmienna środowiskowa %s zawiera zbyt dużo argumentów"
+
+#: src/xz/coder.c:95
+msgid "Maximum number of filters is four"
+msgstr "Maksymalna liczba filtrów to cztery"
+
+#: src/xz/coder.c:108
+msgid "Memory usage limit is too low for the given filter setup."
+msgstr "Limit użycia pamięci jest zbyt mały dla podanej konfiguracji filtra."
+
+#: src/xz/coder.c:129
+msgid "Using a preset in raw mode is discouraged."
+msgstr "Użycie ustawień predefiniowanych w trybie surowym jest odradzane."
+
+#: src/xz/coder.c:131
+msgid "The exact options of the presets may vary between software versions."
+msgstr "Dokładne opcje ustawień predefiniowanych mogą różnić się między wersjami oprogramowania."
+
+#: src/xz/coder.c:157
+msgid "The .lzma format supports only the LZMA1 filter"
+msgstr "Format .lzma obsługuje tylko filtr LZMA1"
+
+#: src/xz/coder.c:165
+msgid "LZMA1 cannot be used with the .xz format"
+msgstr "LZMA1 nie może być używany z formatem .xz"
+
+#: src/xz/coder.c:182
+msgid "Unsupported filter chain or filter options"
+msgstr "Nieobsługiwany łańcuch filtrów lub opcje filtra"
+
+#: src/xz/coder.c:190
+#, c-format
+msgid "Decompression will need %s MiB of memory."
+msgstr "Dekompresja będzie wymagała %s MiB pamięci."
+
+#: 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 "Skorygowano rozmiar słownika LZMA%c z %s MiB do %s MiB aby nie przekroczyć limitu użycia pamięci %s MiB"
+
+#. TRANSLATORS: When compression or decompression finishes,
+#. and xz is going to remove the source file, xz first checks
+#. if the source file still exists, and if it does, does its
+#. device and inode numbers match what xz saw when it opened
+#. the source file. If these checks fail, this message is
+#. shown, %s being the filename, and the file is not deleted.
+#. The check for device and inode numbers is there, because
+#. 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
+#, c-format
+msgid "%s: File seems to have been moved, not removing"
+msgstr "%s: Plik wygląda na przeniesiony, nie zostanie usunięty"
+
+#: src/xz/file_io.c:144 src/xz/file_io.c:589
+#, c-format
+msgid "%s: Cannot remove: %s"
+msgstr "%s: Nie można usunąć: %s"
+
+#: src/xz/file_io.c:169
+#, c-format
+msgid "%s: Cannot set the file owner: %s"
+msgstr "%s: Nie można ustawić właściciela pliku: %s"
+
+#: src/xz/file_io.c:175
+#, c-format
+msgid "%s: Cannot set the file group: %s"
+msgstr "%s: Nie można ustawić grupy pliku: %s"
+
+#: src/xz/file_io.c:194
+#, c-format
+msgid "%s: Cannot set the file permissions: %s"
+msgstr "%s: Nie można ustawić uprawnień pliku: %s"
+
+#: src/xz/file_io.c:337 src/xz/file_io.c:420
+#, c-format
+msgid "%s: Is a symbolic link, skipping"
+msgstr "%s: Jest dowiązaniem symbolicznym, pominięto"
+
+#: src/xz/file_io.c:455
+#, c-format
+msgid "%s: Is a directory, skipping"
+msgstr "%s: Jest katalogiem, pominięto"
+
+#: src/xz/file_io.c:461
+#, c-format
+msgid "%s: Not a regular file, skipping"
+msgstr "%s: Nie jest zwykłym plikiem, pominięto"
+
+#: src/xz/file_io.c:478
+#, c-format
+msgid "%s: File has setuid or setgid bit set, skipping"
+msgstr "%s: Plik ma ustawiony bit setuid lub setgid, pominięto"
+
+#: src/xz/file_io.c:485
+#, c-format
+msgid "%s: File has sticky bit set, skipping"
+msgstr "%s: Plik ma ustawiony bit sticky, pominięto"
+
+#: src/xz/file_io.c:492
+#, c-format
+msgid "%s: Input file has more than one hard link, skipping"
+msgstr "%s: Plik wejściowy ma więcej niż jedno dowiązanie zwykłe, pominięto"
+
+#: src/xz/file_io.c:713
+#, c-format
+msgid "Error restoring the O_APPEND flag to standard output: %s"
+msgstr "Błąd podczas odtwarzania flagi O_APPEND dla standardowego wyjścia: %s"
+
+#: src/xz/file_io.c:725
+#, c-format
+msgid "%s: Closing the file failed: %s"
+msgstr "%s: Zamknięcie pliku nie powiodło się: %s"
+
+#: 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: Zmiana pozycji nie powiodła się podczas próby utworzenia pliku rzadkiego: %s"
+
+#: src/xz/file_io.c:820
+#, c-format
+msgid "%s: Read error: %s"
+msgstr "%s: Błąd odczytu: %s"
+
+#: src/xz/file_io.c:843
+#, c-format
+msgid "%s: Error seeking the file: %s"
+msgstr "%s: Błąd podczas zmiany pozycji w pliku: %s"
+
+#: src/xz/file_io.c:853
+#, c-format
+msgid "%s: Unexpected end of file"
+msgstr "%s: Nieoczekiwany koniec pliku"
+
+#: src/xz/file_io.c:903
+#, c-format
+msgid "%s: Write error: %s"
+msgstr "%s: Błąd zapisu: %s"
+
+#: src/xz/hardware.c:100
+msgid "Disabled"
+msgstr "Wyłączony"
+
+#. TRANSLATORS: Test with "xz --info-memory" to see if
+#. the alignment looks nice.
+#: src/xz/hardware.c:119
+msgid "Total amount of physical memory (RAM): "
+msgstr "Całkowita ilość pamięci fizycznej (RAM): "
+
+#: src/xz/hardware.c:121
+msgid "Memory usage limit for compression:    "
+msgstr "Limit użycia pamięci dla kompresji:      "
+
+#: src/xz/hardware.c:123
+msgid "Memory usage limit for decompression:  "
+msgstr "Limit użycia pamięci dla dekompresji:    "
+
+#. 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
+msgid "None"
+msgstr "Brak"
+
+#. TRANSLATORS: Indicates that integrity check name is not known,
+#. 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, but don't use spaces.
+#: src/xz/list.c:69
+msgid "Unknown-2"
+msgstr "Nieznany-2"
+
+#: src/xz/list.c:70
+msgid "Unknown-3"
+msgstr "Nieznany-3"
+
+#: src/xz/list.c:72
+msgid "Unknown-5"
+msgstr "Nieznany-5"
+
+#: src/xz/list.c:73
+msgid "Unknown-6"
+msgstr "Nieznany-6"
+
+#: src/xz/list.c:74
+msgid "Unknown-7"
+msgstr "Nieznany-7"
+
+#: src/xz/list.c:75
+msgid "Unknown-8"
+msgstr "Nieznany-8"
+
+#: src/xz/list.c:76
+msgid "Unknown-9"
+msgstr "Nieznany-9"
+
+#: src/xz/list.c:78
+msgid "Unknown-11"
+msgstr "Nieznany11"
+
+#: src/xz/list.c:79
+msgid "Unknown-12"
+msgstr "Nieznany12"
+
+#: src/xz/list.c:80
+msgid "Unknown-13"
+msgstr "Nieznany13"
+
+#: src/xz/list.c:81
+msgid "Unknown-14"
+msgstr "Nieznany14"
+
+#: src/xz/list.c:82
+msgid "Unknown-15"
+msgstr "Nieznany15"
+
+#: src/xz/list.c:126
+#, c-format
+msgid "%s: File is empty"
+msgstr "%s: Plik jest pusty"
+
+#: src/xz/list.c:131
+#, c-format
+msgid "%s: Too small to be a valid .xz file"
+msgstr "%s: Za mały na poprawny plik .xz"
+
+#. TRANSLATORS: These are column headings. From Strms (Streams)
+#. 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
+msgid "Strms  Blocks   Compressed Uncompressed  Ratio  Check   Filename"
+msgstr "Strum.  Bloki    Spakowany  Rozpakowany  Wsp.  Kontrola Nazwa pliku"
+
+#: src/xz/list.c:652
+#, c-format
+msgid "  Streams:            %s\n"
+msgstr "  Strumienie:            %s\n"
+
+#: src/xz/list.c:654
+#, c-format
+msgid "  Blocks:             %s\n"
+msgstr "  Bloki:                 %s\n"
+
+#: src/xz/list.c:656
+#, c-format
+msgid "  Compressed size:    %s\n"
+msgstr "  Rozmiar spakowany:     %s\n"
+
+#: src/xz/list.c:659
+#, c-format
+msgid "  Uncompressed size:  %s\n"
+msgstr "  Rozmiar rozpakowany:   %s\n"
+
+#: src/xz/list.c:662
+#, c-format
+msgid "  Ratio:              %s\n"
+msgstr "  Współczynnik:          %s\n"
+
+#: src/xz/list.c:664
+#, c-format
+msgid "  Check:              %s\n"
+msgstr "  Kontrola spójności:    %s\n"
+
+#: src/xz/list.c:665
+#, c-format
+msgid "  Stream padding:     %s\n"
+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
+msgid ""
+"  Streams:\n"
+"    Stream    Blocks      CompOffset    UncompOffset        CompSize      UncompSize  Ratio  Check      Padding"
+msgstr ""
+"  Strumienie:\n"
+"  Strumień     Bloki    Offset spak.    Offset rozp.        Rozm.spak.    Rozm.rozp.  Wsp.   Kontrola   Wyrównanie"
+
+#. TRANSLATORS: The second line is column headings. All
+#. except Check are right aligned; Check is left aligned.
+#: src/xz/list.c:748
+#, c-format
+msgid ""
+"  Blocks:\n"
+"    Stream     Block      CompOffset    UncompOffset       TotalSize      UncompSize  Ratio  Check"
+msgstr ""
+"  Bloki:\n"
+"  Strumień      Blok    Offset spak.    Offset rozp.  Rozm.całkowity      Rozm.rozp.  Wsp.   Kontrola"
+
+#. TRANSLATORS: These are additional column headings
+#. for the most verbose listing mode. CheckVal
+#. (Check value), Flags, and Filters are left aligned.
+#. Header (Block Header Size), CompSize, and MemUsage
+#. 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
+#, 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
+#, c-format
+msgid "  Memory needed:      %s MiB\n"
+msgstr "  Wymagana pamięć:       %s MiB\n"
+
+#: src/xz/list.c:840 src/xz/list.c:1009
+#, 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
+msgid "Yes"
+msgstr "Tak"
+
+#: src/xz/list.c:841 src/xz/list.c:1010
+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
+#, c-format
+msgid "%s file\n"
+msgid_plural "%s files\n"
+msgstr[0] "%s plik\n"
+msgstr[1] "%s pliki\n"
+msgstr[2] "%s plików\n"
+
+#: src/xz/list.c:999
+msgid "Totals:"
+msgstr "Sumarycznie:"
+
+#: src/xz/list.c:1000
+#, c-format
+msgid "  Number of files:    %s\n"
+msgstr "  Liczba plików:         %s\n"
+
+#: src/xz/list.c:1072
+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
+msgid "--list does not support reading from standard input"
+msgstr "--list nie obsługuje odczytu ze standardowego wejścia"
+
+#: src/xz/main.c:89
+#, c-format
+msgid "%s: Error reading filenames: %s"
+msgstr "%s: Błąd odczytu nazw plików: %s"
+
+#: src/xz/main.c:96
+#, c-format
+msgid "%s: Unexpected end of input when reading filenames"
+msgstr "%s: Nieoczekiwany koniec wejścia podczas odczytu nazw plików"
+
+#: src/xz/main.c:120
+#, c-format
+msgid "%s: Null character found when reading filenames; maybe you meant to use `--files0' instead of `--files'?"
+msgstr "%s: Napotkano znak NUL podczas odczytu nazw plików; może miało być `--files0' zamiast `--files'?"
+
+#: src/xz/main.c:174
+msgid "Compression and decompression with --robot are not supported yet."
+msgstr "Kompresja i dekompresja z opcją --robot nie jest jeszcze obsługiwana."
+
+#: src/xz/main.c:231
+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
+msgid "Internal error (bug)"
+msgstr "Błąd wewnętrzny"
+
+#: src/xz/message.c:799
+msgid "Cannot establish signal handlers"
+msgstr "Nie można ustawić obsługi sygnałów"
+
+#: src/xz/message.c:808
+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
+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
+msgid "Memory usage limit reached"
+msgstr "Osiągnięto limit użycia pamięci"
+
+#: src/xz/message.c:821
+msgid "File format not recognized"
+msgstr "Nie rozpoznany format pliku"
+
+#: src/xz/message.c:824
+msgid "Unsupported options"
+msgstr "Nieobsługiwane opcje"
+
+#: src/xz/message.c:827
+msgid "Compressed data is corrupt"
+msgstr "Dane skompresowane są uszkodzone"
+
+#: src/xz/message.c:830
+msgid "Unexpected end of input"
+msgstr "Nieoczekiwany koniec wejścia"
+
+#: src/xz/message.c:881
+#, 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
+#, c-format
+msgid "%s: Filter chain: %s\n"
+msgstr "%s: Łańcuch filtrów: %s\n"
+
+#: src/xz/message.c:1058
+#, c-format
+msgid "Try `%s --help' for more information."
+msgstr "Polecenie `%s --help' pokaże więcej informacji."
+
+#: src/xz/message.c:1084
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [FILE]...\n"
+"Compress or decompress FILEs in the .xz format.\n"
+"\n"
+msgstr ""
+"Składnia: %s [OPCJA]... [PLIK]...\n"
+"Kompresja lub dekompresja PLIKÓW w formacie .xz.\n"
+"\n"
+
+#: src/xz/message.c:1091
+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
+msgid " Operation mode:\n"
+msgstr " Tryb pracy:\n"
+
+#: src/xz/message.c:1098
+msgid ""
+"  -z, --compress      force compression\n"
+"  -d, --decompress    force decompression\n"
+"  -t, --test          test compressed file integrity\n"
+"  -l, --list          list information about .xz files"
+msgstr ""
+"  -z, --compress      wymuszenie kompresji\n"
+"  -d, --decompress    wymuszenie dekompresji\n"
+"  -t, --test          sprawdzenie spójności plików skompresowanych\n"
+"  -l, --list          wypisanie informacji o plikach .xz"
+
+#: src/xz/message.c:1104
+msgid ""
+"\n"
+" Operation modifiers:\n"
+msgstr ""
+"\n"
+" Modyfikatory operacji:\n"
+
+#: src/xz/message.c:1107
+msgid ""
+"  -k, --keep          keep (don't delete) input files\n"
+"  -f, --force         force overwrite of output file and (de)compress links\n"
+"  -c, --stdout        write to standard output and don't delete input files"
+msgstr ""
+"  -k, --keep          zachowanie (nieusuwanie) plików wejściowych\n"
+"  -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
+msgid ""
+"      --no-sparse     do not create sparse files when decompressing\n"
+"  -S, --suffix=.SUF   use the suffix `.SUF' on compressed files\n"
+"      --files[=FILE]  read filenames to process from FILE; if FILE is\n"
+"                      omitted, filenames are read from the standard input;\n"
+"                      filenames must be terminated with the newline character\n"
+"      --files0[=FILE] like --files but use the null character as terminator"
+msgstr ""
+"      --no-sparse     nietworzenie plików rzadkich podczas dekompresji\n"
+"  -S, --suffix=.ROZ   użycie rozszerzenia `.ROZ' dla plików skompresowanych\n"
+"      --files[=PLIK]  odczyt nazw plików do przetworzenia z PLIKU; jeśli PLIK\n"
+"                      nie został podany, nazwy są czytane ze standardowego\n"
+"                      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
+msgid ""
+"\n"
+" Basic file format and compression options:\n"
+msgstr ""
+"\n"
+" Podstawowe opcje formatu pliku i kompresji:\n"
+
+#: src/xz/message.c:1123
+msgid ""
+"  -F, --format=FMT    file format to encode or decode; possible values are\n"
+"                      `auto' (default), `xz', `lzma', and `raw'\n"
+"  -C, --check=CHECK   integrity check type: `none' (use with caution),\n"
+"                      `crc32', `crc64' (default), or `sha256'"
+msgstr ""
+"  -F, --format=FORM   format pliki do kodowania lub dekodowania; możliwe to\n"
+"                      `auto' (domyślny), `xz', 'lzma' i `raw'\n"
+"  -C, --check=TEST    typ kontroli spójności: `none' (ostrożnie!),\n"
+"                      `crc32', `crc64' (domyślny) lub `sha256'"
+
+#: src/xz/message.c:1130
+msgid ""
+"  -0 ... -9           compression preset; default is 6; take compressor *and*\n"
+"                      decompressor memory usage into account before using 7-9!"
+msgstr ""
+"  -0 ... -9           predefiniowane opcje kompresji; domyślna to 6; przed\n"
+"                      użyciem wartości 7-9 należy wziąć pod uwagę wykorzystanie\n"
+"                      pamięci przy kompresji *oraz* dekompresji!"
+
+#: src/xz/message.c:1134
+msgid ""
+"  -e, --extreme       try to improve compression ratio by using more CPU time;\n"
+"                      does not affect decompressor memory requirements"
+msgstr ""
+"  -e, --extreme       próba poprawy współczynnika kompresji z użyciem większej\n"
+"                      ilości czasu procesora; nie wpływa na wymagania\n"
+"                      pamięciowe dekompresora"
+
+#: src/xz/message.c:1139
+#, no-c-format
+msgid ""
+"      --memlimit-compress=LIMIT\n"
+"      --memlimit-decompress=LIMIT\n"
+"  -M, --memlimit=LIMIT\n"
+"                      set memory usage limit for compression, decompression,\n"
+"                      or both; LIMIT is in bytes, % of RAM, or 0 for defaults"
+msgstr ""
+"      --memlimit-compress=LIMIT\n"
+"      --memlimit-decompress=LIMIT\n"
+"  -M, --memlimit=LIMIT\n"
+"                      ustawienie limitu użycia pamięci dla kompresji,\n"
+"                      dekompresji lub obu; LIMIT jest w bajtach, % RAM lub 0\n"
+"                      dla limitów domyślnych"
+
+#: src/xz/message.c:1146
+msgid ""
+"      --no-adjust     if compression settings exceed the memory usage limit,\n"
+"                      give an error instead of adjusting the settings downwards"
+msgstr ""
+"      --no-adjust     jeśli ustawienia kompresji przekraczają limit użycia\n"
+"                      pamięci, zostanie zgłoszony błąd zamiast zmniejszania\n"
+"                      ustawień"
+
+#: src/xz/message.c:1152
+msgid ""
+"\n"
+" Custom filter chain for compression (alternative for using presets):"
+msgstr ""
+"\n"
+" Łańcuch własnych filtrów do kompresji (alternatywa do używania -0 .. -9):"
+
+#: src/xz/message.c:1161
+msgid ""
+"\n"
+"  --lzma1[=OPTS]      LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n"
+"  --lzma2[=OPTS]      more of the following options (valid values; default):\n"
+"                        preset=PRE reset options to a preset (0-9[e])\n"
+"                        dict=NUM   dictionary size (4KiB - 1536MiB; 8MiB)\n"
+"                        lc=NUM     number of literal context bits (0-4; 3)\n"
+"                        lp=NUM     number of literal position bits (0-4; 0)\n"
+"                        pb=NUM     number of position bits (0-4; 2)\n"
+"                        mode=MODE  compression mode (fast, normal; normal)\n"
+"                        nice=NUM   nice length of a match (2-273; 64)\n"
+"                        mf=NAME    match finder (hc3, hc4, bt2, bt3, bt4; bt4)\n"
+"                        depth=NUM  maximum search depth; 0=automatic (default)"
+msgstr ""
+"\n"
+"  --lzma1[=OPCJE]     LZMA1 lub LZMA2; OPCJE to oddzielona przecinkami lista\n"
+"  --lzma2[=OPCJE]     zera lub więcej następujących opcji (w nawiasach wartości\n"
+"                      poprawne; domyślne):\n"
+"                        preset=PRE ustawienie opcji na predefiniowane (0-9[e])\n"
+"                        dict=ILE   rozmiar słownika (4KiB - 1536MiB; 8MiB)\n"
+"                        lc=ILE     liczba bitów kontekstu literału (0-4; 3)\n"
+"                        lp=ILE     liczba bitów pozycji literału (0-4; 0)\n"
+"                        pp=ILE     liczba bitów pozycji (0-4; 2)\n"
+"                        mode=TRYB  tryb kompresji (fast, normal; normal)\n"
+"                        nice=ILE   długość dopasowania (2-273; 64)\n"
+"                        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
+msgid ""
+"\n"
+"  --x86[=OPTS]        x86 BCJ filter (32-bit and 64-bit)\n"
+"  --powerpc[=OPTS]    PowerPC BCJ filter (big endian only)\n"
+"  --ia64[=OPTS]       IA-64 (Itanium) BCJ filter\n"
+"  --arm[=OPTS]        ARM BCJ filter (little endian only)\n"
+"  --armthumb[=OPTS]   ARM-Thumb BCJ filter (little endian only)\n"
+"  --sparc[=OPTS]      SPARC BCJ filter\n"
+"                      Valid OPTS for all BCJ filters:\n"
+"                        start=NUM  start offset for conversions (default=0)"
+msgstr ""
+"\n"
+"  --x86[=OPCJE]       Filtr BCJ x86 (32-bitowy lub 64-bitowy)\n"
+"  --powerpc[=OPCJE]   Filtr BCJ PowerPC (tylko big-endian)\n"
+"  --ia64[=OPCJE]      Filtr BCJ IA-64 (Itanium)\n"
+"  --arm[=OPCJE]       Filtr BCJ ARM (tylko little-endian)\n"
+"  --armthumb[=OPCJE]  Filtr BCJ ARM-Thumb (tylko little-endian)\n"
+"  --sparc[=OPCJE]     Filtr BCJ SPARC\n"
+"                      Poprawne OPCJE dla wszystkich filtrów BCJ:\n"
+"                        start=ILE  offset początku konwersji (domyślnie=0)"
+
+#: src/xz/message.c:1188
+msgid ""
+"\n"
+"  --delta[=OPTS]      Delta filter; valid OPTS (valid values; default):\n"
+"                        dist=NUM   distance between bytes being subtracted\n"
+"                                   from each other (1-256; 1)"
+msgstr ""
+"\n"
+"  --delta[=OPCJE]     Filtr delta; poprawne OPCJE (poprawne wart.; domyślne):\n"
+"                        dist=ILE   odległość między bajtami odejmowanymi od\n"
+"                                   siebie (1-256; 1)"
+
+#: src/xz/message.c:1196
+msgid ""
+"\n"
+" Other options:\n"
+msgstr ""
+"\n"
+" Inne opcje:\n"
+
+#: src/xz/message.c:1199
+msgid ""
+"  -q, --quiet         suppress warnings; specify twice to suppress errors too\n"
+"  -v, --verbose       be verbose; specify twice for even more verbose"
+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
+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
+msgid "      --robot         use machine-parsable messages (useful for scripts)"
+msgstr "      --robot         komunikaty w formacie dla maszyny (do skryptów)"
+
+#: src/xz/message.c:1209
+msgid ""
+"      --info-memory   display the total amount of RAM and the currently active\n"
+"                      memory usage limits, and exit"
+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
+msgid ""
+"  -h, --help          display the short help (lists only the basic options)\n"
+"  -H, --long-help     display this long help and exit"
+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
+msgid ""
+"  -h, --help          display this short help and exit\n"
+"  -H, --long-help     display the long help (lists also the advanced options)"
+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
+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
+msgid ""
+"\n"
+"With no FILE, or when FILE is -, read standard input.\n"
+msgstr ""
+"\n"
+"Jeśli nie podano PLIKU lub PLIK to -, czytane jest standardowe wejście.\n"
+
+#. TRANSLATORS: This message indicates the bug reporting address
+#. 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
+#, c-format
+msgid "Report bugs to <%s> (in English or Finnish).\n"
+msgstr ""
+"Błędy prosimy zgłaszać na adres <%s>\n"
+"(w języku angielskim lub fińskim).\n"
+"Błędy w tłumaczeniu prosimy zgłaszać na adres\n"
+"<translation-team-pl@lists.sourceforge.net>.\n"
+
+#: src/xz/message.c:1231
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Strona domowa %s: <%s>\n"
+
+#: src/xz/options.c:86
+#, c-format
+msgid "%s: Options must be `name=value' pairs separated with commas"
+msgstr "%s: Opcje muszą być parami `nazwa=wartość' rozdzielonymi przecinkami"
+
+#: src/xz/options.c:93
+#, c-format
+msgid "%s: Invalid option name"
+msgstr "%s: Błędna nazwa opcji"
+
+#: src/xz/options.c:113
+#, c-format
+msgid "%s: Invalid option value"
+msgstr "%s: Błędna wartość opcji"
+
+#: src/xz/options.c:247
+#, c-format
+msgid "Unsupported LZMA1/LZMA2 preset: %s"
+msgstr "Nieobsługiwane ustawienie predefiniowane LZMA1/LZMA2: %s"
+
+#: src/xz/options.c:355
+msgid "The sum of lc and lp must not exceed 4"
+msgstr "Suma lc i lp nie może przekroczyć 4"
+
+#: src/xz/options.c:359
+#, c-format
+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
+#, 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
+#, c-format
+msgid "%s: Filename has an unknown suffix, skipping"
+msgstr "%s: Nazwa pliku ma nieznane rozszerzenie, pominięto"
+
+#: src/xz/suffix.c:179
+#, c-format
+msgid "%s: File already has `%s' suffix, skipping"
+msgstr "%s: Plik już ma rozszerzenie `%s', pominięto"
+
+#: src/xz/suffix.c:230
+#, c-format
+msgid "%s: Invalid filename suffix"
+msgstr "%s: Błędne rozszerzenie nazwy pliku"
+
+#: src/xz/util.c:61
+#, c-format
+msgid "%s: Value is not a non-negative decimal integer"
+msgstr "%s: Wartość nie jest nieujemną liczbą całkowitą"
+
+#: src/xz/util.c:103
+#, c-format
+msgid "%s: Invalid multiplier suffix"
+msgstr "%s: Błędny przyrostek mnożnika"
+
+#: src/xz/util.c:105
+msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)."
+msgstr "Poprawne przyrostki to `KiB' (2^10), `MiB' (2^20) i `GiB' (2^30)."
+
+#: src/xz/util.c:122
+#, c-format
+msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]"
+msgstr "Wartość opcji `%s' musi być w przedziale [%<PRIu64>, %<PRIu64>]"
+
+#: src/xz/util.c:247
+msgid "Empty filename, skipping"
+msgstr "Pusta nazwa pliku, pominięto"
+
+#: src/xz/util.c:261
+msgid "Compressed data cannot be read from a terminal"
+msgstr "Dane skompresowane nie mogą być czytane z terminala"
+
+#: src/xz/util.c:274
+msgid "Compressed data cannot be written to a terminal"
+msgstr "Dane skompresowane nie mogą być zapisywane na terminal"
+
+#: src/common/tuklib_exit.c:39
+msgid "Writing to standard output failed"
+msgstr "Zapis na standardowe wyjście nie powiódł się"
+
+#: src/common/tuklib_exit.c:42
+msgid "Unknown error"
+msgstr "Nieznany błąd"
--- a/src/common/sysdefs.h
+++ b/src/common/sysdefs.h
@@ -65,6 +65,9 @@
 #ifndef PRIu32
 #	define PRIu32 "u"
 #endif
+#ifndef PRIx32
+#	define PRIx32 "x"
+#endif
 #ifndef PRIX32
 #	define PRIX32 "X"
 #endif
@@ -76,6 +79,9 @@
 #	ifndef PRIu64
 #		define PRIu64 "llu"
 #	endif
+#	ifndef PRIx64
+#		define PRIx64 "llx"
+#	endif
 #	ifndef PRIX64
 #		define PRIX64 "llX"
 #	endif
@@ -86,6 +92,9 @@
 #	ifndef PRIu64
 #		define PRIu64 "lu"
 #	endif
+#	ifndef PRIx64
+#		define PRIx64 "lx"
+#	endif
 #	ifndef PRIX64
 #		define PRIX64 "lX"
 #	endif
@@ -171,4 +180,10 @@ typedef unsigned char _Bool;
 #	define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
 #endif

+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
+#	define lzma_attr_alloc_size(x) __attribute__((__alloc_size__(x)))
+#else
+#	define lzma_attr_alloc_size(x)
+#endif
+
 #endif
--- a/src/liblzma/Makefile.am
+++ b/src/liblzma/Makefile.am
@@ -24,7 +24,7 @@ liblzma_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/liblzma/simple \
 	-I$(top_srcdir)/src/common \
 	-DTUKLIB_SYMBOL_PREFIX=lzma_
-liblzma_la_LDFLAGS = -no-undefined -version-info 5:0:0
+liblzma_la_LDFLAGS = -no-undefined -version-info 5:2:0

 include $(srcdir)/common/Makefile.inc
 include $(srcdir)/check/Makefile.inc
--- a/src/liblzma/api/lzma/lzma.h
+++ b/src/liblzma/api/lzma/lzma.h
@@ -412,6 +412,9 @@ typedef struct {
 *
 * This function is available only if LZMA1 or LZMA2 encoder has been enabled
 * when building liblzma.
+ *
+ * \return      On success, false is returned. If the preset is not
+ *              supported, true is returned.
 */
 extern LZMA_API(lzma_bool) lzma_lzma_preset(
 		lzma_options_lzma *options, uint32_t preset) lzma_nothrow;
--- 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 0
+#define LZMA_VERSION_PATCH 2
 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE

 #ifndef LZMA_VERSION_COMMIT
--- a/src/liblzma/common/common.h
+++ b/src/liblzma/common/common.h
@@ -205,7 +205,7 @@ struct lzma_internal_s {

 /// Allocates memory
 extern void *lzma_alloc(size_t size, lzma_allocator *allocator)
-		lzma_attribute((malloc));
+		lzma_attribute((malloc)) lzma_attr_alloc_size(1);

 /// Frees memory
 extern void lzma_free(void *ptr, lzma_allocator *allocator);
--- a/src/liblzma/lzma/lzma2_decoder.c
+++ b/src/liblzma/lzma/lzma2_decoder.c
@@ -67,6 +67,10 @@ lzma2_decode(lzma_coder *restrict coder, lzma_dict *restrict dict,
 		const uint32_t control = in[*in_pos];
 		++*in_pos;

+		// End marker
+		if (control == 0x00)
+			return LZMA_STREAM_END;
+
 		if (control >= 0xE0 || control == 1) {
 			// Dictionary reset implies that next LZMA chunk has
 			// to set new properties.
@@ -104,10 +108,6 @@ lzma2_decode(lzma_coder *restrict coder, lzma_dict *restrict dict,
 							&coder->options);
 			}
 		} else {
-			// End marker
-			if (control == 0x00)
-				return LZMA_STREAM_END;
-
 			// Invalid control values
 			if (control > 2)
 				return LZMA_DATA_ERROR;
--- a/src/scripts/xzdiff.in
+++ b/src/scripts/xzdiff.in
@@ -74,9 +74,9 @@ if test $# -eq 1; then
    *[-.]xz | *[-.]lzma | *.t[lx]z)
      ;;
    *[-.]bz2 | *.tbz | *.tbz2)
-      xz1=$bzip2;;
+      xz1=bzip2;;
    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z)
-      xz1=$gzip;;
+      xz1=gzip;;
    *)
      echo >&2 "$0: $1: Unknown compressed file name suffix"
      exit 2;;
@@ -95,12 +95,12 @@ if test $# -eq 1; then
  )
 elif test $# -eq 2; then
  case $1 in
-    *[-.]bz2 | *.tbz | *.tbz2) xz1=$bzip2;;
-    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z) xz1=$gzip;;
+    *[-.]bz2 | *.tbz | *.tbz2) xz1=bzip2;;
+    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z) xz1=gzip;;
  esac
  case $2 in
-    *[-.]bz2 | *.tbz | *.tbz2) xz2=$bzip2;;
-    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z) xz2=$gzip;;
+    *[-.]bz2 | *.tbz | *.tbz2) xz2=bzip2;;
+    *[-.][zZ] | *_z | *[-.]gz | *.t[ag]z) xz2=gzip;;
  esac
  case $1 in
    *[-.][zZ] | *_z | *[-.][gx]z | *[-.]bz2 | *[-.]lzma | *.t[abglx]z | *.tbz2 | -)
--- a/src/scripts/xzgrep.in
+++ b/src/scripts/xzgrep.in
@@ -126,6 +126,10 @@ while test $# -ne 0; do
  grep="$grep $option$optarg"
 done

+if test $files_with_matches -eq 1 || test $files_without_matches -eq 1; then
+  grep="$grep -q"
+fi
+
 eval "set -- $operands "'${1+"$@"}'

 if test $have_pat -eq 0; then
@@ -156,9 +160,9 @@ for i; do
    exec 5>&1
    ($uncompress -- "$i" 5>&-; echo $? >&5) 3>&- |
    if test $files_with_matches -eq 1; then
-      eval "$grep" -q && { printf '%s\n' "$i" || exit 2; }
+      eval "$grep" && { printf '%s\n' "$i" || exit 2; }
    elif test $files_without_matches -eq 1; then
-      eval "$grep" -q || {
+      eval "$grep" || {
        r=$?
        if test $r -eq 1; then
          printf '%s\n' "$i" || r=2
--- a/src/xz/file_io.c
+++ b/src/xz/file_io.c
@@ -457,15 +457,14 @@ io_open_src_real(file_pair *pair)
 		goto error;
 	}

-	if (reg_files_only) {
-		if (!S_ISREG(pair->src_st.st_mode)) {
-			message_warning(_("%s: Not a regular file, "
-					"skipping"), pair->src_name);
-			goto error;
-		}
+	if (reg_files_only && !S_ISREG(pair->src_st.st_mode)) {
+		message_warning(_("%s: Not a regular file, skipping"),
+				pair->src_name);
+		goto error;
+	}

-		// These are meaningless on Windows.
 #ifndef TUKLIB_DOSLIKE
+	if (reg_files_only && !opt_force) {
 		if (pair->src_st.st_mode & (S_ISUID | S_ISGID)) {
 			// gzip rejects setuid and setgid files even
 			// when --force was used. bzip2 doesn't check
@@ -495,8 +494,8 @@ io_open_src_real(file_pair *pair)
 					"skipping"), pair->src_name);
 			goto error;
 		}
-#endif
 	}
+#endif

 	return false;

--- a/src/xz/suffix.c
+++ b/src/xz/suffix.c
@@ -21,10 +21,28 @@
 static char *custom_suffix = NULL;


-struct suffix_pair {
-	const char *compressed;
-	const char *uncompressed;
-};
+/// \brief      Test if the char is a directory separator
+static bool
+is_dir_sep(char c)
+{
+#ifdef TUKLIB_DOSLIKE
+	return c == '/' || c == '\\' || c == ':';
+#else
+	return c == '/';
+#endif
+}
+
+
+/// \brief      Test if the string contains a directory separator
+static bool
+has_dir_sep(const char *str)
+{
+#ifdef TUKLIB_DOSLIKE
+	return strpbrk(str, "/\\:") != NULL;
+#else
+	return strchr(str, '/') != NULL;
+#endif
+}


 /// \brief      Checks if src_name has given compressed_suffix
@@ -44,7 +62,8 @@ test_suffix(const char *suffix, const char *src_name, size_t src_len)
 	// The filename must have at least one character in addition to
 	// the suffix. src_name may contain path to the filename, so we
 	// need to check for directory separator too.
-	if (src_len <= suffix_len || src_name[src_len - suffix_len - 1] == '/')
+	if (src_len <= suffix_len
+			|| is_dir_sep(src_name[src_len - suffix_len - 1]))
 		return 0;

 	if (strcmp(suffix, src_name + src_len - suffix_len) == 0)
@@ -61,7 +80,10 @@ test_suffix(const char *suffix, const char *src_name, size_t src_len)
 static char *
 uncompressed_name(const char *src_name, const size_t src_len)
 {
-	static const struct suffix_pair suffixes[] = {
+	static const struct {
+		const char *compressed;
+		const char *uncompressed;
+	} suffixes[] = {
 		{ ".xz",    "" },
 		{ ".txz",   ".tar" }, // .txz abbreviation for .txt.gz is rare.
 		{ ".lzma",  "" },
@@ -120,25 +142,25 @@ static char *
 compressed_name(const char *src_name, const size_t src_len)
 {
 	// The order of these must match the order in args.h.
-	static const struct suffix_pair all_suffixes[][3] = {
+	static const char *const all_suffixes[][3] = {
 		{
-			{ ".xz",    "" },
-			{ ".txz",   ".tar" },
-			{ NULL, NULL }
+			".xz",
+			".txz",
+			NULL
 		}, {
-			{ ".lzma",  "" },
-			{ ".tlz",   ".tar" },
-			{ NULL,     NULL }
+			".lzma",
+			".tlz",
+			NULL
 /*
 		}, {
-			{ ".gz",    "" },
-			{ ".tgz",   ".tar" },
-			{ NULL,     NULL }
+			".gz",
+			".tgz",
+			NULL
 */
 		}, {
 			// --format=raw requires specifying the suffix
 			// manually or using stdout.
-			{ NULL,     NULL }
+			NULL
 		}
 	};

@@ -146,14 +168,22 @@ compressed_name(const char *src_name, const size_t src_len)
 	assert(opt_format != FORMAT_AUTO);

 	const size_t format = opt_format - 1;
-	const struct suffix_pair *const suffixes = all_suffixes[format];
+	const char *const *suffixes = all_suffixes[format];

-	for (size_t i = 0; suffixes[i].compressed != NULL; ++i) {
-		if (test_suffix(suffixes[i].compressed, src_name, src_len)
-				!= 0) {
+	for (size_t i = 0; suffixes[i] != NULL; ++i) {
+		if (test_suffix(suffixes[i], src_name, src_len) != 0) {
 			message_warning(_("%s: File already has `%s' "
 					"suffix, skipping"), src_name,
-					suffixes[i].compressed);
+					suffixes[i]);
+			return NULL;
+		}
+	}
+
+	if (custom_suffix != NULL) {
+		if (test_suffix(custom_suffix, src_name, src_len) != 0) {
+			message_warning(_("%s: File already has `%s' "
+					"suffix, skipping"), src_name,
+					custom_suffix);
 			return NULL;
 		}
 	}
@@ -168,7 +198,7 @@ compressed_name(const char *src_name, const size_t src_len)
 	}

 	const char *suffix = custom_suffix != NULL
-			? custom_suffix : suffixes[0].compressed;
+			? custom_suffix : suffixes[0];
 	const size_t suffix_len = strlen(suffix);

 	char *dest_name = xmalloc(src_len + suffix_len + 1);
@@ -199,9 +229,9 @@ suffix_get_dest_name(const char *src_name)
 extern void
 suffix_set(const char *suffix)
 {
-	// Empty suffix and suffixes having a slash are rejected. Such
-	// suffixes would break things later.
-	if (suffix[0] == '\0' || strchr(suffix, '/') != NULL)
+	// Empty suffix and suffixes having a directory separator are
+	// rejected. Such suffixes would break things later.
+	if (suffix[0] == '\0' || has_dir_sep(suffix))
 		message_fatal(_("%s: Invalid filename suffix"), optarg);

 	// Replace the old custom_suffix (if any) with the new suffix.
--- a/src/xz/util.h
+++ b/src/xz/util.h
@@ -19,11 +19,12 @@


 /// \brief      Safe realloc() that never returns NULL
-extern void *xrealloc(void *ptr, size_t size);
+extern void *xrealloc(void *ptr, size_t size)
+		lzma_attribute((malloc)) lzma_attr_alloc_size(2);


 /// \brief      Safe strdup() that never returns NULL
-extern char *xstrdup(const char *src);
+extern char *xstrdup(const char *src) lzma_attribute((malloc));


 /// \brief      Fancy version of strtoull()
--- a/tests/files/README
+++ b/tests/files/README
@@ -87,6 +87,10 @@
    uncompressed with dictionary reset, and third is LZMA with new
    properties but without dictionary reset.

+    good-1-lzma2-5.xz has an empty LZMA2 stream with only the end of
+    payload marker. XZ Utils 5.0.1 and older incorrectly see this file
+    as corrupt.
+
    good-1-3delta-lzma2.xz has three Delta filters and LZMA2.


--- a/tests/files/good-1-lzma2-5.xz
+++ b/tests/files/good-1-lzma2-5.xz
--- a/windows/build.bash
+++ b/windows/build.bash
@@ -161,7 +161,7 @@ fi

 # Copy the headers, the .def file, and the docs.
 # They are the same for all architectures and builds.
-mkdir -pv pkg/{include/lzma,doc/manuals}
+mkdir -pv pkg/{include/lzma,doc/{manuals,examples}}
 txtcp pkg/include "" src/liblzma/api/lzma.h
 txtcp pkg/include/lzma "" src/liblzma/api/lzma/*.h
 txtcp pkg/doc "" src/liblzma/liblzma.def
@@ -169,6 +169,7 @@ txtcp pkg/doc .txt AUTHORS COPYING NEWS README THANKS TODO
 txtcp pkg/doc "" doc/*.txt windows/README-Windows.txt
 txtcp pkg/doc/manuals "" doc/man/txt/{xz,xzdec,lzmainfo}.txt
 cp -v doc/man/pdf-*/{xz,xzdec,lzmainfo}-*.pdf pkg/doc/manuals
+txtcp pkg/doc/examples "" doc/examples/*

 if [ -f windows/COPYING-Windows.txt ]; then
 	txtcp pkg/doc "" windows/COPYING-Windows.txt
Author	SHA1	Message	Date
Lasse Collin	58f52c72f4	Bumped version and liblzma soname to 5.0.2.	2011-04-01 08:47:46 +03:00
Lasse Collin	162779682e	Updated NEWS for 5.0.2.	2011-04-01 08:47:20 +03:00
Lasse Collin	45553f9b4b	Update INSTALL with another note about IRIX.	2011-03-31 15:07:08 +03:00
Lasse Collin	af9d48d551	Tests: Add a new file to test empty LZMA2 streams.	2011-03-31 13:08:10 +03:00
Lasse Collin	d099ef9f51	liblzma: Fix decoding of LZMA2 streams having no uncompressed data. The decoder considered empty LZMA2 streams to be corrupt. This shouldn't matter much with .xz files, because no encoder creates empty LZMA2 streams in .xz. This bug is more likely to cause problems in applications that use raw LZMA2 streams.	2011-03-31 13:08:05 +03:00
Lasse Collin	df87249b26	Scripts: Better fix for xzgrep. Now it uses "grep -q". Thanks to Gregory Margo.	2011-03-24 01:43:23 +02:00
Lasse Collin	68c453e1c7	Updated THANKS.	2011-03-24 01:24:16 +02:00
Lasse Collin	b441d39855	Scripts: Fix xzgrep -l. It didn't work at all. It tried to use the -q option for grep, but it appended it after "--". This works around it by redirecting to /dev/null. The downside is that this can be slower with big files compared to proper use of "grep -q". Thanks to Gregory Margo.	2011-03-24 01:24:12 +02:00
Lasse Collin	82d5164839	xz: Clean up suffix.c. struct suffix_pair isn't needed in compresed_name() so get rid of it there.	2011-02-04 22:49:31 +02:00
Lasse Collin	6decc8b418	xz: Check if the file already has custom suffix when compressing. Now "xz -S .test foo.test" refuses to compress the file because it already has the suffix .test. The man page had it documented this way already.	2011-02-04 11:29:47 +02:00
Lasse Collin	ecda90061d	Updated THANKS.	2011-02-02 23:01:51 +02:00
Lasse Collin	0fda1ae5b1	Translations: Add Polish translation. Thanks to Jakub Bogusz.	2011-02-02 23:00:33 +02:00
Lasse Collin	00be32978f	Updated THANKS.	2011-02-02 22:24:00 +02:00
Lasse Collin	7232fcf96b	Bump package version and liblzma soname to 5.0.1.	2011-01-28 20:26:38 +02:00
Lasse Collin	5fbce0b8d9	Update NEWS for 5.0.1.	2011-01-28 20:16:57 +02:00
Lasse Collin	03ebd1bbb3	xz: Fix --force on setuid/setgid/sticky and multi-hardlink files. xz didn't compress setuid/setgid/sticky files and files with multiple hard links even with --force. This bug was introduced in `23ac2c44c3`. Thanks to Charles Wilson.	2011-01-26 12:19:08 +02:00
Lasse Collin	7bd0a5e7cc	Updated THANKS.	2011-01-18 21:25:24 +02:00
Lasse Collin	f71c4e16e9	Add alloc_size and malloc attributes to a few functions. Thanks to Cristian Rodríguez for the original patch.	2011-01-18 21:23:50 +02:00
Lasse Collin	316cbe2446	Scripts: Fix gzip and bzip2 support in xzdiff.	2010-12-13 16:36:33 +02:00
Lasse Collin	9311774c49	Build: Enable ASM on DJGPP by default.	2010-12-12 21:23:55 +02:00
Lasse Collin	4a42aaee28	Updated THANKS.	2010-12-12 16:09:42 +02:00
Lasse Collin	ce56f63c41	Add missing PRIx32 and PRIx64 compatibility definitions. This fixes portability to systems that lack C99 inttypes.h. Thanks to Juan Manuel Guerrero.	2010-12-12 16:07:11 +02:00
Lasse Collin	e6baedddcf	DOS-like: Treat \ and : as directory separators in addition to /. Juan Manuel Guerrero had fixed this in his XZ Utils port to DOS/DJGPP. The bug affects also Windows and OS/2.	2010-12-12 14:50:04 +02:00
Lasse Collin	b7afd3e22a	Translations: Fix Czech translation of "sparse file". Thanks to Petr Hubený and Marek Černocký.	2010-12-07 18:52:04 +02:00
Lasse Collin	3e564704bc	liblzma: Document the return value of lzma_lzma_preset().	2010-11-15 14:28:26 +02:00
Jonathan Nieder	2964d8d691	Simplify paths in generated API docs Currently the file list generated by Doxygen has src/ at the beginning of each path. Paths like common/sysdefs.h and liblzma/api/lzma.h are easier to read without such a prefix. Builds from a separate build directory with mkdir build cd build ../configure doxygen Doxyfile include an even longer prefix /home/someone/src/xz/src; this patch has the nice side-effect of eliminating that prefix, too. Fixes: http://bugs.debian.org/572273	2010-11-13 14:36:28 +02:00
Lasse Collin	37c25658ef	Build: Copy the example programs to $docdir/examples. The example programs by Daniel Mealha Cabrita were included in the git repository, but I had forgot to add them to Makefile.am. Thus, they didn't get included in the source package at all by "make dist".	2010-10-26 15:48:48 +03:00