aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog122
-rw-r--r--THANKS2
-rw-r--r--po/cs.po222
-rw-r--r--po/de.po267
-rw-r--r--po/it.po271
-rw-r--r--po/xz.pot34
-rw-r--r--src/common/sysdefs.h15
-rw-r--r--src/liblzma/api/lzma/lzma.h3
-rw-r--r--src/liblzma/api/lzma/version.h2
-rw-r--r--src/liblzma/common/common.h2
-rw-r--r--src/xz/file_io.c15
-rw-r--r--src/xz/suffix.c33
-rw-r--r--src/xz/util.h5
13 files changed, 687 insertions, 306 deletions
diff --git a/ChangeLog b/ChangeLog
index 66775f3b68a7..7d5406c8a7eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,125 @@
+commit 7232fcf96bf4bd5f9cd4fc6c93ca2912c665e004
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Fri Jan 28 20:26:38 2011 +0200
+
+ Bump package version and liblzma soname to 5.0.1.
+
+commit 5fbce0b8d96dc96775aa0215e3581addc830e23d
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Fri Jan 28 20:16:57 2011 +0200
+
+ Update NEWS for 5.0.1.
+
+commit 03ebd1bbb314f9f204940219a835c883bf442475
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Wed Jan 26 12:19:08 2011 +0200
+
+ 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 23ac2c44c3ac76994825adb7f9a8f719f78b5ee4.
+
+ Thanks to Charles Wilson.
+
+commit 7bd0a5e7ccc354f7c2e95c8bc27569c820f6a136
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Tue Jan 18 21:25:24 2011 +0200
+
+ Updated THANKS.
+
+commit f71c4e16e913f660977526f0ef8d2acdf458d7c9
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Tue Jan 18 21:23:50 2011 +0200
+
+ Add alloc_size and malloc attributes to a few functions.
+
+ Thanks to Cristian Rodríguez for the original patch.
+
+commit 316cbe24465143edde8f6ffb7532834b7b2ea93f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Mon Dec 13 16:36:33 2010 +0200
+
+ Scripts: Fix gzip and bzip2 support in xzdiff.
+
+commit 9311774c493c19deab51ded919dcd2e9c4aa2829
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Sun Dec 12 21:23:55 2010 +0200
+
+ Build: Enable ASM on DJGPP by default.
+
+commit 4a42aaee282fc73b482581684d65110506d5efdd
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Sun Dec 12 16:09:42 2010 +0200
+
+ Updated THANKS.
+
+commit ce56f63c41ee210e6308090eb6d49221fdf67d6c
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Sun Dec 12 16:07:11 2010 +0200
+
+ Add missing PRIx32 and PRIx64 compatibility definitions.
+
+ This fixes portability to systems that lack C99 inttypes.h.
+
+ Thanks to Juan Manuel Guerrero.
+
+commit e6baedddcf54e7da049ebc49183565b99facd4c7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Sun Dec 12 14:50:04 2010 +0200
+
+ 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.
+
+commit b7afd3e22a8fac115b75c738d40d3eb1de7e286f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Tue Dec 7 18:52:04 2010 +0200
+
+ Translations: Fix Czech translation of "sparse file".
+
+ Thanks to Petr Hubený and Marek Černocký.
+
+commit 3e564704bc6f463cb2db11e3f3f0dbd71d85992e
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Mon Nov 15 14:28:26 2010 +0200
+
+ liblzma: Document the return value of lzma_lzma_preset().
+
+commit 2964d8d691ed92abdcf214888d79ad6d79774735
+Author: Jonathan Nieder <jrnieder@gmail.com>
+Date: Fri Nov 12 15:22:13 2010 -0600
+
+ 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
+
+commit 37c25658efd25b034266daf87cd381d20d1df776
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: Tue Oct 26 15:48:48 2010 +0300
+
+ 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".
+
commit e45929260cd902036efd40c5610a8d0a50d5712b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Sat Oct 23 17:25:52 2010 +0300
diff --git a/THANKS b/THANKS
index 635a29ac0dfa..a9a22083e195 100644
--- a/THANKS
+++ b/THANKS
@@ -22,6 +22,7 @@ has been important. :-) In alphabetical order:
- Gilles Espinasse
- Denis Excoffier
- Mike Frysinger
+ - Juan Manuel Guerrero
- Joachim Henke
- Peter Ivanov
- Jouk Jansen
@@ -46,6 +47,7 @@ has been important. :-) In alphabetical order:
- Mikko Pouru
- Robert Readman
- Bernhard Reutner-Fischer
+ - Cristian Rodríguez
- Christian von Roques
- Jukka Salmi
- Alexandre Sauvé
diff --git a/po/cs.po b/po/cs.po
index 5bebf6e4661f..a7041ec613cc 100644
--- 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-10-23 17:48+0300\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"
@@ -30,7 +30,8 @@ msgstr "%s: Neznámý typ kontroly integrity"
#: src/xz/args.c:382
msgid "Only one file can be specified with `--files' or `--files0'."
-msgstr "Spolu s přepínači „--files“ nebo „--files0“ může být zadán pouze jeden soubor"
+msgstr ""
+"Spolu s přepínači „--files“ nebo „--files0“ může být zadán pouze jeden soubor"
#: src/xz/args.c:445
#, c-format
@@ -51,7 +52,8 @@ msgstr "Použití přednastavení v režimu raw je nevhodné."
#: src/xz/coder.c:131
msgid "The exact options of the presets may vary between software versions."
-msgstr "Přesné volby u přednastavení se mohou lišit mezi různými verzemi softwaru."
+msgstr ""
+"Přesné volby u přednastavení se mohou lišit mezi různými verzemi softwaru."
#: src/xz/coder.c:157
msgid "The .lzma format supports only the LZMA1 filter"
@@ -72,8 +74,12 @@ msgstr "Dekomprimace bude vyžadovat %s MiB paměti."
#: 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 "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení použitelné paměti %s MiB"
+msgid ""
+"Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the "
+"memory usage limit of %s MiB"
+msgstr ""
+"Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo "
+"překročeno omezení použitelné paměti %s MiB"
#. TRANSLATORS: When compression or decompression finishes,
#. and xz is going to remove the source file, xz first checks
@@ -153,7 +159,8 @@ msgstr "%s: Selhalo zavření souboru: %s"
#: src/xz/file_io.c:762 src/xz/file_io.c:946
#, 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"
+msgstr ""
+"%s: Selhalo nastavení pozice při pokusu o vytvoření souboru řídké matice: %s"
#: src/xz/file_io.c:821
#, c-format
@@ -312,10 +319,12 @@ msgstr " Zarovnání proudu: %s\n"
#: src/xz/list.c:693
msgid ""
" Streams:\n"
-" Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding"
+" Stream Blocks CompOffset UncompOffset CompSize "
+"UncompSize Ratio Check Padding"
msgstr ""
" Proudy:\n"
-" Proud Bloky KomprPozice NekomprPozice KomprVelikost NekomprVelikost Poměr Kontrola Zarovnání"
+" Proud Bloky KomprPozice NekomprPozice KomprVelikost "
+"NekomprVelikost Poměr Kontrola Zarovnání"
#. TRANSLATORS: The second line is column headings. All
#. except Check are right aligned; Check is left aligned.
@@ -323,10 +332,12 @@ msgstr ""
#, c-format
msgid ""
" Blocks:\n"
-" Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check"
+" Stream Block CompOffset UncompOffset TotalSize "
+"UncompSize Ratio Check"
msgstr ""
" Bloky:\n"
-" Proud Blok KomprPozice NekomprPozice CelkVelikost NekomprVelikost Poměr Kontrola"
+" Proud Blok KomprPozice NekomprPozice CelkVelikost "
+"NekomprVelikost Poměr Kontrola"
#. TRANSLATORS: These are additional column headings
#. for the most verbose listing mode. CheckVal
@@ -397,16 +408,24 @@ msgstr "%s: Neočekávaný konec vstupu při čtení názvů souborů"
#: 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: Byl nalezen nulový znak při čtení názvů souborů; nechtěli jste náhodou použít „--files0“ místo „--files“?"
+msgid ""
+"%s: Null character found when reading filenames; maybe you meant to use `--"
+"files0' instead of `--files'?"
+msgstr ""
+"%s: Byl nalezen nulový znak při čtení názvů souborů; nechtěli jste náhodou "
+"použít „--files0“ místo „--files“?"
#: src/xz/main.c:174
msgid "Compression and decompression with --robot are not supported yet."
msgstr "Komprimace a dekomprimace s přepínačem --robot není zatím podporovaná."
#: src/xz/main.c:231
-msgid "Cannot read data from standard input when reading filenames from standard input"
-msgstr "Ze standardního vstupu nelze číst data, když se ze standardního vstupu načítají názvy souborů"
+msgid ""
+"Cannot read data from standard input when reading filenames from standard "
+"input"
+msgstr ""
+"Ze standardního vstupu nelze číst data, když se ze standardního vstupu "
+"načítají názvy souborů"
#: src/xz/message.c:792 src/xz/message.c:842
msgid "Internal error (bug)"
@@ -422,7 +441,8 @@ msgstr "Žádná kontrola integrity; integrita souboru se nebude ověřovat"
#: 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"
+msgstr ""
+"Nepodporovaný typ kontroly integrity; integrita souboru se nebude ověřovat"
#: src/xz/message.c:818
msgid "Memory usage limit reached"
@@ -471,8 +491,11 @@ msgstr ""
"\n"
#: 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"
+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:1095
msgid " Operation mode:\n"
@@ -505,8 +528,10 @@ msgid ""
" -c, --stdout write to standard output and don't delete input files"
msgstr ""
" -k, --keep zachovat (nemazat) vstupní soubory\n"
-" -f, --force vynutit přepis výstupního souboru a de/komprimovat odkazy\n"
-" -c, --stdout zapisovat na standardní výstup a nemazat vstupní soubory"
+" -f, --force vynutit přepis výstupního souboru a de/komprimovat "
+"odkazy\n"
+" -c, --stdout zapisovat na standardní výstup a nemazat vstupní "
+"soubory"
#: src/xz/message.c:1113
msgid ""
@@ -514,15 +539,19 @@ msgid ""
" -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"
+" filenames must be terminated with the newline "
+"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"
-" pokud není SOUBOR zadán, čte se ze standardního vstupu;\n"
+" --files[=SOUBOR] číst názvy souborů, které se mají zpracovat, ze "
+"SOUBORu;\n"
+" pokud není SOUBOR zadán, čte se ze standardního "
+"vstupu;\n"
" názvy souborů musí být zakončeny znakem nového řádku\n"
-" --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový znak"
+" --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový "
+"znak"
#: src/xz/message.c:1121
msgid ""
@@ -541,20 +570,26 @@ msgid ""
msgstr ""
" -F, --format=FORMÁT formát souboru k zakódování nebo dekódování; možné\n"
" hodnoty jsou „auto“ (výchozí), „xz“, „lzma“ a „raw“\n"
-" -C, --check=KONTROLA typ kontroly integrity: „none“ (používejte s rozmyslem),\n"
+" -C, --check=KONTROLA typ kontroly integrity: „none“ (používejte s "
+"rozmyslem),\n"
" „crc32“, „crc64“ (výchozí) nebo „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!"
+" -0 ... -9 compression preset; default is 6; take compressor "
+"*and*\n"
+" decompressor memory usage into account before using "
+"7-9!"
msgstr ""
-" -0 .. -9 přednastavení komprimace; výchozí je 6; než použijete\n"
-" hodnoty 7 – 9, vezměte do úvahy množství použité paměti"
+" -0 .. -9 přednastavení komprimace; výchozí je 6; než "
+"použijete\n"
+" hodnoty 7 – 9, vezměte do úvahy množství použité "
+"paměti"
#: src/xz/message.c:1134
msgid ""
-" -e, --extreme try to improve compression ratio by using more CPU time;\n"
+" -e, --extreme try to improve compression ratio by using more CPU "
+"time;\n"
" does not affect decompressor memory requirements"
msgstr ""
" -e, --extreme zkusit zlepšit poměr komprimace využitím více času\n"
@@ -566,22 +601,27 @@ msgid ""
" --memlimit-compress=LIMIT\n"
" --memlimit-decompress=LIMIT\n"
" -M, --memlimit=LIMIT\n"
-" set memory usage limit for compression, decompression,\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"
" nastaví omezení použitelné paměti pro komprimaci,\n"
-" dekomprimaci nebo obojí; LIMIT je v bajtech, % z paměti\n"
+" dekomprimaci nebo obojí; LIMIT je v bajtech, % z "
+"paměti\n"
" RAM nebo 0 pro výchozí"
#: 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"
+" --no-adjust if compression settings exceed the memory usage "
+"limit,\n"
+" give an error instead of adjusting the settings "
+"downwards"
msgstr ""
-" --no-adjust pokud nastavení komprimace přesáhne omezení použitelné\n"
+" --no-adjust pokud nastavení komprimace přesáhne omezení "
+"použitelné\n"
" paměti, předat chybu namísto snížení nastavení"
#: src/xz/message.c:1152
@@ -590,13 +630,16 @@ msgid ""
" Custom filter chain for compression (alternative for using presets):"
msgstr ""
"\n"
-"Vlastní omezující filtr pro komprimaci (alternativa k použití přednastavených):"
+"Vlastní omezující filtr pro komprimaci (alternativa k použití "
+"přednastavených):"
#: 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"
+" --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"
@@ -604,20 +647,29 @@ msgid ""
" 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)"
+" mf=NAME match finder (hc3, hc4, bt2, bt3, bt4; "
+"bt4)\n"
+" depth=NUM maximum search depth; 0=automatic "
+"(default)"
msgstr ""
"\n"
-" --lzma1[=VOLBY] LZMA1 nebo LZMA2; VOLBY je čárkou oddělovaný seznam žádné\n"
-" --lzma2[=VOLBY] nebo více následujících voleb (platné hodnoty; výchozí):\n"
-" preset=PŘE změnit volby na PŘEdnastavené (0 – 9[e])\n"
-" dict=POČ velikost slovníku (4 KiB – 1536 MiB; 8 MiB)\n"
-" lc=POČ počet kontextových bitů literálu (0 – 4; 3)\n"
-" lp=POČ počet pozičních bitů literálu (0 – 4; 0)\n"
+" --lzma1[=VOLBY] LZMA1 nebo LZMA2; VOLBY je čárkou oddělovaný seznam "
+"žádné\n"
+" --lzma2[=VOLBY] nebo více následujících voleb (platné hodnoty; "
+"výchozí):\n"
+" preset=PŘE změnit volby na PŘEdnastavené (0 – 9"
+"[e])\n"
+" dict=POČ velikost slovníku (4 KiB – 1536 MiB; 8 "
+"MiB)\n"
+" lc=POČ počet kontextových bitů literálu (0 – 4; "
+"3)\n"
+" lp=POČ počet pozičních bitů literálu (0 – 4; "
+"0)\n"
" pb=POČ počet pozičních bitů (0 – 4; 2)\n"
" mode=REŽIM režim komprimace (fast, normal; normal)\n"
" nice=NUM příznivá délka shody (2 – 273; 64)\n"
-" mf=NÁZEV hledání shod (hc3, hc4, bt2, bt3, bt4; bt4)\n"
+" mf=NÁZEV hledání shod (hc3, hc4, bt2, bt3, bt4; "
+"bt4)\n"
" depth=POČ maximální hloubka prohledávání;\n"
" 0 = automaticky (výchozí)"
@@ -652,7 +704,8 @@ msgid ""
msgstr ""
"\n"
" --delta[=VOLBY] Filtr Delta; platné VOLBY (platné hodnoty; výchozí):\n"
-" dist=POČ vzdálenost mezi bajty, které jsou odečítány\n"
+" dist=POČ vzdálenost mezi bajty, které jsou "
+"odečítány\n"
" jeden od druhého (1 – 256; 1)"
#: src/xz/message.c:1196
@@ -665,10 +718,12 @@ msgstr ""
#: src/xz/message.c:1199
msgid ""
-" -q, --quiet suppress warnings; specify twice to suppress errors too\n"
+" -q, --quiet suppress warnings; specify twice to suppress errors "
+"too\n"
" -v, --verbose be verbose; specify twice for even more verbose"
msgstr ""
-" -q, --quiet potlačit varování; zadáním dvakrát, potlačíte i chyby\n"
+" -q, --quiet potlačit varování; zadáním dvakrát, potlačíte i "
+"chyby\n"
" -v, --verbose podrobnější zprávy; zadáním dvakrát, budou ještě\n"
" podrobnější"
@@ -677,17 +732,20 @@ 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:1206
-msgid " --robot use machine-parsable messages (useful for scripts)"
+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:1209
msgid ""
-" --info-memory display the total amount of RAM and the currently active\n"
+" --info-memory display the total amount of RAM and the currently "
+"active\n"
" memory usage limits, and exit"
msgstr ""
-" --info-memory zobrazit celkové množství paměti RAM a současné aktivní\n"
+" --info-memory zobrazit celkové množství paměti RAM a současné "
+"aktivní\n"
" omezení použitelné paměti a skončit"
#: src/xz/message.c:1212
@@ -695,7 +753,8 @@ 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 zobrazit krátkou nápovědu (vypíše jen základní přepínače)\n"
+" -h, --help zobrazit krátkou nápovědu (vypíše jen základní "
+"přepínače)\n"
" -H, --long-help zobrazit tuto úplnou nápovědu a skončit"
#: src/xz/message.c:1216
@@ -704,7 +763,8 @@ msgid ""
" -H, --long-help display the long help (lists also the advanced options)"
msgstr ""
" -h, --help zobrazit tuto zkrácenou nápovědu a skončit\n"
-" -H, --long-help zobrazit úplnou nápovědu (vypíše i pokročilé přepínače)"
+" -H, --long-help zobrazit úplnou nápovědu (vypíše i pokročilé "
+"přepínače)"
#: src/xz/message.c:1221
msgid " -V, --version display the version number and exit"
@@ -716,7 +776,8 @@ msgid ""
"With no FILE, or when FILE is -, read standard input.\n"
msgstr ""
"\n"
-"Pokud SOUBOR není zadán nebo pokud je -, bude se číst ze standardního vstupu.\n"
+"Pokud SOUBOR není zadán nebo pokud je -, bude se číst ze standardního "
+"vstupu.\n"
#. TRANSLATORS: This message indicates the bug reporting address
#. for this package. Please add _another line_ saying
@@ -763,8 +824,11 @@ msgstr "Vybraný vyhledávač shod vyžaduje minimálně nice=%<PRIu32>"
#: src/xz/suffix.c:79 src/xz/suffix.c:164
#, c-format
-msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout"
-msgstr "%s: S přepínačem --format=raw je vyžadován --sufix=.PRIP, vyjma zápisu do standardního výstupu"
+msgid ""
+"%s: With --format=raw, --suffix=.SUF is required unless writing to stdout"
+msgstr ""
+"%s: S přepínačem --format=raw je vyžadován --sufix=.PRIP, vyjma zápisu do "
+"standardního výstupu"
#: src/xz/suffix.c:99
#, c-format
@@ -793,7 +857,9 @@ msgstr "%s: Neplatná jednotka s předponou"
#: src/xz/util.c:105
msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)."
-msgstr "Platné jednotky s předponami jsou „KiB“ (2^10 B), „MiB“ (2^20 B) a „GiB“ (2^30 B)."
+msgstr ""
+"Platné jednotky s předponami jsou „KiB“ (2^10 B), „MiB“ (2^20 B) a "
+"„GiB“ (2^30 B)."
#: src/xz/util.c:122
#, c-format
@@ -827,37 +893,49 @@ msgstr "Neznámá chyba"
#~ msgstr "%s MiB (%s bajtů)\n"
#~ msgid ""
-#~ " -e, --extreme use more CPU time when encoding to increase compression\n"
+#~ " -e, --extreme use more CPU time when encoding to increase "
+#~ "compression\n"
#~ " ratio without increasing memory usage of the decoder"
#~ msgstr ""
-#~ " -e, --extreme využít více procesorového času pro kódování, čímž se\n"
-#~ " zvýší kompresní poměr bez zvýšení paměti použité kodérem"
+#~ " -e, --extreme využít více procesorového času pro kódování, čímž "
+#~ "se\n"
+#~ " zvýší kompresní poměr bez zvýšení paměti použité "
+#~ "kodérem"
#~ msgid ""
-#~ " -M, --memory=NUM use roughly NUM bytes of memory at maximum; 0 indicates\n"
+#~ " -M, --memory=NUM use roughly NUM bytes of memory at maximum; 0 "
+#~ "indicates\n"
#~ " the default setting, which is 40 % of total RAM"
#~ msgstr ""
-#~ " -M, --memory=POČ použít zhruba POČ bajtů paměti jako maximum; 0 znamená\n"
-#~ " výchozí nastavení, což je 40% celkového množství paměti"
+#~ " -M, --memory=POČ použít zhruba POČ bajtů paměti jako maximum; 0 "
+#~ "znamená\n"
+#~ " výchozí nastavení, což je 40% celkového množství "
+#~ "paměti"
#~ msgid ""
#~ "\n"
-#~ " --subblock[=OPTS] Subblock filter; valid OPTS (valid values; default):\n"
+#~ " --subblock[=OPTS] Subblock filter; valid OPTS (valid values; "
+#~ "default):\n"
#~ " size=NUM number of bytes of data per subblock\n"
#~ " (1 - 256Mi; 4Ki)\n"
-#~ " rle=NUM run-length encoder chunk size (0-256; 0)"
+#~ " rle=NUM run-length encoder chunk size (0-256; "
+#~ "0)"
#~ msgstr ""
#~ "\n"
-#~ " --subblock[=VOLBY] Subblokový filtr; platné VOLBY (platné hodnoty; výchozí):\n"
+#~ " --subblock[=VOLBY] Subblokový filtr; platné VOLBY (platné hodnoty; "
+#~ "výchozí):\n"
#~ " size=POČ počet bajtů dat na subblok\n"
#~ " (1 - 256 Mi; 4 Ki)\n"
-#~ " rle=POČ velikost dávky pro kodér run-length (0-256; 0)"
+#~ " rle=POČ velikost dávky pro kodér run-length "
+#~ "(0-256; 0)"
#~ msgid ""
-#~ "On this system and configuration, this program will use a maximum of roughly\n"
+#~ "On this system and configuration, this program will use a maximum of "
+#~ "roughly\n"
#~ "%s MiB RAM and "
#~ msgstr ""
-#~ "Na tomto systému a s tímto nastavením použije tento program maximum ze zhruba\n"
+#~ "Na tomto systému a s tímto nastavením použije tento program maximum ze "
+#~ "zhruba\n"
#~ "%s MiB RAM a "
#~ msgid ""
diff --git a/po/de.po b/po/de.po
index 2cf17c636ac8..d88b8cd8a5ec 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,11 +6,10 @@ msgid ""
msgstr ""
"Project-Id-Version: XZ Utils 4.999.9beta\n"
"Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2010-10-23 17:48+0300\n"
+"POT-Creation-Date: 2010-09-11 17:07+0200\n"
"PO-Revision-Date: 2010-09-07 20:27+0200\n"
"Last-Translator: <maan@systemlinux.org>\n"
"Language-Team: German\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +27,8 @@ msgstr "%s: Integritäts-Check Typ nicht unterstützt"
#: src/xz/args.c:382
msgid "Only one file can be specified with `--files' or `--files0'."
-msgstr "Nur ein file kann als Argument für --files oder --files0 angegeben werden."
+msgstr ""
+"Nur ein file kann als Argument für --files oder --files0 angegeben werden."
#: src/xz/args.c:445
#, c-format
@@ -41,7 +41,8 @@ msgstr "Maximal vier Filter möglich"
#: src/xz/coder.c:108
msgid "Memory usage limit is too low for the given filter setup."
-msgstr "Das Speicher Limit ist zu niedrig für die gegebene Filter Konfiguration."
+msgstr ""
+"Das Speicher Limit ist zu niedrig für die gegebene Filter Konfiguration."
#: src/xz/coder.c:129
msgid "Using a preset in raw mode is discouraged."
@@ -49,7 +50,9 @@ msgstr "Verwendung der Voreinstellung im raw Modus wird nicht empfohlen."
#: src/xz/coder.c:131
msgid "The exact options of the presets may vary between software versions."
-msgstr "Die genauen Optionen der Voreinstellung können zwischen Software Versionen variieren."
+msgstr ""
+"Die genauen Optionen der Voreinstellung können zwischen Software Versionen "
+"variieren."
#: src/xz/coder.c:157
msgid "The .lzma format supports only the LZMA1 filter"
@@ -70,8 +73,12 @@ msgstr "Dekompression wird %s MiB Speicher brauchen."
#: 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 "Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das Speicher Nutzungslimit von %s MiB zu übersteigen"
+msgid ""
+"Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the "
+"memory usage limit of %s MiB"
+msgstr ""
+"Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das "
+"Speicher Nutzungslimit von %s MiB zu übersteigen"
#. TRANSLATORS: When compression or decompression finishes,
#. and xz is going to remove the source file, xz first checks
@@ -86,7 +93,8 @@ msgstr "Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das
#: src/xz/file_io.c:137
#, c-format
msgid "%s: File seems to have been moved, not removing"
-msgstr "%s: Datei scheint umbenannt worden zu sein, daher wird sie nicht gelöscht"
+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
#, c-format
@@ -141,7 +149,8 @@ msgstr "%s: Eingabedatei hat mehr als einen hard link, überspringe"
#: src/xz/file_io.c:714
#, 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"
+msgstr ""
+"Fehler beim Wiederherstellen des O_APPEND flags bei Standard Output: %s"
#: src/xz/file_io.c:726
#, c-format
@@ -151,7 +160,8 @@ msgstr "%s: Fehler beim Schießen der Datei: %s"
#: src/xz/file_io.c:762 src/xz/file_io.c:946
#, 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"
+msgstr ""
+"%s: Positionierungsfehler beim Versuch eine sparse Datei zu erzeugen: %s"
#: src/xz/file_io.c:821
#, c-format
@@ -202,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, but don't use spaces.
+#. you need space for one extra letter.
#: src/xz/list.c:69
msgid "Unknown-2"
msgstr "Unbek.2"
@@ -310,10 +320,12 @@ msgstr " Strom Auffüllung: %s\n"
#: src/xz/list.c:693
msgid ""
" Streams:\n"
-" Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding"
+" Stream Blocks CompOffset UncompOffset CompSize "
+"UncompSize Ratio Check Padding"
msgstr ""
" Ströme:\n"
-" Strom Blöcke KompOffset UnkompOffset KompGröße UnkompGröße Verh. Check Auffüllung"
+" Strom Blöcke KompOffset UnkompOffset KompGröße "
+"UnkompGröße Verh. Check Auffüllung"
#. TRANSLATORS: The second line is column headings. All
#. except Check are right aligned; Check is left aligned.
@@ -321,10 +333,12 @@ msgstr ""
#, c-format
msgid ""
" Blocks:\n"
-" Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check"
+" Stream Block CompOffset UncompOffset TotalSize "
+"UncompSize Ratio Check"
msgstr ""
" Blöcke:\n"
-" Strom Block KompOffset UnkompOffset TotalGröße UnkompGröße Verh. Check"
+" Strom Block KompOffset UnkompOffset TotalGröße "
+"UnkompGröße Verh. Check"
#. TRANSLATORS: These are additional column headings
#. for the most verbose listing mode. CheckVal
@@ -376,7 +390,8 @@ msgstr " Anzahl Dateien: %s\n"
#: src/xz/list.c:1072
msgid "--list works only on .xz files (--format=xz or --format=auto)"
-msgstr "--list funktioniert nur mit .xz Dateien (--format=xz oder --format=auto)"
+msgstr ""
+"--list funktioniert nur mit .xz Dateien (--format=xz oder --format=auto)"
#: src/xz/list.c:1078
msgid "--list does not support reading from standard input"
@@ -394,69 +409,79 @@ msgstr "%s: Unerwartetes Ende beim Lesen der Dateinamen"
#: 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: Null Charakter gefunden beim Lesen der Dateinamen; Meinten Sie `--files0' statt `--files'?"
+msgid ""
+"%s: Null character found when reading filenames; maybe you meant to use `--"
+"files0' instead of `--files'?"
+msgstr ""
+"%s: Null Charakter gefunden beim Lesen der Dateinamen; Meinten Sie `--"
+"files0' statt `--files'?"
#: src/xz/main.c:174
msgid "Compression and decompression with --robot are not supported yet."
msgstr "Kompression und Dekompression mit --robot ist noch nicht unterstützt."
#: src/xz/main.c:231
-msgid "Cannot read data from standard input when reading filenames from standard input"
-msgstr "Lesen der Standardeingabe ist nicht möglich, wenn die Dateinamen auch von der Standardeingabe gelesen werden"
+msgid ""
+"Cannot read data from standard input when reading filenames from standard "
+"input"
+msgstr ""
+"Lesen der Standardeingabe ist nicht möglich, wenn die Dateinamen auch von "
+"der Standardeingabe gelesen werden"
-#: src/xz/message.c:792 src/xz/message.c:842
+#: src/xz/message.c:800 src/xz/message.c:844
msgid "Internal error (bug)"
msgstr "Interner Fehler (Bug)"
-#: src/xz/message.c:799
+#: src/xz/message.c:807
msgid "Cannot establish signal handlers"
msgstr "Kann Signal Routine nicht setzen"
-#: src/xz/message.c:808
+#: src/xz/message.c:816
msgid "No integrity check; not verifying file integrity"
msgstr "Kein Integritäts-Check; werde Datei-Integrität nicht überprüfen"
-#: src/xz/message.c:811
+#: src/xz/message.c:819
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"
+msgstr ""
+"Typ des Integritäts-Checks nicht unterstützt; werde Datei-Integrität nicht "
+"überprüfen"
-#: src/xz/message.c:818
+#: src/xz/message.c:826
msgid "Memory usage limit reached"
msgstr "Speicher-Limit erreicht"
-#: src/xz/message.c:821
+#: src/xz/message.c:829
msgid "File format not recognized"
msgstr "Datei Format nicht erkannt"
-#: src/xz/message.c:824
+#: src/xz/message.c:832
msgid "Unsupported options"
msgstr "Optionen nicht unterstützt"
-#: src/xz/message.c:827
+#: src/xz/message.c:835
msgid "Compressed data is corrupt"
msgstr "Komprimierte Daten sind korrupt"
-#: src/xz/message.c:830
+#: src/xz/message.c:838
msgid "Unexpected end of input"
msgstr "Unerwartetes Eingabe Ende"
-#: src/xz/message.c:881
+#: src/xz/message.c:886
#, 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:1048
+#: src/xz/message.c:1053
#, c-format
msgid "%s: Filter chain: %s\n"
msgstr "%s: Filter Kette: %s\n"
-#: src/xz/message.c:1058
+#: src/xz/message.c:1063
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Versuchen Sie `%s --help' für mehr Informationen."
-#: src/xz/message.c:1084
+#: src/xz/message.c:1089
#, c-format
msgid ""
"Usage: %s [OPTION]... [FILE]...\n"
@@ -467,17 +492,18 @@ msgstr ""
"Komprimiert oder dekomprimiert .xz DATEI(EN).\n"
"\n"
-#: src/xz/message.c:1091
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
+#: src/xz/message.c:1096
+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:1095
+#: src/xz/message.c:1100
msgid " Operation mode:\n"
msgstr " Operationsmodus:\n"
-#: src/xz/message.c:1098
+#: src/xz/message.c:1103
msgid ""
" -z, --compress force compression\n"
" -d, --decompress force decompression\n"
@@ -489,7 +515,7 @@ msgstr ""
" -t, --test überprüfe Datei Integrität\n"
" -l, --list liste Datei Informationen"
-#: src/xz/message.c:1104
+#: src/xz/message.c:1109
msgid ""
"\n"
" Operation modifiers:\n"
@@ -497,7 +523,7 @@ msgstr ""
"\n"
" Operationsmodifikatoren:\n"
-#: src/xz/message.c:1107
+#: src/xz/message.c:1112
msgid ""
" -k, --keep keep (don't delete) input files\n"
" -f, --force force overwrite of output file and (de)compress links\n"
@@ -509,13 +535,14 @@ msgstr ""
" -c, --stdout schreibe nach Standard Output und lösche nicht die\n"
" Eingabedateien"
-#: src/xz/message.c:1113
+#: src/xz/message.c:1118
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"
+" filenames must be terminated with the newline "
+"character\n"
" --files0[=FILE] like --files but use the null character as terminator"
msgstr ""
" --no-sparse erzeuge keine sparse Datei beim Dekomprimieren\n"
@@ -524,9 +551,10 @@ msgstr ""
" DATEI nicht angegeben wurde, werden Dateinamen\n"
" von Standard Input gelesen. Dateinamen müssen mit\n"
" einem Zeilenumbruch voneinander getrennt werden\n"
-" --files0=[DATEI] wie --files, aber benutze den Null Charakter als Trenner"
+" --files0=[DATEI] wie --files, aber benutze den Null Charakter als "
+"Trenner"
-#: src/xz/message.c:1121
+#: src/xz/message.c:1126
msgid ""
"\n"
" Basic file format and compression options:\n"
@@ -534,62 +562,76 @@ msgstr ""
"\n"
" Grundlegende Optionen für Dateiformat und Kompression:\n"
-#: src/xz/message.c:1123
+#: src/xz/message.c:1128
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=FMT Dateiformat zur Kodierung oder Dekodierung; mögliche\n"
-" Werte sind `auto' (Voreinstellung), `xz', `lzma' und\n"
+" -F, --format=FMT Dateiformat zur Kodierung oder Dekodierung; "
+"mögliche\n"
+" Werte sind `auto' (Voreinstellung), `xz', `lzma' "
+"und\n"
" `raw'\n"
-" -C, --check=CHECK Typ des Integritätschecks: `none' (Vorsicht), `crc32',\n"
+" -C, --check=CHECK Typ des Integritätschecks: `none' (Vorsicht), "
+"`crc32',\n"
" `crc64' (Voreinstellung), oder `sha256'"
-#: src/xz/message.c:1130
+#: src/xz/message.c:1135
msgid ""
-" -0 ... -9 compression preset; default is 6; take compressor *and*\n"
-" decompressor memory usage into account before using 7-9!"
+" -0 ... -9 compression preset; default is 6; take compressor "
+"*and*\n"
+" decompressor memory usage into account before using 7-"
+"9!"
msgstr ""
-" -0 .. -9 Kompressionseinstellung; Voreinstellung is 6. Beachten\n"
-" Sie den Speicherverbrauch des Komprimieres *und* des\n"
+" -0 .. -9 Kompressionseinstellung; Voreinstellung is 6. "
+"Beachten\n"
+" Sie den Speicherverbrauch des Komprimieres *und* "
+"des\n"
" Dekomprimierers, wenn Sie 7-9 benutzen!"
-#: src/xz/message.c:1134
+#: src/xz/message.c:1139
msgid ""
-" -e, --extreme try to improve compression ratio by using more CPU time;\n"
+" -e, --extreme try to improve compression ratio by using more CPU "
+"time;\n"
" does not affect decompressor memory requirements"
msgstr ""
-" -e, --extreme Versuche durch stärkere CPU Nutzung das Kompressions-\n"
+" -e, --extreme Versuche durch stärkere CPU Nutzung das "
+"Kompressions-\n"
" verhältnis zu verbessern. Das beeinflusst nicht den\n"
" Speicherbedarf des Dekomprimierers."
-#: src/xz/message.c:1139
+#: src/xz/message.c:1144
#, no-c-format
msgid ""
" --memlimit-compress=LIMIT\n"
" --memlimit-decompress=LIMIT\n"
" -M, --memlimit=LIMIT\n"
-" set memory usage limit for compression, decompression,\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 Setze Speicher Nutzungslimit für Kompression,\n"
-" Dekompression, oder beides; LIMIT ist in bytes, % RAM,\n"
+" Dekompression, oder beides; LIMIT ist in bytes, % "
+"RAM,\n"
" oder 0 für Grundeinstellungen."
-#: src/xz/message.c:1146
+#: src/xz/message.c:1151
msgid ""
-" --no-adjust if compression settings exceed the memory usage limit,\n"
-" give an error instead of adjusting the settings downwards"
+" --no-adjust if compression settings exceed the memory usage "
+"limit,\n"
+" give an error instead of adjusting the settings "
+"downwards"
msgstr ""
" --no-adjust Wenn die Kompressionseinstellungen das Speicher\n"
-" Nutzungslimit übersteigen, erzeuge einen Fehler statt\n"
+" Nutzungslimit übersteigen, erzeuge einen Fehler "
+"statt\n"
" die Einstellungen nach unten anzupassen."
-#: src/xz/message.c:1152
+#: src/xz/message.c:1157
msgid ""
"\n"
" Custom filter chain for compression (alternative for using presets):"
@@ -597,11 +639,13 @@ msgstr ""
"\n"
" User-definierte Filter Kette für Kompression (alternativ zu Voreinstellung):"
-#: src/xz/message.c:1161
+#: src/xz/message.c:1166
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"
+" --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"
@@ -609,28 +653,37 @@ msgid ""
" 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)"
+" mf=NAME match finder (hc3, hc4, bt2, bt3, bt4; "
+"bt4)\n"
+" depth=NUM maximum search depth; 0=automatic "
+"(default)"
msgstr ""
"\n"
" --lzma1[=OPTIONEN] LZMA1 oder LZMA2; OPTIONEN ist eine durch Kommata\n"
-" --lzma2[=OPTIONEN] getrennte Liste bestehend aus den folgenden Optionen\n"
+" --lzma2[=OPTIONEN] getrennte Liste bestehend aus den folgenden "
+"Optionen\n"
" (zulässige Werte; Voreinstellung):\n"
-" preset=NUM Setze Optionen zurück zu Voreinstellung\n"
+" preset=NUM Setze Optionen zurück zu "
+"Voreinstellung\n"
" (0-9[e])\n"
-" dict=NUM Wörterbuch Größe (4 KiB - 1536 MiB; 8 MiB)\n"
-" lc=NUM Anzahl der Literal Kontext Bits (0-4; 3)\n"
-" lp=NUM Anzahl der Literal Positionsbits (0-4; 0)\n"
+" dict=NUM Wörterbuch Größe (4 KiB - 1536 MiB; 8 "
+"MiB)\n"
+" lc=NUM Anzahl der Literal Kontext Bits (0-4; "
+"3)\n"
+" lp=NUM Anzahl der Literal Positionsbits (0-4; "
+"0)\n"
" pb=NUM Anzahl der Positionsbits (0-4; 2)\n"
-" mode=MODUS Kompressionsmodus (fast, normal; normal)\n"
+" mode=MODUS Kompressionsmodus (fast, normal; "
+"normal)\n"
" nice=NUM Nice-Länge eines Treffers (2-273; 64)\n"
" mf=NAME Algorithmus zum Auffinden von\n"
-" Übereinstimmungen (hc3, hc4, bt2, bt3, bt4;\n"
+" Übereinstimmungen (hc3, hc4, bt2, bt3, "
+"bt4;\n"
" bt4)\n"
" depth=NUM Maximale Suchtiefe; 0=automatisch\n"
" (Voreinstellung)"
-#: src/xz/message.c:1176
+#: src/xz/message.c:1181
msgid ""
"\n"
" --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n"
@@ -653,7 +706,7 @@ msgstr ""
" start=NUM Start-Offset für Konversion\n"
" (Voreinstellung=0)"
-#: src/xz/message.c:1188
+#: src/xz/message.c:1193
msgid ""
"\n"
" --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n"
@@ -663,10 +716,11 @@ msgstr ""
"\n"
" --delta[=OPTIONEN] Delta Filter; zulässige Optionen (gültige Werte;\n"
" Voreinstellung):\n"
-" dist=NUM Abstand zwischen den Bytes, die voneinander\n"
+" dist=NUM Abstand zwischen den Bytes, die "
+"voneinander\n"
" subtrahiert werden (1-256; 1)"
-#: src/xz/message.c:1196
+#: src/xz/message.c:1201
msgid ""
"\n"
" Other options:\n"
@@ -674,33 +728,37 @@ msgstr ""
"\n"
" Andere Optionen:\n"
-#: src/xz/message.c:1199
+#: src/xz/message.c:1204
msgid ""
-" -q, --quiet suppress warnings; specify twice to suppress errors too\n"
+" -q, --quiet suppress warnings; specify twice to suppress errors "
+"too\n"
" -v, --verbose be verbose; specify twice for even more verbose"
msgstr ""
" -q, --quiet unterdrücke Warnungen; benutze diese Option zweimal\n"
" um auch Fehlermeldungen zu unterdrücken\n"
-" -v, --verbose sei gesprächig; benutze diese Option zweimal um noch\n"
+" -v, --verbose sei gesprächig; benutze diese Option zweimal um "
+"noch\n"
" gesprächiger zu sein"
-#: src/xz/message.c:1204
+#: src/xz/message.c:1209
msgid " -Q, --no-warn make warnings not affect the exit status"
msgstr " -Q, --no-warn Warnungen verändern nicht den exit status"
-#: src/xz/message.c:1206
-msgid " --robot use machine-parsable messages (useful for scripts)"
+#: src/xz/message.c:1211
+msgid ""
+" --robot use machine-parsable messages (useful for scripts)"
msgstr ""
" --robot benutze Maschinen-lesbare Meldungen (nützlich für\n"
" Skripte)"
-#: src/xz/message.c:1209
+#: src/xz/message.c:1214
msgid ""
-" --info-memory display the total amount of RAM and the currently active\n"
+" --info-memory display the total amount of RAM and the currently "
+"active\n"
" memory usage limits, and exit"
msgstr " --info-memory zeige Speicherlimit an und terminiere"
-#: src/xz/message.c:1212
+#: src/xz/message.c:1217
msgid ""
" -h, --help display the short help (lists only the basic options)\n"
" -H, --long-help display this long help and exit"
@@ -709,20 +767,21 @@ msgstr ""
" Optionen)\n"
" -H, --long-help zeige diese lange Hilfe an und terminiere"
-#: src/xz/message.c:1216
+#: src/xz/message.c:1221
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 zeige diese kurze Hilfe an und terminiere\n"
-" -H, --long-help zeige die lange Hilfe an (zeigt auch fortgeschrittene\n"
+" -H, --long-help zeige die lange Hilfe an (zeigt auch "
+"fortgeschrittene\n"
" Optionen an)"
-#: src/xz/message.c:1221
+#: src/xz/message.c:1226
msgid " -V, --version display the version number and exit"
msgstr " -V, --version zeige Versionsnummer an und terminiere"
-#: src/xz/message.c:1223
+#: src/xz/message.c:1228
msgid ""
"\n"
"With no FILE, or when FILE is -, read standard input.\n"
@@ -735,14 +794,15 @@ msgstr ""
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the email or WWW
#. address for translation bugs. Thanks.
-#: src/xz/message.c:1229
+#: src/xz/message.c:1234
#, c-format
msgid "Report bugs to <%s> (in English or Finnish).\n"
msgstr ""
"Melde Bugs an <%s> (in englisch oder finnisch).\n"
-"Melde Übersetzungsfehler an <maan@systemlinux.org> (in englisch oder deutsch).\n"
+"Melde Übersetzungsfehler an <maan@systemlinux.org> (in englisch oder "
+"deutsch).\n"
-#: src/xz/message.c:1231
+#: src/xz/message.c:1236
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s Homepage: <%s>\n"
@@ -750,7 +810,9 @@ msgstr "%s Homepage: <%s>\n"
#: src/xz/options.c:86
#, c-format
msgid "%s: Options must be `name=value' pairs separated with commas"
-msgstr "%s: Optionen müssen in der Form `Name=Wert` gegeben werden, getrennt durch Kommata"
+msgstr ""
+"%s: Optionen müssen in der Form `Name=Wert` gegeben werden, getrennt durch "
+"Kommata"
#: src/xz/options.c:93
#, c-format
@@ -774,12 +836,17 @@ msgstr "Die Summe aus lc und lp darf höchstens 4 sein"
#: src/xz/options.c:359
#, c-format
msgid "The selected match finder requires at least nice=%<PRIu32>"
-msgstr "Der ausgewählte Algorithmus zum Auffinden von Übereinstimmungen braucht mindestens nice=%<PRIu32>"
+msgstr ""
+"Der ausgewählte Algorithmus zum Auffinden von Übereinstimmungen braucht "
+"mindestens nice=%<PRIu32>"
#: src/xz/suffix.c:79 src/xz/suffix.c:164
#, c-format
-msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout"
-msgstr "%s: Mit --format=raw ist --sufix=.SUF notwendig, falls nicht nach stdout geschrieben wird"
+msgid ""
+"%s: With --format=raw, --suffix=.SUF is required unless writing to stdout"
+msgstr ""
+"%s: Mit --format=raw ist --sufix=.SUF notwendig, falls nicht nach stdout "
+"geschrieben wird"
#: src/xz/suffix.c:99
#, c-format
diff --git a/po/it.po b/po/it.po
index 4f9ef0ddd483..8e096dd4eaef 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,11 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: xz-utils\n"
"Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2010-10-23 17:48+0300\n"
+"POT-Creation-Date: 2010-09-10 14:50+0300\n"
"PO-Revision-Date: 2010-09-16 21:32+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
-"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +43,9 @@ msgstr "Il numero massimo di filtri è quattro"
#: src/xz/coder.c:108
msgid "Memory usage limit is too low for the given filter setup."
-msgstr "Il limite dell'uso della memoria è troppo basso per l'impostazione del filtro dato."
+msgstr ""
+"Il limite dell'uso della memoria è troppo basso per l'impostazione del "
+"filtro dato."
#: src/xz/coder.c:129
msgid "Using a preset in raw mode is discouraged."
@@ -52,7 +53,8 @@ msgstr "Non è consigliato usare un preset nella modalità raw."
#: src/xz/coder.c:131
msgid "The exact options of the presets may vary between software versions."
-msgstr "Le opzioni esatte per i preset possono variare tra le versioni del software."
+msgstr ""
+"Le opzioni esatte per i preset possono variare tra le versioni del software."
#: src/xz/coder.c:157
msgid "The .lzma format supports only the LZMA1 filter"
@@ -73,8 +75,12 @@ msgstr "L'estrazione necessita di %s MiB di memoria."
#: 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 "Regolata la dimensione del dizionario LZMA%c da %s MiB a %s MiB per non superare il limite dell'uso della memoria di %s MiB"
+msgid ""
+"Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the "
+"memory usage limit of %s MiB"
+msgstr ""
+"Regolata la dimensione del dizionario LZMA%c da %s MiB a %s MiB per non "
+"superare il limite dell'uso della memoria di %s MiB"
#. TRANSLATORS: When compression or decompression finishes,
#. and xz is going to remove the source file, xz first checks
@@ -154,7 +160,8 @@ msgstr "%s: chiusura del file non riuscita: %s"
#: src/xz/file_io.c:762 src/xz/file_io.c:946
#, c-format
msgid "%s: Seeking failed when trying to create a sparse file: %s"
-msgstr "%s: posizionamento non riuscito nel tentativo di creare un file sparso: %s"
+msgstr ""
+"%s: posizionamento non riuscito nel tentativo di creare un file sparso: %s"
#: src/xz/file_io.c:821
#, c-format
@@ -205,7 +212,7 @@ msgstr "Nessuno"
#. 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.
+#. you need space for one extra letter.
#: src/xz/list.c:69
msgid "Unknown-2"
msgstr "Sconosc2"
@@ -313,10 +320,12 @@ msgstr " Padding dello stream: %s\n"
#: src/xz/list.c:693
msgid ""
" Streams:\n"
-" Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding"
+" Stream Blocks CompOffset UncompOffset CompSize "
+"UncompSize Ratio Check Padding"
msgstr ""
"Stream:\n"
-" Stream Blocc. Offset comp. Offset estr. Dim. comp. Dim. estratto Rapp. Contr Padding"
+" Stream Blocc. Offset comp. Offset estr. Dim. comp. Dim. "
+"estratto Rapp. Contr Padding"
#. TRANSLATORS: The second line is column headings. All
#. except Check are right aligned; Check is left aligned.
@@ -324,10 +333,12 @@ msgstr ""
#, c-format
msgid ""
" Blocks:\n"
-" Stream Block CompOffset UncompOffset TotalSize UncompSize Ratio Check"
+" Stream Block CompOffset UncompOffset TotalSize "
+"UncompSize Ratio Check"
msgstr ""
" Blocchi:\n"
-" Stream Blocc. Offset comp. Offset estratto Dim. tot. Dim. estratto Rapp. Contr"
+" Stream Blocc. Offset comp. Offset estratto Dim. tot. Dim. "
+"estratto Rapp. Contr"
#. TRANSLATORS: These are additional column headings
#. for the most verbose listing mode. CheckVal
@@ -397,69 +408,80 @@ msgstr "%s: fine dell'input durante la lettura dei nomi dei file non attesa"
#: 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: nessun carattere trovato durante la lettura dei nomi dei file; forse si intendeva usare \"--files0\" invece di \"--files\"?"
+msgid ""
+"%s: Null character found when reading filenames; maybe you meant to use `--"
+"files0' instead of `--files'?"
+msgstr ""
+"%s: nessun carattere trovato durante la lettura dei nomi dei file; forse si "
+"intendeva usare \"--files0\" invece di \"--files\"?"
#: src/xz/main.c:174
msgid "Compression and decompression with --robot are not supported yet."
msgstr "La compressione e l'estrazione con --robot non sono ancora supportate."
#: src/xz/main.c:231
-msgid "Cannot read data from standard input when reading filenames from standard input"
-msgstr "Impossibile leggere i dati dallo standard input durante la lettura dei nomi dei file dallo standard input"
+msgid ""
+"Cannot read data from standard input when reading filenames from standard "
+"input"
+msgstr ""
+"Impossibile leggere i dati dallo standard input durante la lettura dei nomi "
+"dei file dallo standard input"
-#: src/xz/message.c:792 src/xz/message.c:842
+#: src/xz/message.c:800 src/xz/message.c:844
msgid "Internal error (bug)"
msgstr "Errore interno (bug)"
-#: src/xz/message.c:799
+#: src/xz/message.c:807
msgid "Cannot establish signal handlers"
msgstr "Impossibile stabilire i gestori dei segnali"
-#: src/xz/message.c:808
+#: src/xz/message.c:816
msgid "No integrity check; not verifying file integrity"
-msgstr "Nessun controllo d'integrità; l'integrità del file non viene verificata"
+msgstr ""
+"Nessun controllo d'integrità; l'integrità del file non viene verificata"
-#: src/xz/message.c:811
+#: src/xz/message.c:819
msgid "Unsupported type of integrity check; not verifying file integrity"
-msgstr "Tipo di controllo di integrità non supportato; l'integrità del file non viene verificata"
+msgstr ""
+"Tipo di controllo di integrità non supportato; l'integrità del file non "
+"viene verificata"
-#: src/xz/message.c:818
+#: src/xz/message.c:826
msgid "Memory usage limit reached"
msgstr "Limite di utilizzo della memoria raggiunto"
-#: src/xz/message.c:821
+#: src/xz/message.c:829
msgid "File format not recognized"
msgstr "Formato di file non riconosciuto"
-#: src/xz/message.c:824
+#: src/xz/message.c:832
msgid "Unsupported options"
msgstr "Opzioni non supportate"
-#: src/xz/message.c:827
+#: src/xz/message.c:835
msgid "Compressed data is corrupt"
msgstr "I dati compressi sono danneggiati"
-#: src/xz/message.c:830
+#: src/xz/message.c:838
msgid "Unexpected end of input"
msgstr "Fine dell'input non attesa"
-#: src/xz/message.c:881
+#: src/xz/message.c:886
#, c-format
msgid "%s MiB of memory is required. The limit is %s."
msgstr "%s MiB di memoria sono richiesti. Il limite è %s."
-#: src/xz/message.c:1048
+#: src/xz/message.c:1053
#, c-format
msgid "%s: Filter chain: %s\n"
msgstr "%s: catena di filtri: %s\n"
-#: src/xz/message.c:1058
+#: src/xz/message.c:1063
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Provare \"%s --help\" per maggiori informazioni."
-#: src/xz/message.c:1084
+#: src/xz/message.c:1089
#, c-format
msgid ""
"Usage: %s [OPTION]... [FILE]...\n"
@@ -470,15 +492,18 @@ msgstr ""
"Comprime o estrae i FILE nel formato .xz.\n"
"\n"
-#: src/xz/message.c:1091
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle brevi.\n"
+#: src/xz/message.c:1096
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle "
+"brevi.\n"
-#: src/xz/message.c:1095
+#: src/xz/message.c:1100
msgid " Operation mode:\n"
msgstr " Modalità di operazione:\n"
-#: src/xz/message.c:1098
+#: src/xz/message.c:1103
msgid ""
" -z, --compress force compression\n"
" -d, --decompress force decompression\n"
@@ -490,7 +515,7 @@ msgstr ""
" -t, --test Verifica l'integrità dei file compressi\n"
" -l, --list Elenca informazioni sui file .xz"
-#: src/xz/message.c:1104
+#: src/xz/message.c:1109
msgid ""
"\n"
" Operation modifiers:\n"
@@ -498,35 +523,40 @@ msgstr ""
"\n"
" Modificatori di operazioni:\n"
-#: src/xz/message.c:1107
+#: src/xz/message.c:1112
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 Mantiene (non elimina) i file di input\n"
-" -f, --force Forza la sovrascrittura dell'output e comprime/estrae i\n"
+" -f, --force Forza la sovrascrittura dell'output e comprime/estrae "
+"i\n"
" collegamenti\n"
-" -c, --stdout Scrive sullo standard output e non elimina i file di input"
+" -c, --stdout Scrive sullo standard output e non elimina i file di "
+"input"
-#: src/xz/message.c:1113
+#: src/xz/message.c:1118
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"
+" filenames must be terminated with the newline "
+"character\n"
" --files0[=FILE] like --files but use the null character as terminator"
msgstr ""
" --no-sparse Non crea file sparsi durante l'estrazione\n"
" -S, --suffix=.SUF Usa il suffisso \".SUF\" sui file compressi\n"
" --files=[FILE] Legge i nomi dei file da elaborare da FILE; se FILE è\n"
-" omesso, i nomi dei file sono letti dallo standard input;\n"
-" i nomi dei file devono essere terminati con un carattere\n"
+" omesso, i nomi dei file sono letti dallo standard "
+"input;\n"
+" i nomi dei file devono essere terminati con un "
+"carattere\n"
" di newline\n"
" --files0=[FILE] Come --files ma usa il carattere null come terminatore"
-#: src/xz/message.c:1121
+#: src/xz/message.c:1126
msgid ""
"\n"
" Basic file format and compression options:\n"
@@ -534,62 +564,76 @@ msgstr ""
"\n"
" Formato file di base e opzioni di compressione:\n"
-#: src/xz/message.c:1123
+#: src/xz/message.c:1128
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=FMT Formato file per codificare o decodificare; i possibili\n"
-" valori sono \"auto\" (predefinito) \"xz\", \"lzma\" e \"raw\"\n"
-" -C, --check=CHECK Tipo di verifica integrità: \"none\" (usare con attenzione),\n"
+" -F, --format=FMT Formato file per codificare o decodificare; i "
+"possibili\n"
+" valori sono \"auto\" (predefinito) \"xz\", \"lzma\" e "
+"\"raw\"\n"
+" -C, --check=CHECK Tipo di verifica integrità: \"none\" (usare con "
+"attenzione),\n"
" \"crc32\", \"crc64\" (predefinito) o \"sha256\""
-#: src/xz/message.c:1130
+#: src/xz/message.c:1135
msgid ""
-" -0 ... -9 compression preset; default is 6; take compressor *and*\n"
-" decompressor memory usage into account before using 7-9!"
+" -0 ... -9 compression preset; default is 6; take compressor "
+"*and*\n"
+" decompressor memory usage into account before using 7-"
+"9!"
msgstr ""
-" -0 ... -9 Preset di compressione; predefinito è 6; tenere a mente\n"
-" l'utilizzo di memoria per comprimere ed estrarre prima\n"
+" -0 ... -9 Preset di compressione; predefinito è 6; tenere a "
+"mente\n"
+" l'utilizzo di memoria per comprimere ed estrarre "
+"prima\n"
" di usare 7-9"
-#: src/xz/message.c:1134
+#: src/xz/message.c:1139
msgid ""
-" -e, --extreme try to improve compression ratio by using more CPU time;\n"
+" -e, --extreme try to improve compression ratio by using more CPU "
+"time;\n"
" does not affect decompressor memory requirements"
msgstr ""
" -e, --extreme Tenta di migliorare il rapporto di compressione\n"
-" utilizzando più tempo di CPU; non cambia i requisiti di\n"
+" utilizzando più tempo di CPU; non cambia i requisiti "
+"di\n"
" memoria in fase di estrazione"
-#: src/xz/message.c:1139
+#: src/xz/message.c:1144
#, no-c-format
msgid ""
" --memlimit-compress=LIMIT\n"
" --memlimit-decompress=LIMIT\n"
" -M, --memlimit=LIMIT\n"
-" set memory usage limit for compression, decompression,\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"
" Imposta il limite di utilizzo della memoria per la\n"
-" compressione, l'estrazione o entrambe; LIMIT è in byte,\n"
+" compressione, l'estrazione o entrambe; LIMIT è in "
+"byte,\n"
" % della memoria RAM oppure 0 per il valore predefinito"
-#: src/xz/message.c:1146
+#: src/xz/message.c:1151
msgid ""
-" --no-adjust if compression settings exceed the memory usage limit,\n"
-" give an error instead of adjusting the settings downwards"
+" --no-adjust if compression settings exceed the memory usage "
+"limit,\n"
+" give an error instead of adjusting the settings "
+"downwards"
msgstr ""
-" --no-adjust Se le impostazioni di compressione eccedono il limite di\n"
+" --no-adjust Se le impostazioni di compressione eccedono il limite "
+"di\n"
" utilizzo della memoria, lancia un errore invece di\n"
" utilizzare valori più piccoli"
-#: src/xz/message.c:1152
+#: src/xz/message.c:1157
msgid ""
"\n"
" Custom filter chain for compression (alternative for using presets):"
@@ -598,11 +642,13 @@ msgstr ""
" Catena di filtri personalizzati per la compressione (alternative per\n"
" l'utilizzo di preset):"
-#: src/xz/message.c:1161
+#: src/xz/message.c:1166
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"
+" --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"
@@ -610,17 +656,24 @@ msgid ""
" 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)"
+" mf=NAME match finder (hc3, hc4, bt2, bt3, bt4; "
+"bt4)\n"
+" depth=NUM maximum search depth; 0=automatic "
+"(default)"
msgstr ""
"\n"
-" --lzma1[=OPZ] LZMA1 o LZMA2; OPZ è un elenco separato da virgole di zero\n"
-" --lzma2[=OPZ] o più delle seguenti opzioni (valori validi; predefinito):\n"
-" preset=NUM Reimposta le opzioni al preset NUM (0-9[e])\n"
+" --lzma1[=OPZ] LZMA1 o LZMA2; OPZ è un elenco separato da virgole di "
+"zero\n"
+" --lzma2[=OPZ] o più delle seguenti opzioni (valori validi; "
+"predefinito):\n"
+" preset=NUM Reimposta le opzioni al preset NUM (0-9"
+"[e])\n"
" dict=NUM Dimensione del dizionario\n"
" (4KiB - 1536MiB; 8MiB)\n"
-" lc=NUM Numero di bit letterali di contesto (0-4; 3)\n"
-" lp=NUM Numero di bit letterali di posizione (0-4; 0)\n"
+" lc=NUM Numero di bit letterali di contesto (0-4; "
+"3)\n"
+" lp=NUM Numero di bit letterali di posizione (0-"
+"4; 0)\n"
" pb=NUM Numero di bit di posizione (0-4; 2)\n"
" mode=MODE Modalità di compressione\n"
" (fast, normal; normal)\n"
@@ -628,10 +681,11 @@ msgstr ""
" (2-273; 64)\n"
" mf=NAME Strumento per cercare corrispondenze\n"
" (hc3, hc4, bt2, bt3, bt4; bt4)\n"
-" depth=NUM Profondità massima di ricerca; 0=automatica\n"
+" depth=NUM Profondità massima di ricerca; "
+"0=automatica\n"
" (predefinito)"
-#: src/xz/message.c:1176
+#: src/xz/message.c:1181
msgid ""
"\n"
" --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n"
@@ -654,7 +708,7 @@ msgstr ""
" start=NUM Offset iniziale per le conversioni\n"
" (predefinito=0)"
-#: src/xz/message.c:1188
+#: src/xz/message.c:1193
msgid ""
"\n"
" --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n"
@@ -666,7 +720,7 @@ msgstr ""
" dist=NUM Distanza tra byte sottratti\n"
" gli uni dagli altri (1-256; 1)"
-#: src/xz/message.c:1196
+#: src/xz/message.c:1201
msgid ""
"\n"
" Other options:\n"
@@ -674,33 +728,39 @@ msgstr ""
"\n"
" Altre opzioni:\n"
-#: src/xz/message.c:1199
+#: src/xz/message.c:1204
msgid ""
-" -q, --quiet suppress warnings; specify twice to suppress errors too\n"
+" -q, --quiet suppress warnings; specify twice to suppress errors "
+"too\n"
" -v, --verbose be verbose; specify twice for even more verbose"
msgstr ""
-" -q, --quiet Sopprime gli avvisi; specificare due volte per sopprimere\n"
+" -q, --quiet Sopprime gli avvisi; specificare due volte per "
+"sopprimere\n"
" anche gli errori\n"
-" -v, --verbose Output prolisso; specificare due volte per output ancora\n"
+" -v, --verbose Output prolisso; specificare due volte per output "
+"ancora\n"
" più prolisso"
-#: src/xz/message.c:1204
+#: src/xz/message.c:1209
msgid " -Q, --no-warn make warnings not affect the exit status"
msgstr " -Q, --no-warn Gli avvisi non influenzano lo stato d'uscita"
-#: src/xz/message.c:1206
-msgid " --robot use machine-parsable messages (useful for scripts)"
+#: src/xz/message.c:1211
+msgid ""
+" --robot use machine-parsable messages (useful for scripts)"
msgstr " --robot Usa messaggi analizzabili (utile per gli script)"
-#: src/xz/message.c:1209
+#: src/xz/message.c:1214
msgid ""
-" --info-memory display the total amount of RAM and the currently active\n"
+" --info-memory display the total amount of RAM and the currently "
+"active\n"
" memory usage limits, and exit"
msgstr ""
-" --info-memory Visualizza la quantità totale di RAM, il limite attuale\n"
+" --info-memory Visualizza la quantità totale di RAM, il limite "
+"attuale\n"
" attivo di utilizzo della memore ed esce"
-#: src/xz/message.c:1212
+#: src/xz/message.c:1217
msgid ""
" -h, --help display the short help (lists only the basic options)\n"
" -H, --long-help display this long help and exit"
@@ -708,7 +768,7 @@ msgstr ""
" -h, --help Stampa l'aiuto breve (elenca solo le opzioni di base)\n"
" -H, --long-help Stampa questo lungo aiuto ed esce"
-#: src/xz/message.c:1216
+#: src/xz/message.c:1221
msgid ""
" -h, --help display this short help and exit\n"
" -H, --long-help display the long help (lists also the advanced options)"
@@ -716,11 +776,11 @@ msgstr ""
" -h, --help Stampa questo breve aiuto ed esce\n"
" -H, --long-help Stampa l'aiuto lungo (elenca anche le opzioni avanzate)"
-#: src/xz/message.c:1221
+#: src/xz/message.c:1226
msgid " -V, --version display the version number and exit"
msgstr " -V, --version Stampa il numero della versione ed esce"
-#: src/xz/message.c:1223
+#: src/xz/message.c:1228
msgid ""
"\n"
"With no FILE, or when FILE is -, read standard input.\n"
@@ -732,14 +792,14 @@ msgstr ""
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the email or WWW
#. address for translation bugs. Thanks.
-#: src/xz/message.c:1229
+#: src/xz/message.c:1234
#, c-format
msgid "Report bugs to <%s> (in English or Finnish).\n"
msgstr ""
"Segnalare i bug a <%s> (in inglese o finlandese).\n"
"Segnalare i bug di traduzione a <tp@lists.linux.it>.\n"
-#: src/xz/message.c:1231
+#: src/xz/message.c:1236
#, c-format
msgid "%s home page: <%s>\n"
msgstr "Sito web di %s: <%s>\n"
@@ -747,7 +807,8 @@ msgstr "Sito web di %s: <%s>\n"
#: src/xz/options.c:86
#, c-format
msgid "%s: Options must be `name=value' pairs separated with commas"
-msgstr "%s: le opzioni devono essere coppie \"nome=valore\" separate da virgole"
+msgstr ""
+"%s: le opzioni devono essere coppie \"nome=valore\" separate da virgole"
#: src/xz/options.c:93
#, c-format
@@ -771,12 +832,17 @@ msgstr "La somma di lc e lp non deve superare 4"
#: src/xz/options.c:359
#, c-format
msgid "The selected match finder requires at least nice=%<PRIu32>"
-msgstr "Lo strumento per cercare corrispondenze selezionato richiede almeno nice=%<PRIu32>"
+msgstr ""
+"Lo strumento per cercare corrispondenze selezionato richiede almeno nice=%"
+"<PRIu32>"
#: src/xz/suffix.c:79 src/xz/suffix.c:164
#, c-format
-msgid "%s: With --format=raw, --suffix=.SUF is required unless writing to stdout"
-msgstr "%s: con --format=raw, --suffix=.SUF è richiesto a meno che non si scriva sullo stdout"
+msgid ""
+"%s: With --format=raw, --suffix=.SUF is required unless writing to stdout"
+msgstr ""
+"%s: con --format=raw, --suffix=.SUF è richiesto a meno che non si scriva "
+"sullo stdout"
#: src/xz/suffix.c:99
#, c-format
@@ -805,12 +871,15 @@ msgstr "%s: suffisso del moltiplicatore non valido"
#: src/xz/util.c:105
msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)."
-msgstr "I suffissi validi sono \"KiB\" (2^10), \"MiB\" (2^20), e \"GiB\" (2^30)."
+msgstr ""
+"I suffissi validi sono \"KiB\" (2^10), \"MiB\" (2^20), e \"GiB\" (2^30)."
#: src/xz/util.c:122
#, c-format
msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]"
-msgstr "Il valore dell'opzione \"%s\" deve essere nell'intervallo [%<PRIu64>, %<PRIu64>]"
+msgstr ""
+"Il valore dell'opzione \"%s\" deve essere nell'intervallo [%<PRIu64>, %"
+"<PRIu64>]"
#: src/xz/util.c:247
msgid "Empty filename, skipping"
diff --git a/po/xz.pot b/po/xz.pot
index 80631f6bc844..83de91d72ad8 100644
--- a/po/xz.pot
+++ b/po/xz.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n"
-"POT-Creation-Date: 2010-10-23 17:48+0300\n"
+"POT-Creation-Date: 2011-01-28 20:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,7 +89,7 @@ msgstr ""
msgid "%s: File seems to have been moved, not removing"
msgstr ""
-#: 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 ""
@@ -119,57 +119,57 @@ msgstr ""
msgid "%s: Is a directory, skipping"
msgstr ""
-#: src/xz/file_io.c:462
+#: src/xz/file_io.c:461
#, c-format
msgid "%s: Not a regular file, skipping"
msgstr ""
-#: 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 ""
-#: src/xz/file_io.c:486
+#: src/xz/file_io.c:485
#, c-format
msgid "%s: File has sticky bit set, skipping"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/xz/file_io.c:726
+#: src/xz/file_io.c:725
#, c-format
msgid "%s: Closing the file failed: %s"
msgstr ""
-#: 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 ""
-#: src/xz/file_io.c:821
+#: src/xz/file_io.c:820
#, c-format
msgid "%s: Read error: %s"
msgstr ""
-#: src/xz/file_io.c:844
+#: src/xz/file_io.c:843
#, c-format
msgid "%s: Error seeking the file: %s"
msgstr ""
-#: src/xz/file_io.c:854
+#: src/xz/file_io.c:853
#, c-format
msgid "%s: Unexpected end of file"
msgstr ""
-#: src/xz/file_io.c:904
+#: src/xz/file_io.c:903
#, c-format
msgid "%s: Write error: %s"
msgstr ""
@@ -676,22 +676,22 @@ msgstr ""
msgid "The selected match finder requires at least nice=%<PRIu32>"
msgstr ""
-#: src/xz/suffix.c:79 src/xz/suffix.c:164
+#: 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 ""
-#: src/xz/suffix.c:99
+#: src/xz/suffix.c:124
#, c-format
msgid "%s: Filename has an unknown suffix, skipping"
msgstr ""
-#: src/xz/suffix.c:154
+#: src/xz/suffix.c:179
#, c-format
msgid "%s: File already has `%s' suffix, skipping"
msgstr ""
-#: src/xz/suffix.c:205
+#: src/xz/suffix.c:230
#, c-format
msgid "%s: Invalid filename suffix"
msgstr ""
diff --git a/src/common/sysdefs.h b/src/common/sysdefs.h
index c74c6212cff5..69370ba42106 100644
--- 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
diff --git a/src/liblzma/api/lzma/lzma.h b/src/liblzma/api/lzma/lzma.h
index 8d5fdb6e5cad..3f8e095f70e8 100644
--- 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;
diff --git a/src/liblzma/api/lzma/version.h b/src/liblzma/api/lzma/version.h
index 25e8a8201faf..43c211fa960d 100644
--- a/src/liblzma/api/lzma/version.h
+++ b/src/liblzma/api/lzma/version.h
@@ -22,7 +22,7 @@
*/
#define LZMA_VERSION_MAJOR 5
#define LZMA_VERSION_MINOR 0
-#define LZMA_VERSION_PATCH 0
+#define LZMA_VERSION_PATCH 1
#define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE
#ifndef LZMA_VERSION_COMMIT
diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h
index 3a85168f13b9..b819432371d4 100644
--- 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);
diff --git a/src/xz/file_io.c b/src/xz/file_io.c
index 6e24c58a945c..09edcca69eb4 100644
--- 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;
diff --git a/src/xz/suffix.c b/src/xz/suffix.c
index f2a2da2749b1..ea86c1a3f6b9 100644
--- a/src/xz/suffix.c
+++ b/src/xz/suffix.c
@@ -27,6 +27,30 @@ struct suffix_pair {
};
+/// \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
///
/// \param suffix Filename suffix to look for
@@ -44,7 +68,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)
@@ -199,9 +224,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.
diff --git a/src/xz/util.h b/src/xz/util.h
index fea8cc6695dc..4b2d3e2f573f 100644
--- 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()