[packages/poldek/AC-DEVEL: 34/38] This commit was manufactured by cvs2git to create branch 'AC-DEVEL'.
glen
glen at pld-linux.org
Sat Jun 22 12:25:04 CEST 2013
commit 517e249f00498fcdccdec26681d672ad5197e114
Author: cvs2git <feedback at pld-linux.org>
Date: Wed Apr 4 09:05:41 2012 +0000
This commit was manufactured by cvs2git to create branch 'AC-DEVEL'.
Cherrypick from master 2010-05-11 21:11:40 UTC Jan Rękorajski <baggins at pld-linux.org> '- rel 43':
poldek-317130.patch -> 1.1
poldek-321546.patch -> 1.1
poldek-add-arch-match.patch -> 1.1
poldek-aliases.conf -> 1.4
poldek-assertion-failed.patch -> 1.1
poldek-both_langs.patch -> 1.2
poldek-crash-on-invalid-locale.patch -> 1.1
poldek-dont-ask-for-suggests-on-errors.patch -> 1.1
poldek-dont-be-greedy.patch -> 1.2
poldek-dont-lose-deps.patch -> 1.2
poldek-dont-suggests-required-packages.patch -> 1.1
poldek-export-missing-symbol.patch -> 1.1
poldek-inline.patch -> 1.1
poldek-keep-reinstalled-provides.patch -> 1.1
poldek-ls-llu.patch -> 1.1
poldek-ls-queryfmt.patch -> 1.1
poldek-ls-source-rpm.patch -> 1.1
poldek-multilib-upgrade.patch -> 1.2
poldek-no-inlines.patch -> 1.2
poldek-nocolor-upgrade.patch -> 1.2
poldek-noloop_on_terminal_loos.patch -> 1.1
poldek-noutf8.patch -> 1.1
poldek-op-ldalldesc.patch -> 1.2
poldek-po.patch -> 1.7
poldek-prepare_url_fix.patch -> 1.1
poldek-refcnt.patch -> 1.1
poldek-score-reqs-marked-to-install.patch -> 1.1
poldek-show_only_relative_used_space.patch -> 1.4
poldek-size-type.patch -> 1.1
poldek-skip-suggests-on-upgrade.patch -> 1.1
poldek-tty-for-erasures.patch -> 1.1
poldek-unescape-urlencoded-strings.patch -> 1.1
poldek-upgrade-dist.patch -> 1.1
poldek-zlib.patch -> 1.5
poldek.desktop -> 1.4
Cherrypick from master 2008-04-21 11:45:48 UTC Marcin Banasiak <marcin.banasiak at gmail.com> '- fixes pld#139':
poldek-bug117hack.patch -> 1.2
poldek-bug139.patch -> 1.1
poldek-missing-symbol.patch -> 1.2
poldek-nonoorder.patch -> 1.2
poldek-pkguinf-kill-assert.patch -> 1.1
poldek-pkguinf-sourcerpm.patch -> 1.1
poldek-sigint_emit.patch -> 1.1
poldek-uninstall-greedy-fix.patch -> 1.1
Cherrypick from master 2012-04-04 09:05:41 UTC Elan Ruusamäe <glen at pld-linux.org> '- and that fucking generation is incomplete, does not generate ALL files':
poldek-Os-fail-workaround.patch -> 1.1
poldek-config.patch -> 1.12
poldek-git.patch -> 1.9
Cherrypick from master 2010-08-22 19:10:12 UTC Elan Ruusamäe <glen at pld-linux.org> '- patches to fix AC build':
ac-prog-libtool.patch -> 1.1
gcc-fvisibility.patch -> 1.1
Cherrypick from master 2008-06-07 07:42:41 UTC mis <mis at pld-linux.org> '- fixed #158':
poldek-158fix.patch -> 1.1
Cherrypick from master 2008-11-29 17:46:32 UTC witekfl <witekfl at pld-linux.org> '- strip langs to the current locale':
poldek-up_mini18n.patch -> 1.1
Cherrypick from unlabeled-1.35.2 2012-01-10 10:59:08 UTC Elan Ruusamäe <glen at pld-linux.org> '- exclude mediawiki from ac-main':
poldek.conf -> 1.35.2.28
Cherrypick from unlabeled-1.5.2 2008-08-27 18:05:13 UTC Elan Ruusamäe <glen at pld-linux.org> '- rename ac-ARCH to be group of ac-ARCH-main+ac-ARCH-updates, ac-ARCH->ac-ARCH-main':
poldek-multilib.conf -> 1.5.2.12
ac-prog-libtool.patch | 10 +
gcc-fvisibility.patch | 25 +
poldek-158fix.patch | 17 +
poldek-317130.patch | 20 +
poldek-321546.patch | 13 +
poldek-Os-fail-workaround.patch | 24 +
poldek-add-arch-match.patch | 51 +
poldek-aliases.conf | 37 +
poldek-assertion-failed.patch | 35 +
poldek-both_langs.patch | 58 +
poldek-bug117hack.patch | 40 +
poldek-bug139.patch | 58 +
poldek-config.patch | 47 +
poldek-crash-on-invalid-locale.patch | 29 +
poldek-dont-ask-for-suggests-on-errors.patch | 12 +
poldek-dont-be-greedy.patch | 13 +
poldek-dont-lose-deps.patch | 53 +
poldek-dont-suggests-required-packages.patch | 74 +
poldek-export-missing-symbol.patch | 16 +
poldek-git.patch | 6102 ++++++++++++++++++++++++++
poldek-inline.patch | 12 +
poldek-keep-reinstalled-provides.patch | 11 +
poldek-ls-llu.patch | 13 +
poldek-ls-queryfmt.patch | 1266 ++++++
poldek-ls-source-rpm.patch | 90 +
poldek-missing-symbol.patch | 19 +
poldek-multilib-upgrade.patch | 152 +
poldek-multilib.conf | 87 +
poldek-no-inlines.patch | 24 +
poldek-nocolor-upgrade.patch | 19 +
poldek-noloop_on_terminal_loos.patch | 15 +
poldek-nonoorder.patch | 52 +
poldek-noutf8.patch | 44 +
poldek-op-ldalldesc.patch | 276 ++
poldek-pkguinf-kill-assert.patch | 13 +
poldek-pkguinf-sourcerpm.patch | 101 +
poldek-po.patch | 406 ++
poldek-prepare_url_fix.patch | 11 +
poldek-refcnt.patch | 22 +
poldek-score-reqs-marked-to-install.patch | 151 +
poldek-show_only_relative_used_space.patch | 90 +
poldek-sigint_emit.patch | 53 +
poldek-size-type.patch | 26 +
poldek-skip-suggests-on-upgrade.patch | 56 +
poldek-tty-for-erasures.patch | 9 +
poldek-unescape-urlencoded-strings.patch | 124 +
poldek-uninstall-greedy-fix.patch | 76 +
poldek-up_mini18n.patch | 11 +
poldek-upgrade-dist.patch | 31 +
poldek-zlib.patch | 177 +
poldek.conf | 68 +
poldek.desktop | 11 +
52 files changed, 10250 insertions(+)
---
diff --git a/ac-prog-libtool.patch b/ac-prog-libtool.patch
new file mode 100644
index 0000000..c17bf8c
--- /dev/null
+++ b/ac-prog-libtool.patch
@@ -0,0 +1,10 @@
+--- poldek-0.30/configure.ac~ 2010-08-22 14:57:05.000000000 +0300
++++ poldek-0.30/configure.ac 2010-08-22 14:58:09.298819202 +0300
+@@ -48,6 +48,7 @@
+
+ dnl Checks for programs.
+ LT_INIT
++AC_PROG_LIBTOOL
+ AC_PROG_CC()
+ #AC_PROG_CXX()
+ AC_C_INLINE
diff --git a/gcc-fvisibility.patch b/gcc-fvisibility.patch
new file mode 100644
index 0000000..5d4a80f
--- /dev/null
+++ b/gcc-fvisibility.patch
@@ -0,0 +1,25 @@
+Signed-off-by: Elan Ruusamäe <glen at pld-linux.org>
+
+--- poldek-0.30/configure.ac~ 2010-06-29 02:00:30.000000000 +0300
++++ poldek-0.30/configure.ac 2010-08-22 14:25:03.838184361 +0300
+@@ -61,6 +61,7 @@
+ AC_SUBST(AM_CFLAGS)
+
+ if test -n "$GCC"; then
++ cflags_save="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ AC_MSG_CHECKING([whether gcc supports visibility])
+ AC_TRY_COMPILE(
+@@ -70,7 +71,11 @@
+ extern __attribute__((__visibility__("default"))) int exportedfunc (void);],
+ [],
+ AC_MSG_RESULT(yes),
+- AC_MSG_ERROR(["compiler does not support visibility"]))
++ [
++ AC_MSG_WARN([compiler does not support visibility])
++ CFLAGS="$cflags_save"
++ ]
++ )
+ fi
+
+
diff --git a/poldek-158fix.patch b/poldek-158fix.patch
new file mode 100644
index 0000000..530d438
--- /dev/null
+++ b/poldek-158fix.patch
@@ -0,0 +1,17 @@
+Index: install3/process.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/install3/process.c,v
+retrieving revision 1.5
+diff -u -r1.5 process.c
+--- install3/process.c 13 May 2008 16:25:09 -0000 1.5
++++ install3/process.c 7 Jun 2008 07:36:54 -0000
+@@ -61,6 +61,9 @@
+ {
+ int i;
+
++ if (i3_is_hand_marked(ictx, i3pkg->pkg))
++ return;
++
+ tracef(indent, "- rollbacking %s", pkg_id(i3pkg->pkg));
+ iset_remove(ictx->inset, i3pkg->pkg);
+ i3_forget_error(ictx, i3pkg->pkg);
diff --git a/poldek-317130.patch b/poldek-317130.patch
new file mode 100644
index 0000000..d77a87f
--- /dev/null
+++ b/poldek-317130.patch
@@ -0,0 +1,20 @@
+--- poldek-0.30-cvs20080820.23/pkg.c~ 2009-01-14 17:33:56.297011561 +0200
++++ poldek-0.30-cvs20080820.23/pkg.c 2009-01-14 17:33:59.170397703 +0200
+@@ -1451,15 +1451,13 @@
+
+ struct pkg *pkg_link(struct pkg *pkg)
+ {
+-#if ENABLE_TRACE
+- if (strcmp(pkg->name, "XX") == 0) {
+- DBGF("%p %s (pdir %s, na->refcnt=%d), refcnt=%d (%p)\n",
++ if (pkg->_refcnt >= INT16_MAX - 1) {
++ trace(1, "%p %s (pdir %s, na->refcnt=%d), refcnt=%d (%p)\n",
+ pkg, pkg_snprintf_s(pkg),
+ pkg->pkgdir ? pkgdir_idstr(pkg->pkgdir) : "<none>",
+ pkg->na ? pkg->na->_refcnt : -1,
+ pkg->_refcnt, &pkg->_refcnt);
+ }
+-#endif
+ n_assert(pkg->_refcnt < INT16_MAX - 1);
+ pkg->_refcnt++;
+ return pkg;
diff --git a/poldek-321546.patch b/poldek-321546.patch
new file mode 100644
index 0000000..201c7df
--- /dev/null
+++ b/poldek-321546.patch
@@ -0,0 +1,13 @@
+--- poldek-0.30-cvs20080820.23/pkgu.c~ 2009-01-26 20:12:20.700457198 +0200
++++ poldek-0.30-cvs20080820.23/pkgu.c 2009-01-26 20:12:00.937750881 +0200
+@@ -576,8 +576,9 @@
+ nbuf = n_buf_new(1024);
+ for (i=0; i < e_name.cnt; i++) {
+ char ts[32];
++ time_t t = times[i];
+
+- strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", gmtime((time_t*)×[i]));
++ strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", gmtime((time_t*)&t));
+
+ n_buf_printf(nbuf, "* %s %s\n", ts, names[i]);
+ n_buf_printf(nbuf, "%s\n\n", texts[i]);
diff --git a/poldek-Os-fail-workaround.patch b/poldek-Os-fail-workaround.patch
new file mode 100644
index 0000000..7bf430f
--- /dev/null
+++ b/poldek-Os-fail-workaround.patch
@@ -0,0 +1,24 @@
+--- poldek-0.30/cli/shell.c~ 2010-11-25 22:30:09.000000000 +0100
++++ poldek-0.30/cli/shell.c 2011-02-06 20:20:23.502000232 +0100
+@@ -18,6 +18,13 @@
+ # include "config.h"
+ #endif
+
++#ifndef __USE_EXTERN_INLINES
++# define __USE_EXTERN_INLINES
++# include <argp.h>
++# undef __USE_EXTERN_INLINES
++#else
++# include <argp.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdint.h>
+@@ -28,7 +35,6 @@
+ #include <sys/errno.h>
+ #include <sys/param.h>
+ #include <signal.h>
+-#include <argp.h>
+ #include <fnmatch.h>
+ #include <unistd.h>
+
diff --git a/poldek-add-arch-match.patch b/poldek-add-arch-match.patch
new file mode 100644
index 0000000..1fe61a0
--- /dev/null
+++ b/poldek-add-arch-match.patch
@@ -0,0 +1,51 @@
+diff --git a/conf/poldek.conf b/conf/poldek.conf
+index 13b1e21..24c34a0 100644
+--- a/conf/poldek.conf
++++ b/conf/poldek.conf
+@@ -130,9 +130,11 @@
+ choose equivalents manually = yes
+
+ # Prevent package listed from being upgraded if they are already installed.
++# hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
+ hold = kernel*
+
+ # Ignore package list - packages fits given mask will be invisible.
++# Masks are same as above.
+ # ignore = *-smp-* foo*
+ ignore = vserver-packages
+ #ignore =
+diff --git a/pkgscore.c b/pkgscore.c
+index f2a527c..0908410 100644
+--- a/pkgscore.c
++++ b/pkgscore.c
+@@ -113,23 +113,28 @@ void pkgscore_match_init(struct pkgscore_s *psc, struct pkg *pkg)
+ n += n_snprintf(psc->pkgbuf, sizeof(psc->pkgbuf),
+ "%s:", pkg->pkgdir->name);
+
++ // pkgname_off - size of pkgdir_name
+ psc->pkgname_off = n;
++ // pkgbuf - "repo_name:name-ver-rel.arch"
+
+- pkg_snprintf(&psc->pkgbuf[n], sizeof(psc->pkgbuf) - n, pkg);
++ n_snprintf(&psc->pkgbuf[n], sizeof(psc->pkgbuf) - n, "%s-%s-%s.%s", pkg->name, pkg->ver, pkg->rel, pkg_arch(pkg));
+ psc->pkg = pkg;
+ }
+
+
+-
++// return 0 if not match
+ int pkgscore_match(struct pkgscore_s *psc, const char *mask)
+ {
++ // match name
+ if (fnmatch(mask, psc->pkg->name, 0) == 0)
+ return 1;
+
++ // match name-ver-rel.arch as string
+ if (psc->pkgname_off &&
+ fnmatch(mask, &psc->pkgbuf[psc->pkgname_off], 0) == 0)
+ return 1;
+
++ // match "repo_name:name-ver-rel.arch" as string
+ return fnmatch(mask, psc->pkgbuf, 0) == 0;
+ }
+
diff --git a/poldek-aliases.conf b/poldek-aliases.conf
new file mode 100644
index 0000000..c5809da
--- /dev/null
+++ b/poldek-aliases.conf
@@ -0,0 +1,37 @@
+# poldek interactive shell configuration
+
+prompt = "poldek"
+#prompt = poldek@$HOSTNAME
+
+# command aliases
+[aliases]
+l = ls -l
+ll = ls -l
+llu = ls -lu
+llU = ls -lU
+lli = ls -lI
+lls = ls -lS
+dir = ls
+
+# install
+freshen = install -FN
+upgrade = install -F
+
+# for backward compatybility, greedy is on by default now
+greedy-upgrade = install -FG
+
+just-install = install -IN
+
+# search
+what-requires = search -r
+what-provides = search -p
+rsearch = search --perlre
+
+exit = quit
+
+# for fun
+#ls = uninstall kernel
+
+less = !less
+grep = !grep
+awk = !awk
diff --git a/poldek-assertion-failed.patch b/poldek-assertion-failed.patch
new file mode 100644
index 0000000..39e9a14
--- /dev/null
+++ b/poldek-assertion-failed.patch
@@ -0,0 +1,35 @@
+commit 7ac464b1d6d1cbeb6f6bcdaf4b477f0c21e3e334
+Author: Marcin Banasiak <megabajt at pld-linux.org>
+Date: Thu Apr 9 19:11:23 2009 +0200
+
+ Enable checking for duplicates before adding new pkg to capreq_idx
+
+ This change partially fixes lp#270503 on systems where multilib is not
+ used (see https://bugs.launchpad.net/poldek/+bug/270503/comments/1) and
+ in candidates is the only one package, but specified several times.
+
+diff --git a/capreqidx.c b/capreqidx.c
+index 1af3a5f..7c31825 100644
+--- a/capreqidx.c
++++ b/capreqidx.c
+@@ -92,7 +92,11 @@ int capreq_idx_add(struct capreq_idx *idx, const char *capname,
+ if (ent->_size == 1) /* crent_pkgs is NOT allocated */
+ capreq_idx_ent_transform_to_array(ent);
+
+-#if 0 /* not happens in fact */
++ /*
++ * Sometimes, there are duplicates, especially in dotnet-* packages
++ * which provides multiple versions of one cap. For example dotnet-mono-zeroconf
++ * provides: mono(Mono.Zeroconf) = 1.0.0.0, mono(Mono.Zeroconf) = 2.0.0.0, etc.
++ */
+ if (idx->flags & CAPREQ_IDX_CAP) { /* check for duplicates */
+ register int i;
+ for (i=0; i < ent->items; i++) {
+@@ -100,7 +104,6 @@ int capreq_idx_add(struct capreq_idx *idx, const char *capname,
+ return 1;
+ }
+ }
+-#endif
+
+ if (ent->items == ent->_size) {
+ ent->_size *= 2;
diff --git a/poldek-both_langs.patch b/poldek-both_langs.patch
new file mode 100644
index 0000000..4e3004e
--- /dev/null
+++ b/poldek-both_langs.patch
@@ -0,0 +1,58 @@
+--- poldek-0.30-cvs20080820.23/misc.c.old 2008-12-10 10:49:26.000000000 +0100
++++ poldek-0.30-cvs20080820.23/misc.c 2008-12-10 10:49:56.000000000 +0100
+@@ -646,6 +646,15 @@ static char *cut_country_code (const cha
+ return newlang;
+ }
+
++static inline void n_array_push_check_dup(tn_array *langs, char *value)
++{
++ int i;
++
++ for (i = 0; i < n_array_size(langs); i++)
++ if (strcmp(n_array_nth(langs, i), value) == 0) return;
++ n_array_push(langs, n_strdup(value));
++}
++
+ /*
+ * lang_match_avlangs:
+ *
+@@ -656,24 +665,33 @@ static char *cut_country_code (const cha
+ static inline void lang_match_avlangs(tn_array *avlangs, tn_array *r_langs,
+ const char *lang, int *has_C)
+ {
++ char lang_utf8[32];
+ char *cut = NULL;
+-
++
+ /* first try */
+ if (n_array_bsearch(avlangs, lang)) {
+ if (strcmp(lang, "C") == 0)
+ *has_C = 1;
+-
+- n_array_push(r_langs, n_strdup(lang));
++
++ n_array_push_check_dup(r_langs, lang);
+ }
+-
++ n_snprintf(lang_utf8, sizeof(lang_utf8), "%s.UTF-8", lang);
++ if (n_array_bsearch(avlangs, lang_utf8))
++ n_array_push_check_dup(r_langs, lang_utf8);
++
+ /* second try, without country code */
+ if ((cut = cut_country_code(lang))) {
+ if (n_array_bsearch(avlangs, cut)) {
+ if (strcmp(cut, "C") == 0)
+ *has_C = 1;
+-
+- n_array_push(r_langs, cut);
++
++ n_array_push_check_dup(r_langs, cut);
+ }
++ n_snprintf(lang_utf8, sizeof(lang_utf8), "%s.UTF-8", cut);
++ if (n_array_bsearch(avlangs, lang_utf8))
++ n_array_push_check_dup(r_langs, lang_utf8);
++
++ free(cut);
+ }
+ }
+
diff --git a/poldek-bug117hack.patch b/poldek-bug117hack.patch
new file mode 100644
index 0000000..1430217
--- /dev/null
+++ b/poldek-bug117hack.patch
@@ -0,0 +1,40 @@
+Index: install3/requirements.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/install3/requirements.c,v
+retrieving revision 1.6
+diff -u -r1.6 requirements.c
+--- install3/requirements.c 24 Feb 2008 22:10:41 -0000 1.6
++++ install3/requirements.c 2 Mar 2008 23:03:26 -0000
+@@ -430,7 +430,6 @@
+
+ i3pkg->flags &= ~I3PKG_CROSSROAD;
+ if (candidates) {
+- n_assert(n_array_size(candidates) > 1);
+ if (number_of_non_blacks(ictx, candidates) > 1) {
+ /* mark current package as crossroad and propagate mark down */
+ i3pkg->flags |= I3PKG_CROSSROAD;
+Index: install3/ictx.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/install3/ictx.c,v
+retrieving revision 1.3
+diff -u -r1.3 ictx.c
+--- install3/ictx.c 30 Jan 2008 22:13:42 -0000 1.3
++++ install3/ictx.c 2 Mar 2008 23:27:03 -0000
+@@ -208,6 +208,7 @@
+ ictx->ts = NULL;
+ ictx->ps = NULL;
+ pkgmark_set_free(ictx->processed);
++ n_hash_free(ictx->errors);
+ memset(ictx, 0, sizeof(*ictx));
+ }
+
+@@ -223,7 +224,8 @@
+
+ pkgmark_set_free(ictx->processed);
+ ictx->processed = pkgmark_set_new(0, PKGMARK_SET_IDPTR);
+-
++
++ n_hash_clean(ictx->errors);
+ ictx->abort = 0;
+ }
+
diff --git a/poldek-bug139.patch b/poldek-bug139.patch
new file mode 100644
index 0000000..b27d9d1
--- /dev/null
+++ b/poldek-bug139.patch
@@ -0,0 +1,58 @@
+Index: cli/cli.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/cli/cli.c,v
+retrieving revision 1.44
+diff -u -r1.44 cli/cli.c
+--- cli/cli.c 3 Feb 2008 18:01:59 -0000 1.44
++++ cli/cli.c 20 Apr 2008 11:41:01 -0000
+@@ -731,9 +731,12 @@
+ const char *cmdline, struct cmd_pipe *cmd_pipe)
+ {
+ tn_array *cmd_chain;
+- int rc = 0, i;
++ int rc = 0, i, _verbose;
+
+ DBGF("%s\n", cmdline);
++
++ /* keep verbose setting as it changes when '-q' option is used */
++ _verbose = poldek_verbose ();
+
+ cmd_chain = poclidek_prepare_cmdline(cctx, cmdline);
+ if (cmd_chain == NULL)
+@@ -753,7 +756,10 @@
+ else
+ rc = poclidek_exec_cmd_ent(cctx, ts, ent, NULL);
+ }
+-
++
++ /* restore verbose setting */
++ poldek_set_verbose (_verbose);
++
+ n_array_free(cmd_chain);
+ return rc;
+ }
+Index: cli/shell.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/cli/shell.c,v
+retrieving revision 1.34
+diff -u -r1.34 cli/shell.c
+--- cli/shell.c 3 Feb 2008 18:01:59 -0000 1.34
++++ cli/shell.c 20 Apr 2008 11:41:02 -0000
+@@ -405,8 +405,6 @@
+
+ s = n_str_strip_ws(line);
+ if (*s) {
+- int _verbose = poldek_verbose();
+-
+ shInCmd = 1;
+ DBGF("(%s)\n", s);
+
+@@ -417,8 +415,6 @@
+ sigint_reset();
+ shDone = 0;
+ shInCmd = 0;
+-
+- poldek_set_verbose(_verbose);
+ }
+ free(line);
+
diff --git a/poldek-config.patch b/poldek-config.patch
new file mode 100644
index 0000000..4ad385c
--- /dev/null
+++ b/poldek-config.patch
@@ -0,0 +1,47 @@
+--- poldek-0.30/doc/poldek.conf.xml 2012-04-04 11:37:12.737381529 +0300
++++ poldek-0.30/doc/poldek.conf.xml 2012-04-04 11:38:47.231352866 +0300
+@@ -369,7 +369,7 @@
+ </description>
+ </option>
+
+- <option name="choose equivalents manually" type="boolean" default="no" op="EQPKG_ASKUSER">
++ <option name="choose equivalents manually" type="boolean" default="yes" op="EQPKG_ASKUSER">
+ <description>
+ Let the user select package among equivalents.
+ </description>
+@@ -598,7 +598,7 @@
+ </description>
+ </option>
+
+- <option name="hold" type="string" list="yes" default="" multiple="yes">
++ <option name="hold" type="string" list="yes" default="kernel*" multiple="yes">
+ <description>
+ Have the same meaning as [ global ] parameter. Example:
+ [screen]
+--- poldek-0.30/conf/poldek.conf~ 2010-08-22 14:19:51.000000000 +0300
++++ poldek-0.30/conf/poldek.conf 2010-08-22 14:20:28.524878981 +0300
+@@ -127,11 +127,11 @@
+ #confirm removal = yes
+
+ # Let the user select package among equivalents.
+-#choose equivalents manually = no
++choose equivalents manually = yes
+
+ # Prevent package listed from being upgraded if they are already installed.
+ # hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
+-#hold =
++hold = kernel*
+
+ # Ignore package list - packages fits given mask will be invisible.
+ # ignore = *-smp-* foo*
+--- poldek-0.30/conf_sections.c~ 2012-04-04 12:01:04.000000000 +0300
++++ poldek-0.30/conf_sections.c 2012-04-04 12:04:46.080171888 +0300
+@@ -173,7 +173,7 @@
+
+ { "choose equivalents manually",
+ CONF_TYPE_BOOLEAN,
+- "no",
++ "yes",
+ POLDEK_OP_EQPKG_ASKUSER, { 0 } },
+
+ { "hold",
diff --git a/poldek-crash-on-invalid-locale.patch b/poldek-crash-on-invalid-locale.patch
new file mode 100644
index 0000000..77ffd3b
--- /dev/null
+++ b/poldek-crash-on-invalid-locale.patch
@@ -0,0 +1,29 @@
+diff -urN poldek-0.30-cvs20080820.23/misc.c poldek-0.30-cvs20080820.23.new/misc.c
+--- poldek-0.30-cvs20080820.23/misc.c 2008-07-19 11:52:31.000000000 +0200
++++ poldek-0.30-cvs20080820.23.new/misc.c 2008-11-23 15:54:42.835970687 +0100
+@@ -626,7 +626,7 @@
+ */
+ static char *cut_country_code (const char *lang)
+ {
+- char *p, *q, *newlang;
++ char *c, *p, *q, *newlang;
+
+ if ((q = strchr(lang, '_')) == NULL)
+ return NULL;
+@@ -636,10 +636,12 @@
+
+ p = n_strncpy(newlang, lang, q - lang + 1);
+
+- if ((q = strchr(lang, '.')))
+- n_strncpy(p, q, strlen(q) + 1);
+- else if ((q = strchr(lang, '@')))
+- n_strncpy(p, q, strlen(q) + 1);
++ if ((c = strchr(q, '.')))
++ n_strncpy(p, c, strlen(c) + 1);
++ else if ((c = strchr(q, '@')))
++ n_strncpy(p, c, strlen(c) + 1);
++
++ n_assert(strlen(lang) > strlen(newlang));
+
+ return newlang;
+ }
diff --git a/poldek-dont-ask-for-suggests-on-errors.patch b/poldek-dont-ask-for-suggests-on-errors.patch
new file mode 100644
index 0000000..dd49ccd
--- /dev/null
+++ b/poldek-dont-ask-for-suggests-on-errors.patch
@@ -0,0 +1,12 @@
+--- install3/requirements.c~ 2008-11-20 13:23:07.000000000 +0100
++++ install3/requirements.c 2008-11-20 13:35:39.909464403 +0100
+@@ -613,7 +613,8 @@
+ }
+ }
+
+- if (!autochoice && !i3_is_user_choosable_equiv(ictx->ts))
++ /* if we have errors already, don't bug the user with more questions */
++ if ((!autochoice && !i3_is_user_choosable_equiv(ictx->ts)) || i3_get_nerrors(ictx, I3ERR_CLASS_DEP|I3ERR_CLASS_CNFL))
+ return NULL;
+
+ tracef(indent, "%s", pkg_id(pkg));
diff --git a/poldek-dont-be-greedy.patch b/poldek-dont-be-greedy.patch
new file mode 100644
index 0000000..00fb8ee
--- /dev/null
+++ b/poldek-dont-be-greedy.patch
@@ -0,0 +1,13 @@
+diff --git a/install3/requirements.c b/install3/requirements.c
+index ea9df61..fee15db 100644
+--- a/install3/requirements.c
++++ b/install3/requirements.c
+@@ -386,7 +392,7 @@ static int process_orphan_req(int indent, struct i3ctx *ictx,
+ }
+
+ /* try upgrade orphan */
+- if (ts->getop(ts, POLDEK_OP_GREEDY)) {
++ if (ts->getop(ts, POLDEK_OP_GREEDY) && (tomark == NULL)) {
+ if (try_to_upgrade_orphan(indent, ictx, pkg, req, tomark))
+ goto l_end;
+ }
diff --git a/poldek-dont-lose-deps.patch b/poldek-dont-lose-deps.patch
new file mode 100644
index 0000000..c981ad0
--- /dev/null
+++ b/poldek-dont-lose-deps.patch
@@ -0,0 +1,53 @@
+diff -urN a/install3/misc.c b/install3/misc.c
+--- a/install3/misc.c 2009-11-22 01:39:59.000000000 +0100
++++ b/install3/misc.c 2009-11-22 01:35:25.795536883 +0100
+@@ -319,7 +319,7 @@
+ for (i=0; i < n_array_size(candidates); i++) {
+ struct pkg *cand = n_array_nth(candidates, i);
+
+- if (pkg_is_colored_like(cand, marker)) {
++ if (!pkg_isset_mf(ictx->processed, cand, PKGMARK_BLACK) && pkg_is_colored_like(cand, marker)) {
+ if (tmp == NULL)
+ tmp = n_array_clone(candidates);
+
+@@ -354,7 +354,7 @@
+ struct pkg **best_pkg, tn_array *candidates)
+ {
+ tn_array *suspkgs = NULL, *tmpkgs;
+- int found = 0;
++ int found = 0, i;
+
+ *best_pkg = NULL;
+ found = pkgset_find_match_packages(ictx->ps, pkg, req, &suspkgs, 1);//ictx->strict);
+@@ -391,6 +391,16 @@
+
+ //trace(indent, "after removed rmmarked -> %d package(s)",
+ // n_array_size(suspkgs));
++
++ /* remove marked as BLACK from suspected packages, they have broken deps */
++ for (i = 0; i < n_array_size(suspkgs); i++) {
++ struct pkg *suspkg = n_array_nth(suspkgs, i);
++
++ if (pkg_isset_mf(ictx->processed, suspkg, PKGMARK_BLACK)) {
++ trace(indent, "- marked as BLACK %s", pkg_id(suspkg));
++ n_array_remove_nth(suspkgs, i--);
++ }
++ }
+
+ if (n_array_size(suspkgs) == 0) {
+ found = 0;
+diff -urN a/install3/process.c b/install3/process.c
+--- a/install3/process.c 2009-11-22 01:39:38.000000000 +0100
++++ b/install3/process.c 2009-11-22 19:41:42.862076125 +0100
+@@ -77,6 +77,11 @@
+ i3_forget_error(ictx, pkg);
+ }
+ }
++
++ /* this package may be used again and we have to process it (do not
++ * stop on the first condition in i3_process_package()) to generate
++ * new ->obsoletedby as we removed them here. */
++ pkg_clr_mf(ictx->processed, i3pkg->pkg, PKGMARK_GRAY);
+
+ if (i3pkg->markedby) {
+ indent = inc_indent(indent);
diff --git a/poldek-dont-suggests-required-packages.patch b/poldek-dont-suggests-required-packages.patch
new file mode 100644
index 0000000..2b4b9a3
--- /dev/null
+++ b/poldek-dont-suggests-required-packages.patch
@@ -0,0 +1,74 @@
+diff --git a/install3/requirements.c b/install3/requirements.c
+index 406b37e..0b5a654 100644
+--- a/install3/requirements.c
++++ b/install3/requirements.c
+@@ -696,11 +696,9 @@ int i3_process_pkg_requirements(int indent, struct i3ctx *ictx,
+ struct pkg *pkg = i3pkg->pkg;
+ struct pkg_req_iter *it = NULL;
+ const struct capreq *req = NULL;
+- tn_array *suggests = NULL;
+ unsigned itflags = PKG_ITER_REQIN;
+ int nerrors = 0, backtrack = 0;
+
+-
+ pkg = i3pkg->pkg;
+ n_assert(pkg);
+ n_assert(pkg->reqs);
+@@ -710,22 +708,10 @@ int i3_process_pkg_requirements(int indent, struct i3ctx *ictx,
+ return 0;
+
+ tracef(indent, "%s as NEW", pkg_id(pkg));
+-
+- if (ts->getop(ts, POLDEK_OP_SUGGESTS)) {
+- suggests = with_suggests(indent + 2, ictx, pkg);
+- if (suggests)
+- itflags |= PKG_ITER_REQSUG;
+- }
+
+ it = pkg_req_iter_new(pkg, itflags);
+ while ((req = pkg_req_iter_get(it))) {
+- unsigned t;
+ int rc;
+-
+- /* install only reasonable/choosen suggests */
+- t = pkg_req_iter_current_req_type(it);
+- if (t == PKG_ITER_REQSUG && !suggests_contains(suggests, req))
+- continue;
+
+ if ((rc = process_req(indent, ictx, i3pkg, req)) <= 0) {
+ nerrors++;
+@@ -738,7 +724,33 @@ int i3_process_pkg_requirements(int indent, struct i3ctx *ictx,
+ }
+
+ pkg_req_iter_free(it);
+- n_array_cfree(&suggests);
++
++ /* check for Suggests after processing Requires. Prevent cases where poldek
++ asks for suggested package, even though it is required. */
++ if (ts->getop(ts, POLDEK_OP_SUGGESTS) && nerrors == 0) {
++ tn_array *suggests = NULL;
++ int i;
++
++ suggests = with_suggests(indent + 2, ictx, pkg);
++
++ if (suggests) {
++ for (i = 0; i < n_array_size(suggests); i++) {
++ int rc;
++
++ req = n_array_nth(suggests, i);
++
++ if ((rc = process_req(indent, ictx, i3pkg, req)) <= 0) {
++ nerrors++;
++ if (rc < 0) {
++ backtrack = 1;
++ if (i3pkg->flags & I3PKG_BACKTRACKABLE)
++ break;
++ }
++ }
++ }
++ }
++ n_array_cfree(&suggests);
++ }
+
+ if (backtrack && (i3pkg->flags & I3PKG_CROSSROAD)) {
+ logn(LOGNOTICE, "Retrying to process %s", pkg_id(i3pkg->pkg));
diff --git a/poldek-export-missing-symbol.patch b/poldek-export-missing-symbol.patch
new file mode 100644
index 0000000..bf78d66
--- /dev/null
+++ b/poldek-export-missing-symbol.patch
@@ -0,0 +1,16 @@
+Index: libpoldek.sym
+===================================================================
+RCS file: /cvsroot/poldek/poldek/libpoldek.sym,v
+retrieving revision 1.37
+retrieving revision 1.38
+diff -u -r1.37 -r1.38
+--- libpoldek.sym 25 May 2008 09:25:31 -0000 1.37
++++ libpoldek.sym 2 Jan 2009 17:28:42 -0000 1.38
+@@ -180,6 +180,7 @@
+ pkguinf_set
+ pm_dbmtime
+ pm_dbpath
++pm_dbrec_nevr
+ pm_verify_signature
+ poldek_BANNER
+ poldek_BUG_MAILADDR
diff --git a/poldek-git.patch b/poldek-git.patch
new file mode 100644
index 0000000..34aac18
--- /dev/null
+++ b/poldek-git.patch
@@ -0,0 +1,6102 @@
+commit 3c90766404683407368cab9526d13b0aa8036469
+Author: Bartlomiej Zimon <uzi18 at o2.pl>
+Date: Wed Mar 21 01:48:26 2012 +0100
+
+ - pndir update: realy keep quiet
+
+ Signed-off-by: Bartlomiej Zimon <uzi18 at o2.pl>
+
+diff --git a/pkgdir/pndir/update.c b/pkgdir/pndir/update.c
+index 830356a..c26fe9f 100644
+--- a/pkgdir/pndir/update.c
++++ b/pkgdir/pndir/update.c
+@@ -289,8 +289,7 @@ int pndir_m_update(struct pkgdir *pkgdir, enum pkgdir_uprc *uprc)
+ pidxpath += 6;
+
+ // to keep quiet vf_stat
+- if (poldek_VERBOSE < 2)
+- vfile_configure(VFILE_CONF_VERBOSE, &poldek_VERBOSE);
++ vfile_configure(VFILE_CONF_VERBOSE, 0);
+
+ snprintf(path, sizeof(path), "%s.ndir.%s",
+ pkgdir->idxpath, pidxpath);
+commit 55c3e1253032e28eab75bf775b247db4882961f2
+Author: Bartlomiej Zimon <uzi18 at o2.pl>
+Date: Wed Mar 21 02:23:27 2012 +0100
+
+ - add name for aria fetcher
+
+ Signed-off-by: Bartlomiej Zimon <uzi18 at o2.pl>
+
+diff --git a/doc/poldek.conf.xml b/doc/poldek.conf.xml
+index 5846888..17347e5 100644
+--- a/doc/poldek.conf.xml
++++ b/doc/poldek.conf.xml
+@@ -729,6 +729,7 @@ proto = http,ftp,https
+ cmd = wget -N --dot-style=binary -P %d %Pn
+
+ [fetcher]
++name = aria
+ proto = http,ftp,https
+ cmd = aria2c --log-level=info --summary-interval=0 --truncate-console-readout=true -c -k1M -j5 -s5 -x5 -Z -P -d %d %Pn
+
+commit f18bedfa368995550e231f382718029bdc2300df
+Author: Marcin Banasiak <marcin.banasiak at gmail.com>
+Date: Sun Feb 19 16:55:35 2012 +0100
+
+ Fix types in tndb_get_all
+
+diff --git a/tndb/read.c b/tndb/read.c
+index b57bb50..d560799 100644
+--- a/tndb/read.c
++++ b/tndb/read.c
+@@ -497,7 +497,8 @@ size_t tndb_get_all(struct tndb *db, const void *key, size_t klen,
+ void **val)
+ {
+ off_t voffs;
+- size_t nread = 0, vlen;
++ size_t nread = 0;
++ unsigned int vlen;
+
+ if (tndb_get_voff(db, key, klen, &voffs, &vlen)) {
+ *val = n_malloc(vlen + 1); /* extra byte for \0 */
+commit dfe8b3eaefac54fb3decf6bf2393fcac7e58f1db
+Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
+Date: Wed Mar 21 20:22:19 2012 +0100
+
+ One more place when parallel conf-xml2 run could cause writting conflict.
+
+diff --git a/doc/conf-xml2.sh b/doc/conf-xml2.sh
+index 19a7f9d..844f108 100755
+--- a/doc/conf-xml2.sh
++++ b/doc/conf-xml2.sh
+@@ -37,10 +37,10 @@ to_conf() {
+ perl -pe 's/\[(.?)screen\]/=remove/g; s/\[(.?)\w+\]//g; s/\[\s(\w+)\s\]/[$1]/g;' $FILE > $tmp.tmp
+
+ xsl=$DN/conf-xml2conf.xsl
+- perl -pe "s|%\{name\}|$NAME.conf|g" $xsl > $xsl.tmp
++ perl -pe "s|%\{name\}|$NAME.conf|g" $xsl > $xsl.$NAME.tmp
+
+ echo "Writing $NAME.conf"
+- xsltproc $xsl.tmp $tmp.tmp |
++ xsltproc $xsl.$NAME.tmp $tmp.tmp |
+ # hash text between =xxxstart and =xxxend
+ perl -ne 's/^\s+(=xxx\w+)/$1/; $in = 1 if /^=xxxstart/; $in = 0 if /^=xxxend/; if ($in) { s/^\s+([^#])/# $1/; }; print if $_ !~ /^=/' |
+ # remove unneeded leading lines and lines with =remove tag
+commit 11f27d85144a575cfe27a22d72c3816d36e7a754
+Author: Bartlomiej Zimon <uzi18 at o2.pl>
+Date: Fri Mar 23 13:37:06 2012 +0100
+
+ - http: shut up 404 errors when verbose = 0
+
+ Signed-off-by: Bartlomiej Zimon <uzi18 at o2.pl>
+
+diff --git a/vfile/vfff/http.c b/vfile/vfff/http.c
+index b85db3a..f233b1a 100644
+--- a/vfile/vfff/http.c
++++ b/vfile/vfff/http.c
+@@ -44,6 +44,7 @@
+ #include <sigint/sigint.h>
+
+ #include "vfff.h"
++#include "../vfile_intern.h" // for verbose level
+ #include "i18n.h"
+ #include "sigint/sigint.h"
+
+@@ -674,8 +675,11 @@ static int status_code_ok(int status_code, const char *msg, const char *path)
+ is_err = 0;
+ break;
+
+- case HTTP_STATUS_NOT_FOUND:
+- vfff_set_err(ENOENT, _("%s: no such file"), path);
++ case HTTP_STATUS_NOT_FOUND:
++ if (*vfile_conf.verbose > 0) // kill error if verbose = 0
++ vfff_set_err(ENOENT, _("%s: no such file"), path);
++ else
++ is_err = 0;
+ break;
+
+ case HTTP_STATUS_FORBIDDEN:
+commit 0fcb9d8a7fe825c1a4c5f3cff2bd30312b615510
+Author: Bartlomiej Zimon <uzi18 at o2.pl>
+Date: Wed Mar 28 03:25:18 2012 +0200
+
+ - sort also installed evr column on llu -t,
+ just sort before evr array creation
+
+ Signed-off-by: Bartlomiej Zimon <uzi18 at o2.pl>
+
+diff --git a/cli/ls.c b/cli/ls.c
+index fe25dc3..13f2eaa 100644
+--- a/cli/ls.c
++++ b/cli/ls.c
+@@ -337,7 +337,6 @@ static tn_array *do_upgradeable(struct cmdctx *cmdctx, tn_array *ls_ents,
+ return ls_ents2;
+ }
+
+-
+
+ static int ls(struct cmdctx *cmdctx)
+ {
+@@ -346,6 +345,7 @@ static int ls(struct cmdctx *cmdctx)
+ int rc = 1;
+ char *path = NULL, pwdpath[PATH_MAX], *pwd;
+ unsigned ldflags = 0;
++ tn_fn_cmp cmpf;
+
+ if (cmdctx->_flags & OPT_LS_INSTALLED)
+ ldflags = POCLIDEK_LOAD_INSTALLED;
+@@ -364,6 +364,9 @@ static int ls(struct cmdctx *cmdctx)
+ goto l_end;
+ }
+
++ if ((cmpf = select_cmpf(cmdctx->_flags)))
++ n_array_sort_ex(ls_ents, cmpf);
++
+ if (cmdctx->_flags & OPT_LS_UPGRADEABLE) {
+ tn_array *tmp;
+
+@@ -379,10 +382,6 @@ static int ls(struct cmdctx *cmdctx)
+ }
+
+ if (n_array_size(ls_ents)) {
+- tn_fn_cmp cmpf;
+- if ((cmpf = select_cmpf(cmdctx->_flags)))
+- n_array_sort_ex(ls_ents, cmpf);
+-
+ rc = do_ls(ls_ents, cmdctx, evrs);
+
+ if (cmpf)
+@@ -419,6 +418,7 @@ static void ls_summary(struct cmdctx *cmdctx, struct pkg *pkg)
+
+ if ((s = pkguinf_get(pkgu, PKGUINF_SUMMARY)))
+ cmdctx_printf(cmdctx, " %s\n", s);
++
+ pkguinf_free(pkgu);
+ }
+
+diff --git a/conf.c b/conf.c
+index 890a306..2133966 100644
+--- a/conf.c
++++ b/conf.c
+@@ -1026,7 +1026,10 @@ static tn_hash *do_ldconf(tn_hash *af_htconf,
+ goto l_end;
+ }
+
+- n_hash_insert(af_htconf, af->path, NULL);
++ if (n_hash_exists(af_htconf, af->path))
++ logn(LOGERR, "%s: included twice", af->path);
++ else
++ n_hash_insert(af_htconf, af->path, NULL);
+
+ while (n_stream_gets(af->vf->vf_tnstream, buf, sizeof(buf) - 1)) {
+ char *name, *value, *line;
+diff --git a/doc/poldek.conf.xml b/doc/poldek.conf.xml
+index 17347e5..aae8091 100644
+--- a/doc/poldek.conf.xml
++++ b/doc/poldek.conf.xml
+@@ -728,7 +728,7 @@ cmd = vfjuggle %d %Pn
+ proto = http,ftp,https
+ cmd = wget -N --dot-style=binary -P %d %Pn
+
+-[fetcher]
++[ fetcher ]
+ name = aria
+ proto = http,ftp,https
+ cmd = aria2c --log-level=info --summary-interval=0 --truncate-console-readout=true -c -k1M -j5 -s5 -x5 -Z -P -d %d %Pn
+diff --git a/install3/ictx.h b/install3/ictx.h
+index aa259fb..cc1cab5 100644
+--- a/install3/ictx.h
++++ b/install3/ictx.h
+@@ -125,6 +125,7 @@ int i3_unmark_package(struct i3ctx *ictx, struct pkg *pkg);
+ int i3_is_other_version_marked(struct i3ctx *ictx, struct pkg *pkg,
+ struct capreq *req);
+
++/* marks with PKGMARK_MARK all pkgs with same name prefix */
+ int i3_mark_namegroup(struct i3ctx *ictx,
+ struct pkg *pkg, tn_array *pkgs);
+
+diff --git a/pkgdir/pndir/update.c b/pkgdir/pndir/update.c
+index c26fe9f..9cc4be1 100644
+--- a/pkgdir/pndir/update.c
++++ b/pkgdir/pndir/update.c
+@@ -361,9 +361,10 @@ int pndir_m_update(struct pkgdir *pkgdir, enum pkgdir_uprc *uprc)
+
+ msgn(2, "pndir_m_update idxpatches/idxsize: %ld/%ld bytes\n", mdpatchsize, mdsize);
+
+- if (mdpatchsize > mdsize) {
++ if (mdpatchsize * 9 / 10 > mdsize) {
+ vfile_close(vf);
+- msgn(1, _("Index patches size too bug\nRetreving index ...\n"));
++ msgn(1, _("Index patches size too big\n"));
++ msgn(1, _("Retrieving whole index ...\n"));
+ rc = update_whole_idx(pkgdir->src);
+ if (rc)
+ *uprc = PKGDIR_UPRC_UPTODATE;
+diff --git a/pkgfetch.c b/pkgfetch.c
+index 9adc155..70e40e3 100644
+--- a/pkgfetch.c
++++ b/pkgfetch.c
+@@ -252,7 +252,7 @@ int packages_fetch(struct pm_ctx *pmctx,
+ nerr++;
+
+ else {
+- int j;
++ unsigned int j;
+
+ for (j=0; j < n_array_size(urls); j++) {
+ char localpath[PATH_MAX];
+diff --git a/po/de.po b/po/de.po
+index b032bf5..c0ce6ca 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -6,7 +6,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: poldek 0.17\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-03-04 00:17+0200\n"
++"POT-Creation-Date: 2012-04-01 19:50+0200\n"
+ "PO-Revision-Date: 2002-04-14 13:05+0100\n"
+ "Last-Translator: Andreas Piesk <a.piesk at gmx.net>\n"
+ "Language-Team: Polish <pl at li.org>\n"
+@@ -15,67 +15,75 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=n==0 ? 0 : n==1 ? 1 : 2\n"
+
+-#: arg_packages.c:123
++#: arg_packages.c:124
+ #, c-format
+ msgid "%s:%d: syntax error"
+ msgstr "%s:%d: Syntaxfehler"
+
+-#: arg_packages.c:125
++#: arg_packages.c:126
+ #, fuzzy
+ msgid "syntax error in package specification"
+ msgstr "Syntaxfehler in Paketdefinition"
+
+-#: arg_packages.c:393
++#: arg_packages.c:394
+ #, fuzzy, c-format
+ msgid "Removed %d duplicates from given packages"
+ msgstr "%d doppelte Pakete aus der Liste der angegebenen Pakete entfernt"
+
+-#: arg_packages.c:431
++#: arg_packages.c:432
+ #, fuzzy, c-format
+ msgid "%s: %d package(s) found:"
+ msgstr "mark: %s: P�ket nicht gefunden"
+
+-#: arg_packages.c:501 arg_packages.c:530 arg_packages.c:556 uninstall.c:592
++#: arg_packages.c:502 arg_packages.c:531 arg_packages.c:557 uninstall.c:593
+ #, c-format
+ msgid "%s: no such package"
+ msgstr "%s: dieses Paket gibt es nicht"
+
+-#: arg_packages.c:507 cli/dent.c:666
++#: arg_packages.c:508 cli/dent.c:675
+ #, fuzzy, c-format
+ msgid "%s: ambiguous name"
+ msgstr "%s: mehrdeutiger Name"
+
+-#: arg_packages.c:632
++#: arg_packages.c:633
+ #, fuzzy, c-format
+ msgid "%s: choosen %s among %d packages"
+ msgstr "%s: '%s' fehlt in einigen Paketen"
+
+-#: ask.c:79 ask.c:83
++#: ask.c:80 ask.c:84
+ #, fuzzy
+ msgid "Proceed?"
+ msgstr "Fortfahren? [Y/n]"
+
+-#: ask.c:106
++#: ask.c:115
+ #, c-format
+ msgid "%s: required \"%s\" is provided by the following packages:"
+ msgstr ""
+
+-#: ask.c:109
++#: ask.c:118
+ #, c-format
+ msgid "Required \"%s\" is provided by the following packages:"
+ msgstr ""
+
+-#: ask.c:128
++#: ask.c:131
++msgid "-/backspace/pgup) page up"
++msgstr ""
++
++#: ask.c:143
++msgid "+/space/tab/pgdown) page down"
++msgstr ""
++
++#: ask.c:151
+ #, fuzzy, c-format
+-msgid "Which one do you want to install ('Q' to abort)? [%c]"
++msgid "Which one do you want to install ('Q' to abort)? [%s]"
+ msgstr "Welches willst du installieren? [a]"
+
+-#: ask.c:166
++#: ask.c:198
+ #, fuzzy, c-format
+ msgid "Package %s suggests installation of:"
+ msgstr "%s: Installation fehlgeschlagen:"
+
+-#: ask.c:168
++#: ask.c:200
+ #, fuzzy
+ msgid "Try to install it?"
+ msgid_plural "Try to install them?"
+@@ -83,124 +91,124 @@ msgstr[0] "_, %d noch zu entfernen"
+ msgstr[1] "_, %d noch zu entfernen"
+ msgstr[2] "_, %d noch zu entfernen"
+
+-#: ask.c:180
++#: ask.c:212
+ #, c-format
+ msgid "(y - all, n - nothing, s - select some of)? [%s]"
+ msgstr ""
+
+-#: ask.c:203
++#: ask.c:235
+ #, fuzzy, c-format
+ msgid "Try to install %s?"
+ msgstr "_, %d noch zu entfernen"
+
+-#: capreq.c:343
++#: capreq.c:344
+ #, c-format
+ msgid "%s: invalid rpmlib capreq"
+ msgstr "%s: ung�ltige rpmlib capreq"
+
+-#: cli/alias.c:40
++#: cli/alias.c:41
+ #, fuzzy
+ msgid "Print defined command aliases"
+ msgstr " definierte Pseudonyme:\n"
+
+-#: cli/alias.c:100
++#: cli/alias.c:101
+ #, fuzzy, c-format
+ msgid "%s: alias could not shadow a command"
+ msgstr "%s: dieses Kommando gibt es nicht"
+
+-#: cli/alias.c:105
++#: cli/alias.c:106
+ #, c-format
+ msgid "%s (%s) overwrites %s"
+ msgstr ""
+
+-#: cli/alias.c:159
++#: cli/alias.c:160
+ #, fuzzy, c-format
+ msgid "%s: could not determine aliased command"
+ msgstr "%s: dieses Kommando gibt es nicht"
+
+-#: cli/alias.c:162
++#: cli/alias.c:163
+ #, c-format
+ msgid "%s => aliased %s"
+ msgstr ""
+
+-#: cli/cd.c:31
++#: cli/cd.c:32
+ msgid "[PATH]"
+ msgstr ""
+
+-#: cli/cd.c:31
++#: cli/cd.c:32
+ msgid "Change current package directory"
+ msgstr ""
+
+-#: cli/cd.c:38
++#: cli/cd.c:39
+ msgid "Print name of current directory"
+ msgstr ""
+
+-#: cli/cli.c:211
++#: cli/cli.c:212
+ msgid " Defined aliases:\n"
+ msgstr " definierte Pseudonyme:\n"
+
+-#: cli/cli.c:230 cli/main.c:127
++#: cli/cli.c:231 cli/main.c:128
+ msgid "Be verbose."
+ msgstr "Sei ausf�hrlich"
+
+-#: cli/cli.c:231
++#: cli/cli.c:232
+ msgid "Be quiet"
+ msgstr ""
+
+-#: cli/cli.c:232
++#: cli/cli.c:233
+ msgid "Help"
+ msgstr ""
+
+-#: cli/cli.c:419
++#: cli/cli.c:420
+ #, c-format
+ msgid "ambiguous command %s"
+ msgstr "mehrdeutiger Befehl '%s'"
+
+-#: cli/cmd_chain.c:194
++#: cli/cmd_chain.c:195
+ #, c-format
+ msgid "%s: no such command"
+ msgstr "%s: dieses Kommando gibt es nicht"
+
+-#: cli/cmd_chain.c:211
++#: cli/cmd_chain.c:212
+ #, fuzzy, c-format
+ msgid "%s: ambiguous command"
+ msgstr "mehrdeutiger Befehl '%s'"
+
+-#: cli/cmd_chain.c:303
++#: cli/cmd_chain.c:304
+ #, fuzzy, c-format
+ msgid "%s: alias needs an arguments"
+ msgstr "die Option ben�tigt ein Argument -- %s"
+
+-#: cli/cmd_chain.c:309
++#: cli/cmd_chain.c:310
+ #, c-format
+ msgid "%s: apply arguments failed (not enough arguments?)"
+ msgstr ""
+
+-#: cli/cmd_chain.c:351 cli/install.c:519 cli/uninstall.c:198
++#: cli/cmd_chain.c:352 cli/install.c:529 cli/uninstall.c:199
+ #, fuzzy, c-format
+ msgid "%s: parse error"
+ msgstr "%s: Fehler bei der Analyse der URL"
+
+-#: cli/cmd_chain.c:435
++#: cli/cmd_chain.c:436
+ #, fuzzy, c-format
+ msgid "%s: not a right pipe-able command"
+ msgstr "%s: dieses Kommando gibt es nicht"
+
+-#: cli/cmd_chain.c:446
++#: cli/cmd_chain.c:447
+ #, c-format
+ msgid "%s: where is the pipe going?"
+ msgstr ""
+
+-#: cli/cmd_chain.c:454
++#: cli/cmd_chain.c:455
+ #, c-format
+ msgid "%s: not a left pipe-able command"
+ msgstr ""
+
+-#: cli/dbcache.c:191
++#: cli/dbcache.c:192
+ msgid "Load installed packages failed"
+ msgstr "Lesen der Liste der installierten Pakete fehlgeschlagen"
+
+-#: cli/dbcache.c:195 pkgdir/pkgdir.c:665
++#: cli/dbcache.c:196 pkgdir/pkgdir.c:665
+ #, c-format
+ msgid "%d package loaded"
+ msgid_plural "%d packages loaded"
+@@ -208,75 +216,75 @@ msgstr[0] "%d Pakete gelesen"
+ msgstr[1] "%d Paket gelesen"
+ msgstr[2] "%d Pakete gelesen"
+
+-#: cli/dent.c:660
++#: cli/dent.c:669
+ #, fuzzy, c-format
+ msgid "%s: no such package or directory"
+ msgstr "%s: Verzeichnis existiert nicht"
+
+-#: cli/desc.c:71
++#: cli/desc.c:72
+ #, fuzzy
+ msgid "Show all fields described below"
+ msgstr "Zeige alle unten aufgef�hrten Felder"
+
+-#: cli/desc.c:74
++#: cli/desc.c:75
+ msgid "Show capabilities, requirements, conflicts and obsolences"
+ msgstr "Zeige Fahigkeiten, Vorraussetzungen, Konflikte und Veraltetes"
+
+-#: cli/desc.c:77
++#: cli/desc.c:78
+ msgid "Show package's capablities"
+ msgstr "Zeige die F�higkeiten des Paketes"
+
+-#: cli/desc.c:80
++#: cli/desc.c:81
+ msgid "Show requirements"
+ msgstr "Zeige Vorraussetzungen"
+
+-#: cli/desc.c:83
++#: cli/desc.c:84
+ msgid "Show required packages"
+ msgstr "Zeige ben�tigte Pakete"
+
+-#: cli/desc.c:86
++#: cli/desc.c:87
+ msgid "Show packages which requires given package"
+ msgstr "Zeige Pakete, die das angegebene Paket ben�tigen"
+
+-#: cli/desc.c:89
++#: cli/desc.c:90
+ msgid "Show conflicts and obsolences"
+ msgstr "Zeige Konflikte und Veraltetes"
+
+-#: cli/desc.c:91
++#: cli/desc.c:92
+ msgid "Show description (the default)"
+ msgstr "Zeige Beschreibung (der Standard)"
+
+-#: cli/desc.c:94
++#: cli/desc.c:95
+ msgid "Show package files (doubled gives long listing format)"
+ msgstr "Zeige Paketdateien (doppelt angeben f�r detailliertes Format)"
+
+-#: cli/desc.c:97
++#: cli/desc.c:98
+ #, fuzzy
+ msgid "Show package changelog"
+ msgstr "Zeige Paketdateien"
+
+-#: cli/desc.c:104 cli/get.c:47 cli/install.c:206 cli/uninstall.c:71
++#: cli/desc.c:105 cli/get.c:48 cli/install.c:212 cli/uninstall.c:72
+ msgid "PACKAGE..."
+ msgstr "PAKET..."
+
+-#: cli/desc.c:104
++#: cli/desc.c:105
+ msgid "Display packages info"
+ msgstr "Zeige Paketinformationen"
+
+-#: cli/desc.c:635
++#: cli/desc.c:636
+ msgid "mode"
+ msgstr "Modus"
+
+-#: cli/desc.c:635 cli/ls.c:425 cli/ls.c:439 cli/ls.c:442
++#: cli/desc.c:636 cli/ls.c:466 cli/ls.c:480 cli/ls.c:483
+ msgid "size"
+ msgstr "Gr��e"
+
+-#: cli/desc.c:635
++#: cli/desc.c:636
+ #, fuzzy
+ msgid "name"
+ msgstr "Name"
+
+-#: cli/desc.c:998
++#: cli/desc.c:999
+ #, fuzzy, c-format
+ msgid ""
+ "%s: full description unavailable (index without packages info loaded?)\n"
+@@ -296,29 +304,29 @@ msgstr ""
+ msgid "%s: external command not found"
+ msgstr "%s: Vorraussetzung '%s' nicht gefunden"
+
+-#: cli/get.c:41
++#: cli/get.c:42
+ msgid "Download to directory DIR instead to current one"
+ msgstr "Speichere im Verzeichnis DIR anstelle im aktuellen Verzeichnis"
+
+-#: cli/get.c:47
++#: cli/get.c:48
+ msgid "Download packages"
+ msgstr "�bertrage Pakete"
+
+-#: cli/get.c:62 cli/install.c:496 misc.c:296
++#: cli/get.c:63 cli/install.c:506 misc.c:297
+ #, c-format
+ msgid "%s: no such directory"
+ msgstr "%s: Verzeichnis existiert nicht"
+
+-#: cli/help.c:28
++#: cli/help.c:29
+ msgid "Display this help"
+ msgstr "Zeige diese Hilfe an"
+
+-#: cli/help.c:56
++#: cli/help.c:57
+ #, c-format
+ msgid "[OPTION...] %s"
+ msgstr "[OPTION...] %s"
+
+-#: cli/help.c:61
++#: cli/help.c:62
+ #, c-format
+ msgid ""
+ "\n"
+@@ -327,47 +335,47 @@ msgstr ""
+ "\n"
+ "Gib BEFEHL -? f�r eine detaillierte Hilfe ein.\n"
+
+-#: cli/install.c:74
++#: cli/install.c:77
+ msgid "Install, not upgrade packages"
+ msgstr "Pakete werden nur installiert, nicht aktualisiert"
+
+-#: cli/install.c:75
++#: cli/install.c:78
+ #, fuzzy
+ msgid "Reinstall"
+ msgstr "installiert"
+
+-#: cli/install.c:76 cli/install.c:155
++#: cli/install.c:79 cli/install.c:161
+ msgid "Downgrade"
+ msgstr ""
+
+-#: cli/install.c:78
++#: cli/install.c:81
+ #, fuzzy
+ msgid "Install packages ignoring broken dependencies, conflicts, etc"
+ msgstr "Installiere Pakete ohne R�cksicht auf die Abh�ngigkeiten"
+
+-#: cli/install.c:79
++#: cli/install.c:82
+ msgid "Don't install, but tell if it would work or not"
+ msgstr "Simuliere die Installation"
+
+-#: cli/install.c:81
++#: cli/install.c:84
+ msgid "Upgrade packages, but only if an earlier version currently exists"
+ msgstr "Aktualisiere nur bereits installierte Pakete"
+
+-#: cli/install.c:83
++#: cli/install.c:86
+ #, fuzzy
+ msgid "Don't install packages required by selected ones"
+ msgstr ""
+ "Pakete, die von den ausgew�hlten Paketen ben�tigt werden, werden nicht "
+ "automatisch installiert"
+
+-#: cli/install.c:87
++#: cli/install.c:90
+ #, fuzzy
+ msgid "Install packages required by selected ones"
+ msgstr ""
+ "Pakete, die von den ausgew�hlten Paketen ben�tigt werden, werden nicht "
+ "automatisch installiert"
+
+-#: cli/install.c:90 cli/install.c:95
++#: cli/install.c:93 cli/install.c:98
+ msgid ""
+ "Automatically upgrade packages which dependencies are broken by unistalled "
+ "ones"
+@@ -375,29 +383,29 @@ msgstr ""
+ "Aktualisiere automatisch alle Pakete, deren Abh�ngigkeiten durch entfernte "
+ "Pakete verletzt wurden"
+
+-#: cli/install.c:99
++#: cli/install.c:102
+ msgid ""
+ "Download packages to DIR (poldek's cache directory by default)instead of "
+ "install them"
+ msgstr ""
+
+-#: cli/install.c:103
++#: cli/install.c:106
+ msgid "Install packages with broken dependencies"
+ msgstr "Installiere Pakete ohne R�cksicht auf die Abh�ngigkeiten"
+
+-#: cli/install.c:105
++#: cli/install.c:108
+ msgid ""
+ "Treat requirements with EVR as satisfied by unversioned capabilities (old "
+ "RPM behaviour)"
+ msgstr ""
+
+-#: cli/install.c:109
++#: cli/install.c:112
+ msgid ""
+ "Promote non-existent requirement's epoch to package's one (rpm prior to "
+ "4.2.1 behaviour)"
+ msgstr ""
+
+-#: cli/install.c:114
++#: cli/install.c:117
+ #, fuzzy
+ msgid ""
+ "Print packages file names to FILE (stdout by default) instead of install them"
+@@ -405,506 +413,575 @@ msgstr ""
+ "Schreibe die Dateinamen aller zum Installieren markierten Pakete in die "
+ "Datei FILE (Standard ist die Standardausgabe)"
+
+-#: cli/install.c:118
++#: cli/install.c:121
+ msgid ""
+ "Print packages names to FILE (stdout by default) instead of install them"
+ msgstr ""
+
+-#: cli/install.c:120
++#: cli/install.c:123
+ msgid "Modify only the database"
+ msgstr ""
+ "Installation wird nur in der Datenbank durchgef�hrt. Es werden keine Dateien "
+ "kopiert oder Skripte ausgef�hrt."
+
+-#: cli/install.c:123
++#: cli/install.c:126
+ msgid "Same as --nodeps but applied to PM (rpm) only"
+ msgstr ""
+
+-#: cli/install.c:128
++#: cli/install.c:131
+ msgid "Same as --force but applied to PM (rpm) only)"
+ msgstr ""
+
+-#: cli/install.c:132
++#: cli/install.c:135
+ msgid "pass option OPTION to PM binary"
+ msgstr ""
+
+-#: cli/install.c:137 cli/install.c:179
++#: cli/install.c:140 cli/install.c:185
+ #, fuzzy
+ msgid "Do not hold any packages. Disables --hold settings."
+ msgstr "�bertrage Pakete"
+
+-#: cli/install.c:141
++#: cli/install.c:144
+ #, fuzzy
+ msgid "Do not download packages"
+ msgstr "�bertrage Pakete"
+
+-#: cli/install.c:148
++#: cli/install.c:147 cli/op_packages.c:47
++msgid "Look into package capabilities and files to resolve packages"
++msgstr ""
++
++#: cli/install.c:154
+ #, fuzzy
+ msgid "Package installation:"
+ msgstr "Installation:"
+
+-#: cli/install.c:149
++#: cli/install.c:155
+ msgid "Install given packages"
+ msgstr "Installiere die angegebenen Pakete"
+
+-#: cli/install.c:153
++#: cli/install.c:159
+ #, fuzzy
+ msgid "Reinstall given packages"
+ msgstr "Installiere die angegebenen Pakete"
+
+-#: cli/install.c:156
++#: cli/install.c:162
+ msgid "Upgrade given packages"
+ msgstr "Aktualisiere die angegebenen Pakete"
+
+-#: cli/install.c:161
++#: cli/install.c:167
+ msgid "Distribution installation/upgrade:"
+ msgstr ""
+
+-#: cli/install.c:163
++#: cli/install.c:169
+ msgid "Install package set under DIR as root directory"
+ msgstr "Installiere Paketsatz mit DIR als Wurzelverzeichnis"
+
+-#: cli/install.c:166
++#: cli/install.c:172
+ msgid "Upgrade all packages needs upgrade"
+ msgstr "Aktualisiere alle Pakete, f�r die Updates verf�gbar sind"
+
+-#: cli/install.c:169
++#: cli/install.c:175
+ #, fuzzy
+ msgid "Reinstall all packages under DIR as root directory"
+ msgstr "Installiere Paketsatz mit DIR als Wurzelverzeichnis"
+
+-#: cli/install.c:171
++#: cli/install.c:177
+ msgid "Set top directory to DIR"
+ msgstr "Verwende DIR als Wurzelverzeichnis"
+
+-#: cli/install.c:173
++#: cli/install.c:179
+ msgid "Installation switches:"
+ msgstr "Installationsparameter:"
+
+-#: cli/install.c:175
++#: cli/install.c:181
+ msgid ""
+ "Prevent packages listed from being upgraded if they are already installed."
+ msgstr "Aktualisiere die angegebene Pakete nicht, falls sie installiert sind"
+
+-#: cli/install.c:182
++#: cli/install.c:188
+ #, fuzzy
+ msgid "Make packages listed invisible."
+ msgstr "keine Pakete zum Installieren vorhanden"
+
+-#: cli/install.c:185
++#: cli/install.c:191
+ #, fuzzy
+ msgid "Make invisibled packages visible. Disables --ignore settings."
+ msgstr "Lesen der Liste der installierten Pakete fehlgeschlagen"
+
+-#: cli/install.c:188
++#: cli/install.c:194
+ #, fuzzy
+ msgid "Remove package duplicates from available package list"
+ msgstr "%d doppelte Pakete aus der Liste der angegebenen Pakete entfernt"
+
+-#: cli/install.c:194
++#: cli/install.c:200
+ msgid "Print installation summary in parseable form"
+ msgstr ""
+
+-#: cli/install.c:206
++#: cli/install.c:212
+ msgid "Install packages"
+ msgstr "Installiere Pakete"
+
+-#: cli/install.c:423
++#: cli/install.c:429
+ #, fuzzy, c-format
+ msgid "invalid value ('%s') of option 'follow'"
+ msgstr "ung�ltiger Wert ('%s') f�r Option '%s'"
+
+-#: cli/install.c:446 cli/uninstall.c:173
++#: cli/install.c:452 cli/uninstall.c:174
+ #, fuzzy, c-format
+ msgid "invalid value ('%s') of option 'greedy'"
+ msgstr "ung�ltiger Wert ('%s') f�r Option '%s'"
+
+-#: cli/install.c:564
++#: cli/install.c:574
+ msgid "There were errors"
+ msgstr "Es sind Fehler aufgetreten"
+
+-#: cli/install.c:584
++#: cli/install.c:594
+ msgid "no packages specified"
+ msgstr "keine Pakete angegeben"
+
+-#: cli/ls.c:57
++#: cli/ls.c:62
+ msgid "Use a long listing format"
+ msgstr "Verwende detailliertes Ausgabeformat"
+
+-#: cli/ls.c:58
++#: cli/ls.c:63
+ msgid "Show upgrade-able packages only"
+ msgstr "Zeige f�r aktualisierbare Pakete"
+
+-#: cli/ls.c:60
++#: cli/ls.c:65
+ msgid "Likewise but omit packages with different releases only"
+ msgstr ""
+ "wie zuvor, aber lasse Pakete, bei denen sich nur das Release �ndert, aus"
+
+-#: cli/ls.c:62
++#: cli/ls.c:67
+ #, fuzzy
+ msgid "Show upgrade-able packages with potential security fixes"
+ msgstr "Zeige f�r aktualisierbare Pakete"
+
+-#: cli/ls.c:63
++#: cli/ls.c:68
+ msgid "List installed packages"
+ msgstr "Zeige installierte Pakete"
+
+-#: cli/ls.c:64
++#: cli/ls.c:69
+ msgid "Sort by build time"
+ msgstr "Ordne nach Erstellungszeit"
+
+-#: cli/ls.c:65
++#: cli/ls.c:70
+ msgid "Sort by build day"
+ msgstr "Ordne nach Erstellungstag"
+
+-#: cli/ls.c:66
++#: cli/ls.c:71
+ msgid "Reverse order while sorting"
+ msgstr "Kehre die Reihenfolge beim Sortieren um"
+
+-#: cli/ls.c:67
++#: cli/ls.c:72
+ msgid "Print only package names"
+ msgstr "Zeige nur die Paketnamen"
+
+-#: cli/ls.c:68
++#: cli/ls.c:73
+ msgid "Print package groups"
+ msgstr "Zeige Paketgruppen"
+
+-#: cli/ls.c:69
++#: cli/ls.c:74
+ msgid "Print package summaries"
+ msgstr "Zeige Paketzusammenfassungen"
+
+-#: cli/ls.c:77 cli/main.c:52
++#: cli/ls.c:75
++#, fuzzy
++msgid "Print package source rpm"
++msgstr "Zeige Paketgruppen"
++
++#: cli/ls.c:76
++#, fuzzy
++msgid "Query format options:"
++msgstr "Optionen f�r '�berpr�fen':"
++
++#: cli/ls.c:77
++#, fuzzy
++msgid "Use the following query format"
++msgstr "Verwende detailliertes Ausgabeformat"
++
++#: cli/ls.c:78
++#, fuzzy
++msgid "Show supported tags"
++msgstr "Zeige ben�tigte Pakete"
++
++#: cli/ls.c:85 cli/main.c:53
+ msgid "[PACKAGE...]"
+ msgstr "[PAKET...]"
+
+-#: cli/ls.c:77
++#: cli/ls.c:85
+ msgid "List packages"
+ msgstr "Zeige Pakete"
+
+-#: cli/ls.c:87
+-msgid "ls: -l and -G are exclusive"
++#: cli/ls.c:95
++#, fuzzy
++msgid "ls: -l, -s and -G are exclusive"
+ msgstr "ls: Optionen '-l' und '-G' schliessen sich aus"
+
+-#: cli/ls.c:221
++#: cli/ls.c:256
+ #, fuzzy, c-format
+ msgid "%s: no packages found"
+ msgstr "mark: %s: P�ket nicht gefunden"
+
+-#: cli/ls.c:413 cli/ls.c:425
++#: cli/ls.c:453 cli/ls.c:455 cli/ls.c:466
+ msgid "package"
+ msgstr "Paket"
+
+-#: cli/ls.c:413
++#: cli/ls.c:453
+ msgid "group"
+ msgstr "Gruppe"
+
+-#: cli/ls.c:425 cli/ls.c:439 cli/ls.c:442
++#: cli/ls.c:455
++msgid "source rpm"
++msgstr ""
++
++#: cli/ls.c:466 cli/ls.c:480 cli/ls.c:483
+ msgid "build date"
+ msgstr "Erstellungsdatum"
+
+-#: cli/ls.c:438 cli/ls.c:442
++#: cli/ls.c:479 cli/ls.c:483
+ msgid "installed"
+ msgstr "installiert"
+
+-#: cli/ls.c:439 cli/ls.c:441
++#: cli/ls.c:480 cli/ls.c:482
+ msgid "available"
+ msgstr "verf�gbar"
+
+-#: cli/main.c:84
++#: cli/ls_queryfmt.c:38
++msgid "invalid format:"
++msgstr ""
++
++#: cli/ls_queryfmt.c:718
++#, fuzzy, c-format
++msgid "%s missing { after %%"
++msgstr "%s: Betriebssystemkennzeichnung fehlt"
++
++#: cli/ls_queryfmt.c:734
++#, fuzzy, c-format
++msgid "%s missing } after %%{"
++msgstr "%s: Betriebssystemkennzeichnung fehlt"
++
++#: cli/ls_queryfmt.c:742
++#, c-format
++msgid "%s empty tag name"
++msgstr ""
++
++#: cli/ls_queryfmt.c:754
++#, fuzzy, c-format
++msgid "%s unknown tag: '%s'"
++msgstr "%s:%d unbekannte Option '%s'"
++
++#: cli/ls_queryfmt.c:789
++#, fuzzy, c-format
++msgid "%s missing ] at end of array"
++msgstr "%s: '%s' fehlt in einigen Paketen"
++
++#: cli/ls_queryfmt.c:800
++#, fuzzy, c-format
++msgid "%s unexpected ]"
++msgstr "unerwartetes EOF"
++
++#: cli/ls_queryfmt.c:814
++#, fuzzy, c-format
++msgid "%s unexpected }"
++msgstr "unerwartetes EOF"
++
++#: cli/ls_queryfmt.c:1038
++#, c-format
++msgid "%s array iterator used with different sized arrays"
++msgstr ""
++
++#: cli/main.c:85
+ msgid "Miscellaneous options:"
+ msgstr ""
+
+-#: cli/main.c:86
++#: cli/main.c:87
+ msgid "Use FILE as PM(rpm) binary"
+ msgstr ""
+
+-#: cli/main.c:88
++#: cli/main.c:89
+ msgid "Use FILE as sudo binary"
+ msgstr ""
+
+-#: cli/main.c:91
++#: cli/main.c:92
+ #, fuzzy
+ msgid "Store downloaded files and co. under DIR"
+ msgstr "Speichere die �bertragenen Dateien im Verzeichnis DIR"
+
+-#: cli/main.c:94
++#: cli/main.c:95
+ msgid "Run in command mode (like ipoldek does by default)"
+ msgstr ""
+
+-#: cli/main.c:96
++#: cli/main.c:97
+ msgid ""
+ "Confirm packages installation and let user choose among equivalent packages"
+ msgstr ""
+ "Best�tige Paketinstallationen und lasse den Benutzer aus gleichwertigen "
+ "Paketen ausw�hlen"
+
+-#: cli/main.c:98
++#: cli/main.c:99
+ msgid "Don't ask about anything"
+ msgstr ""
+
+-#: cli/main.c:100
++#: cli/main.c:101
+ #, fuzzy
+ msgid "Run in interactive mode (default)"
+ msgstr "Starte im interaktiven Modus"
+
+-#: cli/main.c:103
++#: cli/main.c:104
+ msgid "Run poldek shell COMMAND and exit"
+ msgstr "F�hre das Poldek-Shellkommando COMMAND aus und beende danach"
+
+-#: cli/main.c:106
++#: cli/main.c:107
+ msgid "Don't load installed packages at startup"
+ msgstr "Die Liste der installierten Pakete wird beim Starten nicht gelesen"
+
+-#: cli/main.c:110 cli/main.c:112
++#: cli/main.c:111 cli/main.c:113
+ msgid "Read configuration from FILE"
+ msgstr "Lese Konfiguration aus Datei FILE"
+
+-#: cli/main.c:114
++#: cli/main.c:115
+ msgid "Do not read configuration"
+ msgstr "Lese keine Konfigurationsdateien"
+
+-#: cli/main.c:115
++#: cli/main.c:116
+ msgid "Update remote configuration files (if any)"
+ msgstr ""
+
+-#: cli/main.c:119
++#: cli/main.c:120
+ msgid "Display program version information and exit"
+ msgstr "Zeige die Programmversion und beende danach"
+
+-#: cli/main.c:121
++#: cli/main.c:122
+ msgid "Log program messages to FILE"
+ msgstr "Protokolliere Programmmeldungen in Datei FILE"
+
+-#: cli/main.c:122
++#: cli/main.c:123
+ msgid "Run program as user USER"
+ msgstr ""
+
+-#: cli/main.c:123
++#: cli/main.c:124
+ #, fuzzy
+ msgid "Set configuration option"
+ msgstr "Lese Konfiguration aus Datei FILE"
+
+-#: cli/main.c:125
++#: cli/main.c:126
+ msgid "Dump options in docbook format"
+ msgstr ""
+
+-#: cli/main.c:128
++#: cli/main.c:129
+ msgid "Do not produce any output."
+ msgstr "Gib keinerlei Meldungen aus"
+
+-#: cli/main.c:229
++#: cli/main.c:230
+ msgid "-c is depreciated, use --conf instead"
+ msgstr ""
+
+-#: cli/main.c:577
++#: cli/main.c:578
+ #, fuzzy, c-format
+ msgid "%s: option '%s' requires an argument\n"
+ msgstr "die Option ben�tigt ein Argument -- %s"
+
+-#: cli/main.c:581
++#: cli/main.c:582
+ #, c-format
+ msgid "%s: option '%s' gives no effect if program executed by ordinary user"
+ msgstr ""
+
+-#: cli/op.c:69 cli/op.c:73
++#: cli/op.c:70 cli/op.c:80
+ msgid " and "
+ msgstr ""
+
+-#: cli/op.c:80
++#: cli/op.c:87
+ #, fuzzy, c-format
+ msgid "%s options are exclusive"
+ msgstr "ls: Optionen '-l' und '-G' schliessen sich aus"
+
+-#: cli/op_makeidx.c:51 cli/op_split.c:81
++#: cli/op_makeidx.c:52 cli/op_split.c:82
+ #, fuzzy
+ msgid "Repository index creation:"
+ msgstr "Indexerstellung:"
+
+-#: cli/op_makeidx.c:54
++#: cli/op_makeidx.c:55
+ #, fuzzy
+ msgid "Create package index (under SOURCE-PATH by default)"
+ msgstr "Erstelle Paketindex; Standarddatei ist 'SOURCE/packages.dir'"
+
+-#: cli/op_makeidx.c:59
++#: cli/op_makeidx.c:60
+ msgid "Set created index type (use --stl to list available values)"
+ msgstr ""
+
+-#: cli/op_makeidx.c:65
++#: cli/op_makeidx.c:66
+ msgid "Likewise, but gzipped file is created"
+ msgstr "wie zuvor, nur wird die Indexdatei komprimiert"
+
+-#: cli/op_makeidx.c:72
++#: cli/op_makeidx.c:73
+ msgid "Create options (type --mo=help for help)"
+ msgstr ""
+
+-#: cli/op_makeidx.c:85
++#: cli/op_makeidx.c:86
+ #, fuzzy
+ msgid "Omit package user-level information (like Summary or Description)"
+ msgstr ""
+ "Speichere keine Benutzerangaben wie 'Summary' oder 'Description' im Index"
+
+-#: cli/op_makeidx.c:88
++#: cli/op_makeidx.c:89
+ msgid "Don't create index delta files"
+ msgstr ""
+
+-#: cli/op_makeidx.c:91
++#: cli/op_makeidx.c:92
+ msgid "Create pdir compatibile with versions prior 0.18.9"
+ msgstr ""
+
+-#: cli/op_makeidx.c:93
++#: cli/op_makeidx.c:94
+ msgid "Create uncompressed index"
+ msgstr ""
+
+-#: cli/op_makeidx.c:151
++#: cli/op_makeidx.c:152
+ #, c-format
+ msgid "--%s is deprecated, use --mo=%s"
+ msgstr ""
+
+-#: cli/op_makeidx.c:258
++#: cli/op_makeidx.c:259
+ #, fuzzy, c-format
+ msgid "%s: unknown option"
+ msgstr "%s: unbekannte Option '%s'"
+
+-#: cli/op_makeidx.c:298
++#: cli/op_makeidx.c:299
+ #, fuzzy, c-format
+ msgid "Index create options are:\n"
+ msgstr "Indexerstellung:"
+
+-#: cli/op_makeidx.c:352
++#: cli/op_makeidx.c:353
+ #, fuzzy
+ msgid "no sources specified"
+ msgstr "keine Quelle angegeben"
+
+-#: cli/op_packages.c:36
++#: cli/op_packages.c:37
+ msgid "Package related options:"
+ msgstr ""
+
+-#: cli/op_packages.c:37
++#: cli/op_packages.c:38
+ msgid "Take package set definition from FILE"
+ msgstr "Lese Paketzusammenstellungen aus Datei FILE"
+
+-#: cli/op_packages.c:46
+-msgid "Look into package capabilities and files to resolve packages"
+-msgstr ""
+-
+-#: cli/op_packages.c:117
++#: cli/op_packages.c:118
+ #, c-format
+ msgid "'%s' option should be set by --%s"
+ msgstr "Option '%s' sollte von '--%s' gesetzt werden"
+
+-#: cli/op_source.c:66
++#: cli/op_source.c:67
+ #, fuzzy
+ msgid "Repository selection:"
+ msgstr "Optionen f�r Quellen:"
+
+-#: cli/op_source.c:67
++#: cli/op_source.c:68
+ #, fuzzy
+ msgid "Get packages info from repository under PATH"
+ msgstr "Lese Paketinformationen von Quelle SOURCE-NAME"
+
+-#: cli/op_source.c:70
++#: cli/op_source.c:71
+ #, fuzzy
+ msgid "Get packages info from repository named SOURCE-NAME"
+ msgstr "Lese Paketinformationen von Quelle SOURCE-NAME"
+
+-#: cli/op_source.c:74
++#: cli/op_source.c:75
+ msgid "Set the type of index specified by --destination option"
+ msgstr ""
+
+-#: cli/op_source.c:78
++#: cli/op_source.c:79
+ msgid "Install to specified destination"
+ msgstr ""
+
+-#: cli/op_source.c:82
++#: cli/op_source.c:83
+ msgid "Install to source SOURCE-NAME instead to the system"
+ msgstr ""
+
+-#: cli/op_source.c:85
++#: cli/op_source.c:86
+ msgid "Get packages info from package index file FILE"
+ msgstr "Lese Paketinformationen von Indexdatei FILE"
+
+-#: cli/op_source.c:88
++#: cli/op_source.c:89
+ #, fuzzy
+ msgid "Get packages info from directory DIR by scanning it"
+ msgstr "Lese Paketinformationen von Paketdateien im Verzeichnis DIR"
+
+-#: cli/op_source.c:91
++#: cli/op_source.c:92
+ #, fuzzy
+ msgid "Get packages info from package header list file (aka hdlist)"
+ msgstr "Lese Paketinformationen von Paketverzeichnisdatei FILE"
+
+-#: cli/op_source.c:95
++#: cli/op_source.c:96
+ msgid "Set the source type (use --stl to list available values)"
+ msgstr ""
+
+-#: cli/op_source.c:99
++#: cli/op_source.c:100
+ msgid "Get packages from PREFIX instead of SOURCE"
+ msgstr "Lese Pakete von PREFIX anstelle von SOURCE"
+
+-#: cli/op_source.c:101
++#: cli/op_source.c:102
+ #, fuzzy
+ msgid "Repository related actions:"
+ msgstr "Optionen f�r Quellen:"
+
+-#: cli/op_source.c:102
++#: cli/op_source.c:103
+ #, fuzzy
+ msgid "List available source types"
+ msgstr "Zeige konfigurierte Quellen"
+
+-#: cli/op_source.c:105
++#: cli/op_source.c:106
+ msgid "List configured sources"
+ msgstr "Zeige konfigurierte Quellen"
+
+-#: cli/op_source.c:108
++#: cli/op_source.c:109
+ #, fuzzy
+ msgid "Update the source and verify it"
+ msgstr "Aktualisiere und pr�fe Index der Quelle"
+
+-#: cli/op_source.c:113
++#: cli/op_source.c:114
+ msgid "Update whole index of source"
+ msgstr "Aktualisiere den gesamten Index der Quelle"
+
+-#: cli/op_source.c:118
++#: cli/op_source.c:119
+ msgid "Remove source index files from cache directory"
+ msgstr "L�sche Indexdateien der Quelle aus dem Pufferverzeichnis"
+
+-#: cli/op_source.c:121
++#: cli/op_source.c:122
+ #, fuzzy
+ msgid "Remove cached packages of the source"
+ msgstr "Es sind %d Pakete zu installieren"
+
+-#: cli/op_source.c:124
++#: cli/op_source.c:125
+ #, fuzzy
+ msgid "Remove all files belongs to source from cache directory"
+ msgstr "L�sche alle Quelldateien aus dem Pufferverzeichnis"
+
+-#: cli/op_source.c:264
++#: cli/op_source.c:265
+ msgid "--dt: destination is already set, use me before --destination"
+ msgstr ""
+
+-#: cli/op_source.c:273
++#: cli/op_source.c:274
+ msgid "--destination: destination is already set"
+ msgstr ""
+
+-#: cli/op_source.c:284
++#: cli/op_source.c:285
+ #, fuzzy
+ msgid "prefix option should be preceded by source one"
+ msgstr "auf die Option �prefix' muss Option 'source' folgen"
+
+-#: cli/op_source.c:288
++#: cli/op_source.c:289
+ msgid "prefix for directory source makes no sense"
+ msgstr "Option 'prefix' ist f�r Quelltyp 'Verzeichnis' nicht sinnvoll"
+
+-#: cli/op_source.c:293
++#: cli/op_source.c:294
+ msgid "poldek's panic"
+ msgstr ""
+
+-#: cli/op_split.c:41
++#: cli/op_split.c:42
+ #, fuzzy
+ msgid "Splitting:"
+ msgstr "Aufteilen:"
+
+-#: cli/op_split.c:43
++#: cli/op_split.c:44
+ #, fuzzy
+ msgid ""
+ "Split package set to SIZE MB size chunks, the first chunk will be "
+@@ -913,123 +990,123 @@ msgstr ""
+ "Teile Pakete in SIZE MB grosse St�cke auf. Das erste St�ck ist "
+ "FIRST_FREE_SPACE MB kleiner."
+
+-#: cli/op_split.c:47 cli/op_split.c:50
++#: cli/op_split.c:48 cli/op_split.c:51
+ msgid "Take package priorities from FILE"
+ msgstr "Lese Paketpriorit�ten aus Datei FILE"
+
+-#: cli/op_split.c:53
++#: cli/op_split.c:54
+ #, fuzzy
+ msgid "Write chunks to PREFIX.XX, default PREFIX is 'packages.chunk'"
+ msgstr ""
+ "Speichere die einzelnen St�cke unter PREFIX.XX. Der Standard f�r PREFIX ist "
+ "packages.chunk."
+
+-#: cli/op_split.c:136
++#: cli/op_split.c:137
+ msgid "split: bad option argument"
+ msgstr "split: falsches Argument f�r die Option"
+
+-#: cli/op_split.c:162
++#: cli/op_split.c:163
+ msgid "split size too small"
+ msgstr "Teilungsgr��e ist zu klein"
+
+-#: cli/op_split.c:167
++#: cli/op_split.c:168
+ msgid "first free space bigger than chunk size"
+ msgstr ""
+
+-#: cli/op_verify.c:49
++#: cli/op_verify.c:50
+ #, fuzzy
+ msgid "Package set verification:"
+ msgstr "Installation:"
+
+-#: cli/op_verify.c:51
++#: cli/op_verify.c:52
+ msgid ""
+ "Verify package set, available reports are: 'deps', 'order', 'conflicts', "
+ "'file-conflicts', 'file-orphans' and 'file-missing-deps'. Default is 'deps'."
+ msgstr ""
+
+-#: cli/op_verify.c:54
++#: cli/op_verify.c:55
+ #, fuzzy
+ msgid "Verify conflicts"
+ msgstr "�berpr�fe Paketkonflikte"
+
+-#: cli/op_verify.c:56
++#: cli/op_verify.c:57
+ #, fuzzy
+ msgid "Verify file conflicts"
+ msgstr ""
+ "\n"
+ "�berpr�fe Dateikonflikte..."
+
+-#: cli/op_verify.c:59
++#: cli/op_verify.c:60
+ msgid "Find orphaned directories"
+ msgstr ""
+
+-#: cli/op_verify.c:62
++#: cli/op_verify.c:63
+ #, fuzzy
+ msgid "Verify dependencies, conflicts, file conflicts and orphaned directories"
+ msgstr "�berpr�fe Paketabh�ngigkeiten und -konflikte sowie Dateikonflikte"
+
+-#: cli/op_verify.c:65
++#: cli/op_verify.c:66
+ msgid "Generate dependency graph, types are dot,lanvi"
+ msgstr ""
+
+-#: cli/reload.c:33
++#: cli/reload.c:34
+ msgid "Reload installed packages"
+ msgstr "Lade Liste mit installierten Paketen neu"
+
+-#: cli/search.c:98
++#: cli/search.c:100
+ msgid "Search capabilities"
+ msgstr "Suche nach F�higkeiten"
+
+-#: cli/search.c:99
++#: cli/search.c:101
+ msgid "Search requirements"
+ msgstr "Suche nach Vorraussetzungen"
+
+-#: cli/search.c:100
++#: cli/search.c:102
+ msgid "Search conflicts"
+ msgstr "Suche nach Konflikten"
+
+-#: cli/search.c:101
++#: cli/search.c:103
+ msgid "Search obsolences"
+ msgstr "Suche nach Veraltetem"
+
+-#: cli/search.c:102
++#: cli/search.c:104
+ msgid "Search summaries, urls and license"
+ msgstr "Suche nach Zusammenfassungen, URLs und Lizensen"
+
+-#: cli/search.c:103
++#: cli/search.c:105
+ msgid "Search descriptions"
+ msgstr "Suche nach Beschreibungen"
+
+-#: cli/search.c:104
++#: cli/search.c:106
+ msgid "Search groups"
+ msgstr "Suche nach Gruppen"
+
+-#: cli/search.c:105
++#: cli/search.c:107
+ msgid "Search file list"
+ msgstr "Suche in Dateilisten"
+
+-#: cli/search.c:107
++#: cli/search.c:109
+ #, fuzzy
+ msgid "Search changelogs"
+ msgstr "Suche Pakete"
+
+-#: cli/search.c:109
++#: cli/search.c:111
+ msgid "Search all described fields, the defaults are: -sd"
+ msgstr "Suche in allen angegebenen Feldern, Standard ist '-sd'"
+
+-#: cli/search.c:111
++#: cli/search.c:113
+ msgid "Threat PATTERN as Perl regular expression"
+ msgstr ""
+
+-#: cli/search.c:119
++#: cli/search.c:121
+ msgid "PATTERN [PACKAGE...]"
+ msgstr "MUSTER [PAKET...]"
+
+-#: cli/search.c:119
++#: cli/search.c:121
+ msgid "Search packages"
+ msgstr "Suche Pakete"
+
+-#: cli/search.c:123
++#: cli/search.c:125
+ msgid ""
+ "With --perlre pattern must be supplied as:\n"
+ " <delimiter>perl-regexp<delimiter>[imsx]\n"
+@@ -1038,52 +1115,52 @@ msgid ""
+ " See perlre(1) for more details.\n"
+ msgstr ""
+
+-#: cli/search.c:184
++#: cli/search.c:186
+ #, c-format
+ msgid "search: unknown regexp option -- %c"
+ msgstr "search: unbekannte Option f�r regul�ren Ausdruck -- '%c'"
+
+-#: cli/search.c:326
++#: cli/search.c:328
+ #, c-format
+ msgid "search: pattern: %s:%d: %s"
+ msgstr "search: Muster: %s:%d: %s"
+
+-#: cli/search.c:335
++#: cli/search.c:337
+ #, fuzzy, c-format
+ msgid "search: pattern study: %s: %s"
+ msgstr "search: Muster: %s: %s"
+
+-#: cli/search.c:522
++#: cli/search.c:524
+ #, c-format
+ msgid "%s: load package info failed"
+ msgstr "%s: Lesen der Paketinformation fehlgeschlagen"
+
+-#: cli/search.c:570
++#: cli/search.c:572
+ msgid "search: no pattern given"
+ msgstr "search: kein Muster angegeben"
+
+-#: cli/search.c:604
++#: cli/search.c:606
+ msgid "Searching packages..."
+ msgstr "Suche Pakete..."
+
+-#: cli/search.c:624
++#: cli/search.c:636
+ msgid "_interrupted."
+ msgstr ""
+
+-#: cli/search.c:630
++#: cli/search.c:641
+ msgid "_done."
+ msgstr "fertig."
+
+-#: cli/shell.c:53
++#: cli/shell.c:54
+ #, fuzzy
+ msgid "Exit poldek"
+ msgstr "Beende Poldek"
+
+-#: cli/shell.c:434
++#: cli/shell.c:503
+ msgid "not a tty"
+ msgstr "kein Terminalger�t"
+
+-#: cli/shell.c:456
++#: cli/shell.c:525
+ #, c-format
+ msgid ""
+ "\n"
+@@ -1095,254 +1172,254 @@ msgstr ""
+ "Befehle ein.\n"
+ "\n"
+
+-#: cli/su.c:91
++#: cli/su.c:92
+ #, fuzzy, c-format
+ msgid "%s: could not retrieve account (%m)"
+ msgstr "%s: dieser Quelltyp ist nicht aktualsierbar"
+
+-#: cli/su.c:104
++#: cli/su.c:105
+ #, fuzzy, c-format
+ msgid "setgid %s: %m"
+ msgstr "%s %m"
+
+-#: cli/su.c:109
++#: cli/su.c:110
+ #, fuzzy, c-format
+ msgid "setuid %s: %m"
+ msgstr "%s %m"
+
+-#: cli/su.c:114
++#: cli/su.c:115
+ #, fuzzy, c-format
+ msgid "chdir %s: %m"
+ msgstr "%s %m"
+
+-#: cli/su.c:118
++#: cli/su.c:119
+ #, fuzzy, c-format
+ msgid "Running as user '%s'\n"
+ msgstr "F�hre '%s' aus\n"
+
+-#: cli/uninstall.c:43
++#: cli/uninstall.c:44
+ #, fuzzy
+ msgid "Do not remove, but tell if it would work or not"
+ msgstr "Simuliere die Installation"
+
+-#: cli/uninstall.c:45
++#: cli/uninstall.c:46
+ #, fuzzy
+ msgid "Remove only selected packages"
+ msgstr "%d doppelte Pakete entfernt"
+
+-#: cli/uninstall.c:47
++#: cli/uninstall.c:48
+ msgid "Ignore broken dependencies"
+ msgstr "Ignoriere nicht erf�llte Abh�ngigkeiten"
+
+-#: cli/uninstall.c:50
++#: cli/uninstall.c:51
+ #, fuzzy
+ msgid "Remove packages required by selected ones if possible."
+ msgstr ""
+ "Pakete, die von den ausgew�hlten Paketen ben�tigt werden, werden nicht "
+ "automatisch installiert"
+
+-#: cli/uninstall.c:53
++#: cli/uninstall.c:54
+ msgid "pass option OPTION to PM binary (ex. --pmop noscripts)"
+ msgstr ""
+
+-#: cli/uninstall.c:61
++#: cli/uninstall.c:62
+ #, fuzzy
+ msgid "Package deinstallation:"
+ msgstr "Installation:"
+
+-#: cli/uninstall.c:62
++#: cli/uninstall.c:63
+ #, fuzzy
+ msgid "Uninstall given packages"
+ msgstr "Installiere die angegebenen Pakete"
+
+-#: cli/uninstall.c:71
++#: cli/uninstall.c:72
+ msgid "Uninstall packages"
+ msgstr "Entferne Pakete"
+
+-#: cli/uninstall.c:239
++#: cli/uninstall.c:240
+ #, fuzzy, c-format
+ msgid "%s: installed packages are not loaded, type \"reload\" to load them"
+ msgstr ""
+ "ls: Liste mit installierten Paketen nicht gelesen, gib 'reload' ein, um sie "
+ "zu lesen\n"
+
+-#: cli/uninstall.c:242
++#: cli/uninstall.c:243
+ #, fuzzy, c-format
+ msgid "%s: installed packages are not loaded"
+ msgstr "%s: Quelltextpakete werden nicht unterst�tzt"
+
+-#: conf.c:194
++#: conf.c:195
+ #, c-format
+ msgid "%s:%d: missing '\"'"
+ msgstr "%s:%d: fehlender '\"'"
+
+-#: conf.c:481
++#: conf.c:482
+ #, fuzzy, c-format
+ msgid "%s %s::%s redefined"
+ msgstr "%s:%ld:%s ':' erwartet"
+
+-#: conf.c:485
++#: conf.c:486
+ #, fuzzy, c-format
+ msgid "%s: multiple '%s' not allowed"
+ msgstr "%s:%d mehrere '%s' sind nicht erlaubt"
+
+-#: conf.c:530
++#: conf.c:531
+ #, fuzzy, c-format
+ msgid "%s unknown option '%s::%s'"
+ msgstr "%s:%d unbekannte Option '%s'"
+
+-#: conf.c:574
++#: conf.c:575
+ #, fuzzy, c-format
+ msgid "%s invalid value of '%s::%s'"
+ msgstr "%s:%d ung�ltiger Wert '%s' f�r Option '%s'"
+
+-#: conf.c:588
++#: conf.c:589
+ #, fuzzy, c-format
+ msgid "%s invalid value '%s' of '%s::%s'"
+ msgstr "%s:%d ung�ltiger Wert '%s' f�r Option '%s'"
+
+-#: conf.c:816
++#: conf.c:817
+ #, fuzzy, c-format
+ msgid "'%s': invalid section name"
+ msgstr "%s:%d %s: ung�ltiger Paketname"
+
+-#: conf.c:883
++#: conf.c:884
+ #, c-format
+ msgid "%s:%d: missing '='"
+ msgstr "%s:%d: fehlendes '='"
+
+-#: conf.c:885
++#: conf.c:886
+ #, fuzzy, c-format
+ msgid "%s: missing '='"
+ msgstr "%s:%d: fehlendes '='"
+
+-#: conf.c:1052
++#: conf.c:1056
+ #, fuzzy, c-format
+ msgid "%s:%d: wrong %%includedir"
+ msgstr "%s:%d: '%s': ung�ltiger Parameter"
+
+-#: conf.c:1085
++#: conf.c:1089
+ #, fuzzy, c-format
+ msgid "%s:%d: wrong %%include"
+ msgstr "%s:%d: '%s': ung�ltiger Parameter"
+
+-#: conf.c:1114
++#: conf.c:1117
+ #, fuzzy, c-format
+ msgid "%s:%d: '%s': invalid section name"
+ msgstr "%s:%d %s: ung�ltiger Paketname"
+
+-#: conf.c:1136
++#: conf.c:1139
+ #, fuzzy, c-format
+ msgid "%s: skipped %s::%s"
+ msgstr "%s: Dateiliste �bersprungen"
+
+-#: conf.c:1140
++#: conf.c:1143
+ #, c-format
+ msgid "-- %s EOF --"
+ msgstr ""
+
+-#: conf.c:1157
++#: conf.c:1160
+ #, fuzzy, c-format
+ msgid "%s: load configuration failed"
+ msgstr "%s: Lesen der Paketinformation fehlgeschlagen"
+
+-#: conf.c:1256
++#: conf.c:1259
+ #, fuzzy, c-format
+ msgid "%s: legacy configuration detected but ignored"
+ msgstr "%s: Lesen der Paketinformation fehlgeschlagen"
+
+-#: conf.c:1411
++#: conf.c:1414
+ #, fuzzy, c-format
+ msgid "invalid value ('%s') of integer option '%s'"
+ msgstr "ung�ltiger Wert ('%s') f�r Option '%s'"
+
+-#: conf.c:1428
++#: conf.c:1431
+ #, fuzzy, c-format
+ msgid "invalid value ('%s') of boolean option '%s'"
+ msgstr "ung�ltiger Wert ('%s') f�r Option '%s'"
+
+-#: conf.c:1444
++#: conf.c:1447
+ #, fuzzy, c-format
+ msgid "invalid value ('%s') of option '%s'"
+ msgstr "ung�ltiger Wert ('%s') f�r Option '%s'"
+
+-#: fileindex.c:338
++#: fileindex.c:339
+ #, c-format
+ msgid "add cnfl: %s %c-%c %s"
+ msgstr ""
+
+-#: fileindex.c:530
++#: fileindex.c:531
+ #, c-format
+ msgid ""
+ "\n"
+ "Path: %s%s"
+ msgstr ""
+
+-#: fileindex.c:540
++#: fileindex.c:541
+ #, fuzzy, c-format
+ msgid "%d file conflicts found"
+ msgstr "'%s' kollidiert mit '%s'"
+
+-#: fileindex.c:646
++#: fileindex.c:647
+ #, fuzzy, c-format
+ msgid "[%d packages left]"
+ msgstr "%d Pakete gelesen"
+
+-#: fileindex.c:647
++#: fileindex.c:648
+ #, fuzzy, c-format
+ msgid "%s: orphaned directory from %s"
+ msgstr "%s: besch�digte �bersichtsdatei (%d)"
+
+-#: fileindex.c:650
++#: fileindex.c:651
+ #, fuzzy, c-format
+ msgid "%d orphaned directories found"
+ msgstr "'%s' kollidiert mit '%s'"
+
+-#: fileindex.c:724
++#: fileindex.c:725
+ #, c-format
+ msgid "Looking for path %s -> %s (%s)"
+ msgstr ""
+
+-#: fileindex.c:846
++#: fileindex.c:847
+ #, c-format
+ msgid "%s: %s: directory not in required packages (missing Requires: %s?)"
+ msgstr ""
+
+-#: fileindex.c:851
++#: fileindex.c:852
+ #, fuzzy, c-format
+ msgid "%d semi-orphaned directories found"
+ msgstr "Zeige ben�tigte Pakete"
+
+-#: install-dist.c:101
++#: install-dist.c:102
+ #, c-format
+ msgid "Need to get about %s of archives."
+ msgstr ""
+
+-#: install-dist.c:105
++#: install-dist.c:106
+ #, c-format
+ msgid " After unpacking about %s will be used."
+ msgstr ""
+
+-#: install-dist.c:119
++#: install-dist.c:120
+ #, c-format
+ msgid "Installing #%d package of total %d (%s left to get)\n"
+ msgstr ""
+
+-#: install-dist.c:172
++#: install-dist.c:173
+ msgid "Interrupted"
+ msgstr ""
+
+-#: install-dist.c:197
++#: install-dist.c:198
+ #, fuzzy, c-format
+ msgid "Done, %d packages were installed.\n"
+ msgstr "keine Pakete zum Installieren vorhanden"
+
+-#: install-dist.c:200
++#: install-dist.c:201
+ #, fuzzy
+ msgid "There were errors during install"
+ msgstr "bei der Installation sind Fehler aufgetreten"
+
+-#: install-dist.c:252
++#: install-dist.c:253
+ #, fuzzy
+ msgid "Buggy package set"
+ msgstr "fehlerhafte Paketzusammenstellung"
+@@ -1377,43 +1454,43 @@ msgstr "%s: Paket ist f
+ msgid "%s: package is for a different operating system (%s)"
+ msgstr "%s: Paket ist f�r ein anderes Betriebssystem (%s)"
+
+-#: install3/install.c:162 uninstall.c:667
++#: install3/install.c:162 uninstall.c:668
+ #, fuzzy, c-format
+ msgid "%d unresolved dependency"
+ msgid_plural "%d unresolved dependencies"
+ msgstr[0] "%s: nicht erf�llte Abh�ngigkeiten"
+
+-#: install3/install.c:185 poldek_ts.c:649 uninstall.c:407
++#: install3/install.c:185 poldek_ts.c:651 uninstall.c:408
+ msgid "Processing dependencies..."
+ msgstr "Verarbeite Abh�ngigkeiten..."
+
+-#: install3/misc.c:79
++#: install3/misc.c:92
+ #, c-format
+ msgid "%s: multiple instances installed, give up"
+ msgstr "%s: mehrfach installiert, Abbruch"
+
+-#: install3/misc.c:110
++#: install3/misc.c:123
+ #, c-format
+ msgid "%s: refusing to upgrade held package"
+ msgstr "%s: gesperrte (hold) Pakete werden nicht aktualisiert"
+
+-#: install3/obsoletes.c:244
++#: install3/obsoletes.c:245
+ #, c-format
+ msgid "%s obsoleted by %s"
+ msgstr "'%s' ist abgel�st durch '%s'"
+
+-#: install3/preinstall.c:132
++#: install3/preinstall.c:134
+ #, c-format
+ msgid "%s: marked as %s's provider"
+ msgstr ""
+
+-#: install3/preinstall.c:140
++#: install3/preinstall.c:142
+ #, fuzzy, c-format
+ msgid "%s: %s version of %s is installed (%s), skipped"
+ msgstr "%s: mehrfach installiert, �bersprungen"
+
+-#: install3/preinstall.c:193 install3/preinstall.c:221 poldek_ts.c:624
+-#: upgrade-dist.c:167
++#: install3/preinstall.c:195 install3/preinstall.c:223 poldek_ts.c:626
++#: upgrade-dist.c:178
+ msgid "Nothing to do"
+ msgstr "nichts zu tun"
+
+@@ -1444,74 +1521,74 @@ msgstr "verwaist"
+ msgid "%s%s marks %s (%s %s)"
+ msgstr "%s%s markiert '%s' (%s %s)"
+
+-#: install3/requirements.c:433
++#: install3/requirements.c:441
+ #, fuzzy, c-format
+ msgid "%s is required by installed %s, give up"
+ msgstr "'%s' wird von '%s' ben�tgt"
+
+-#: install3/requirements.c:435
++#: install3/requirements.c:443
+ #, fuzzy, c-format
+ msgid "%s is required by installed %s"
+ msgstr "'%s' wird von '%s' ben�tgt"
+
+-#: install3/requirements.c:581
++#: install3/requirements.c:589
+ #, fuzzy, c-format
+ msgid "%s: req %s not found, upgrade rpm"
+ msgstr "%s: Standardpaket %s nicht gefunden, verwende '%s'"
+
+-#: install3/requirements.c:583
++#: install3/requirements.c:591
+ #, c-format
+ msgid "%s: req %s not found"
+ msgstr "%s: Vorraussetzung '%s' nicht gefunden"
+
+-#: install3/requirements.c:638
++#: install3/requirements.c:658
+ #, fuzzy, c-format
+ msgid "%s: suggested %s not found, skipped"
+ msgstr "%s: Vorraussetzung '%s' nicht gefunden"
+
+-#: lib_init.c:195 lib_init.c:449
++#: lib_init.c:196 lib_init.c:450
+ #, c-format
+ msgid "%s: no such source"
+ msgstr "%s: Quelle existiert nicht"
+
+-#: lib_init.c:1069
++#: lib_init.c:1070
+ msgid "I'm set*id'ed, give up"
+ msgstr "Das SUID/SGID-Bit ist gesetzt, Abbruch."
+
+-#: lib_init.c:1074
++#: lib_init.c:1075
+ msgid "Running me as root is not a good habit"
+ msgstr "Mich als Superuser zu starten ist kein guter Gedanke."
+
+-#: lib_init.c:1539
++#: lib_init.c:1540
+ msgid "RPM works in multilib mode, while poldek not"
+ msgstr ""
+
+-#: lib_init.c:1543
++#: lib_init.c:1544
+ msgid "poldek works in multilib mode, while rpm not"
+ msgstr ""
+
+-#: lib_pkgset.c:76 pm/pset/pset.c:200
++#: lib_pkgset.c:79 pm/pset/pset.c:200
+ msgid "no packages loaded"
+ msgstr "Paketliste nicht gelesen"
+
+-#: log.c:249 log.c:283
++#: log.c:251 log.c:285
+ msgid "error: "
+ msgstr "Fehler: "
+
+-#: log.c:253 log.c:286
++#: log.c:255 log.c:288
+ msgid "warn: "
+ msgstr "Warnung: "
+
+-#: log.c:257
++#: log.c:259
+ msgid "notice: "
+ msgstr ""
+
+-#: misc.c:301
++#: misc.c:302
+ #, c-format
+ msgid "%s: mkdir: permission denied"
+ msgstr "%s: mkdir: keine Berechtigung"
+
+-#: misc.c:348
++#: misc.c:349
+ #, c-format
+ msgid "%d package"
+ msgid_plural "%d packages"
+@@ -1519,32 +1596,32 @@ msgstr[0] "%d Pakete"
+ msgstr[1] "%d Paket"
+ msgstr[2] "%d Pakete"
+
+-#: pkgcmp.c:345
++#: pkgcmp.c:355
+ #, fuzzy, c-format
+ msgid "duplicated name %s"
+ msgstr "%s ist doppelt"
+
+-#: pkgcmp.c:372 pkgcmp.c:392
++#: pkgcmp.c:382 pkgcmp.c:402
+ #, fuzzy, c-format
+ msgid "%s%s%s: removed duplicate package"
+ msgstr "%d doppelte Pakete entfernt"
+
+-#: pkgdir/dir/dir.c:225
++#: pkgdir/dir/dir.c:224
+ #, c-format
+ msgid "%s: file seems untouched, loaded from previous index"
+ msgstr ""
+
+-#: pkgdir/dir/dir.c:234
++#: pkgdir/dir/dir.c:233
+ #, fuzzy, c-format
+ msgid "%s: read header failed, skipped"
+ msgstr "%s: Lesen des Kennsatzes fehlgeschlagen"
+
+-#: pkgdir/dir/dir.c:244
++#: pkgdir/dir/dir.c:243
+ #, c-format
+ msgid "%s: seems untouched, loaded from previous index"
+ msgstr ""
+
+-#: pkgdir/dir/dir.c:257
++#: pkgdir/dir/dir.c:256
+ #, fuzzy, c-format
+ msgid "%s: loading header..."
+ msgstr "%s: Lesen fehlgeschlagen"
+@@ -1572,7 +1649,7 @@ msgstr "BESCH
+ msgid "Writing digest %s..."
+ msgstr "Speichere �bersicht '%s'..."
+
+-#: pkgdir/pdir/digest.c:501 pkgdir/pkgdir.c:349 pkgdir/pndir/update.c:366
++#: pkgdir/pdir/digest.c:501 pkgdir/pkgdir.c:350 pkgdir/pndir/update.c:460
+ #, fuzzy, c-format
+ msgid "%s: desynchronized index, try --upa"
+ msgstr "%s: Index nicht synchron, versuche --update-whole"
+@@ -1600,12 +1677,12 @@ msgstr "%s: besch
+ msgid "%s: no patches available"
+ msgstr "%s: keine Patches verf�gbar"
+
+-#: pkgdir/pdir/pdir.c:456 pkgdir/pndir/update.c:333 pkgset-load.c:95
++#: pkgdir/pdir/pdir.c:456 pkgdir/pndir/update.c:427 pkgset-load.c:101
+ #, c-format
+ msgid "%s: load failed"
+ msgstr "%s: Lesen fehlgeschlagen"
+
+-#: pkgdir/pdir/pdir.c:461 pkgdir/pndir/update.c:338
++#: pkgdir/pdir/pdir.c:461 pkgdir/pndir/update.c:432
+ #, fuzzy, c-format
+ msgid "Applying %s..."
+ msgstr "Anwenden des Patches '%s'..."
+@@ -1650,12 +1727,12 @@ msgstr "%s:%ld: Syntaxfehler"
+ msgid "%s:%ld:%s ':' expected"
+ msgstr "%s:%ld:%s ':' erwartet"
+
+-#: pkgdir/pdir/pdir_pkg_restore.c:529 pkgdir/pkg_restore.c:499
++#: pkgdir/pdir/pdir_pkg_restore.c:529 pkgdir/pkg_restore.c:500
+ #, c-format
+ msgid "%s: failed to parse evr string"
+ msgstr "%s: fehlerhafte Interpretation der EVR-Zeichenkette"
+
+-#: pkgdir/pdir/pdir_pkg_restore.c:547 pkgdir/pkg_restore.c:529
++#: pkgdir/pdir/pdir_pkg_restore.c:547 pkgdir/pkg_restore.c:530
+ #, c-format
+ msgid "error reading %s's data"
+ msgstr "Fehler beim Lesen der Daten von '%s'"
+@@ -1689,27 +1766,27 @@ msgstr "%s: Formatfehler"
+ msgid "Removing outdated diff %s"
+ msgstr "L�sche veraltete '%s'"
+
+-#: pkgdir/pkg_restore.c:198 pkgdir/pkg_restore.c:246
++#: pkgdir/pkg_restore.c:199 pkgdir/pkg_restore.c:247
+ #, fuzzy, c-format
+ msgid "%s:%lu: syntax error"
+ msgstr "%s:%ld: Syntaxfehler"
+
+-#: pkgdir/pkgdir.c:269
++#: pkgdir/pkgdir.c:270
+ #, fuzzy, c-format
+ msgid "%s: unknown index type"
+ msgstr "%s: unbekannte Option"
+
+-#: pkgdir/pkgdir.c:298
++#: pkgdir/pkgdir.c:299
+ #, c-format
+ msgid "%s: this type of source is not updateable"
+ msgstr "%s: dieser Quelltyp ist nicht aktualsierbar"
+
+-#: pkgdir/pkgdir.c:308 pkgdir/pkgdir.c:334
++#: pkgdir/pkgdir.c:309 pkgdir/pkgdir.c:335
+ #, fuzzy, c-format
+ msgid "%s is up to date"
+ msgstr "%s: gebe auf bei %d"
+
+-#: pkgdir/pkgdir.c:345
++#: pkgdir/pkgdir.c:346
+ #, fuzzy, c-format
+ msgid "%s: desynchronized index, trying to update whole index..."
+ msgstr "%s: Index nicht synchron, versuche --update-whole"
+@@ -1719,7 +1796,7 @@ msgstr "%s: Index nicht synchron, versuche --update-whole"
+ msgid "Loading [%s]%s..."
+ msgstr "Lese '%s'..."
+
+-#: pkgdir/pkgdir.c:853 pkgdir/source_mkidx.c:240 pkgdir/source_mkidx.c:391
++#: pkgdir/pkgdir.c:853 pkgdir/source_mkidx.c:241 pkgdir/source_mkidx.c:390
+ #, fuzzy, c-format
+ msgid "%s: repository could not be created (missing feature)"
+ msgstr "%s: dieser Quelltyp ist nicht aktualsierbar"
+@@ -1735,27 +1812,27 @@ msgstr ""
+ msgid "%s: index not changed, not saved"
+ msgstr ""
+
+-#: pkgdir/pkgdir_clean.c:49
++#: pkgdir/pkgdir_clean.c:50
+ #, fuzzy, c-format
+ msgid " Removing %s"
+ msgstr "L�sche '%s'"
+
+-#: pkgdir/pkgdir_clean.c:85 pkgdir/pkgdir_clean.c:123
++#: pkgdir/pkgdir_clean.c:86 pkgdir/pkgdir_clean.c:124
+ #, fuzzy, c-format
+ msgid "Cleaning up %s..."
+ msgstr "Bereinige '%s'..."
+
+-#: pkgdir/pkgdir_dirindex.c:390
++#: pkgdir/pkgdir_dirindex.c:402
+ #, fuzzy, c-format
+ msgid "%s: invalid directory index"
+ msgstr "%s:%d %s: ung�ltiger Paketname"
+
+-#: pkgdir/pkgdir_dirindex.c:512
++#: pkgdir/pkgdir_dirindex.c:530
+ #, fuzzy, c-format
+ msgid "%s: broken directory index"
+ msgstr "%s: besch�digte �bersichtsdatei (%d)"
+
+-#: pkgdir/pkgdir_dirindex.c:621
++#: pkgdir/pkgdir_dirindex.c:641
+ #, fuzzy, c-format
+ msgid "%s: outdated directory index"
+ msgstr "%s: besch�digte �bersichtsdatei (%d)"
+@@ -1800,52 +1877,61 @@ msgstr "L
+ msgid " Writing '%s' descriptions %s..."
+ msgstr "Speichere �bersicht '%s'..."
+
+-#: pkgdir/pndir/update.c:307
++#: pkgdir/pndir/update.c:366
++msgid "Index patches size too big\n"
++msgstr ""
++
++#: pkgdir/pndir/update.c:367
++#, fuzzy
++msgid "Retrieving whole index ...\n"
++msgstr "Frage '%s' ab...\n"
++
++#: pkgdir/pndir/update.c:401
+ #, c-format
+ msgid "Check diff (ts = %ld, %ld) %s (searching %s)\n"
+ msgstr ""
+
+-#: pkgdir/pndir/update.c:315
++#: pkgdir/pndir/update.c:409
+ #, fuzzy, c-format
+ msgid "%s: no patches available(fake)"
+ msgstr "%s: keine Patches verf�gbar"
+
+-#: pkgdir/rpmdb/rpmdb.c:192
++#: pkgdir/rpmdb/rpmdb.c:191
+ #, fuzzy, c-format
+ msgid "Loading db packages%s%s%s..."
+ msgstr "Lese Datenbank Pakete%s%s%s"
+
+-#: pkgdir/source.c:113 pkgdir/source.c:507
++#: pkgdir/source.c:116 pkgdir/source.c:516
+ #, c-format
+ msgid "%s: %s unknown option"
+ msgstr "%s: unbekannte Option '%s'"
+
+-#: pkgdir/source.c:140
++#: pkgdir/source.c:147
+ #, fuzzy, c-format
+ msgid "%s%sinvalid value ('%s') for option '%s'"
+ msgstr "ung�ltiger Wert '%s' f�r Option '%s'"
+
+-#: pkgdir/source.c:660
++#: pkgdir/source.c:672
+ #, fuzzy, c-format
+ msgid "removed duplicated source %s%s%s"
+ msgstr "%d doppelte Pakete entfernt"
+
+-#: pkgdir/source.c:720
++#: pkgdir/source.c:732
+ #, fuzzy, c-format
+ msgid "%s: this type (%s) of source is not updateable"
+ msgstr "%s: dieser Quelltyp ist nicht aktualsierbar"
+
+-#: pkgdir/source.c:727
++#: pkgdir/source.c:739
+ #, fuzzy, c-format
+ msgid "%s: this type (%s) of source is not updateable; use --upa to refresh it"
+ msgstr "%s: dieser Quelltyp ist nicht aktualsierbar"
+
+-#: pkgdir/source_mkidx.c:246
++#: pkgdir/source_mkidx.c:247
+ #, fuzzy, c-format
+ msgid "%s: unable to write remote index"
+ msgstr "%s: dieser Quelltyp ist nicht aktualsierbar"
+
+-#: pkgdir/source_mkidx.c:254
++#: pkgdir/source_mkidx.c:255
+ #, fuzzy, c-format
+ msgid "%s: refusing to overwrite index"
+ msgstr "%s: gesperrte (hold) Pakete werden nicht aktualisiert"
+@@ -1855,52 +1941,47 @@ msgstr "%s: gesperrte (hold) Pakete werden nicht aktualisiert"
+ msgid "%s:%d syntax error"
+ msgstr "%s:%d: Syntaxfehler"
+
+-#: pkgfetch.c:98
++#: pkgfetch.c:99
+ #, c-format
+ msgid "Need to get %s of archives"
+ msgstr ""
+
+-#: pkgfetch.c:105
++#: pkgfetch.c:106
+ #, fuzzy, c-format
+ msgid "_ (%s to download)."
+ msgstr "; %.2f MB zu �bertragen"
+
+-#: pkgfetch.c:111
+-#, c-format
+-msgid "After unpacking %s will be used."
+-msgstr ""
+-
+-#: pkgfetch.c:163 pkgfetch.c:262
++#: pkgfetch.c:160 pkgfetch.c:263
+ #, fuzzy, c-format
+ msgid "%s: MD5 signature verification failed"
+ msgstr "%s: �berpr�fung der MD5-Signatur fehlgeschlagen"
+
+-#: pkgmark.c:212
++#: pkgmark.c:213
+ #, fuzzy, c-format
+ msgid "%s marks %s (cap %s)"
+ msgstr "%s%s markiert '%s' (%s %s)"
+
+-#: pkgmark.c:350
++#: pkgmark.c:351
+ #, fuzzy, c-format
+ msgid "%s: conflicts with %s"
+ msgstr "'%s' kollidiert mit '%s'"
+
+-#: pkgmark.c:358
++#: pkgmark.c:359
+ #, fuzzy, c-format
+ msgid "%d conflicts found"
+ msgstr "'%s' kollidiert mit '%s'"
+
+-#: pkgset-load.c:56 pm/pset/pset.c:142 pm/pset/pset.c:763
++#: pkgset-load.c:62 pm/pset/pset.c:142 pm/pset/pset.c:763
+ #, fuzzy, c-format
+ msgid "trying to scan directory %s..."
+ msgstr "Speichere �bersicht '%s'..."
+
+-#: pkgset-load.c:64
++#: pkgset-load.c:70
+ #, c-format
+ msgid "%s: load failed, skipped"
+ msgstr "%s: Lesen schlug fehl, �bersprungen"
+
+-#: pkgset-load.c:122
++#: pkgset-load.c:131
+ #, c-format
+ msgid "%d package read"
+ msgid_plural "%d packages read"
+@@ -1908,19 +1989,19 @@ msgstr[0] "%d Pakete gelesen"
+ msgstr[1] "%d Paket gelesen"
+ msgstr[2] "%d Pakete gelesen"
+
+-#: pkgset-order.c:142
++#: pkgset-order.c:143
+ #, fuzzy
+ msgid "Requires(pre) loop: "
+ msgstr "Schleife bei Kennzeichnung 'PreReq': "
+
+-#: pkgset-order.c:278
++#: pkgset-order.c:279
+ #, fuzzy
+ msgid "Verifying packages ordering..."
+ msgstr ""
+ "\n"
+ "�berpr�fe Paketkonflikte..."
+
+-#: pkgset-order.c:283 pkgset.c:382
++#: pkgset-order.c:284 pkgset.c:390
+ #, fuzzy, c-format
+ msgid "%d prerequirement loop detected"
+ msgid_plural "%d prerequirement loops detected"
+@@ -1928,16 +2009,16 @@ msgstr[0] "%d Schleife%s bei den Vorvorraussetzungen entdeckt"
+ msgstr[1] "%d Schleife%s bei den Vorvorraussetzungen entdeckt"
+ msgstr[2] "%d Schleife%s bei den Vorvorraussetzungen entdeckt"
+
+-#: pkgset-order.c:288 pkgset.c:387
++#: pkgset-order.c:289 pkgset.c:395
+ msgid "No loops -- OK"
+ msgstr "Keine Schleifen entdeckt -- in Ordnung"
+
+-#: pkgset-req.c:121
++#: pkgset-req.c:124
+ #, fuzzy
+ msgid "Packages with unsatisfied dependencies:"
+ msgstr "%s: nicht erf�llte Abh�ngigkeiten:"
+
+-#: pkgset-req.c:162
++#: pkgset-req.c:166
+ msgid ""
+ "\n"
+ "Verifying dependencies..."
+@@ -1945,37 +2026,37 @@ msgstr ""
+ "\n"
+ "�berpr�fe Abh�ngigkeiten..."
+
+-#: pkgset-req.c:187 pkgset-req.c:216
++#: pkgset-req.c:191 pkgset-req.c:221
+ #, c-format
+ msgid " req %-35s --> NOT FOUND"
+ msgstr ""
+
+-#: pkgset-req.c:232
++#: pkgset-req.c:237
+ msgid "No unsatisfied dependencies detected -- OK"
+ msgstr "Alle Abh�ngigkeiten erf�llt -- in Ordnung"
+
+-#: pkgset-req.c:235
++#: pkgset-req.c:240
+ #, c-format
+ msgid "%d unsatisfied dependencies, %d packages cannot be installed"
+ msgstr ""
+ "%d nicht erf�llte Abh�ngigkeiten, %d Pakete k�nnen nicht installiert werden"
+
+-#: pkgset-req.c:388
++#: pkgset-req.c:393
+ #, c-format
+ msgid "%s: provides rpmlib cap \"%s\""
+ msgstr "'%s' stellt RPMLIB F�higkeit '%s' zur Verf�gung"
+
+-#: pkgset-req.c:400
++#: pkgset-req.c:405
+ #, c-format
+ msgid " req %-35s --> PM_CAP"
+ msgstr ""
+
+-#: pkgset-req.c:594
++#: pkgset-req.c:599
+ #, c-format
+ msgid " cnfl %-35s --> NOT FOUND"
+ msgstr ""
+
+-#: pkgset.c:253
++#: pkgset.c:256
+ #, c-format
+ msgid "Removed %d duplicate package from available set"
+ msgid_plural "Removed %d duplicate packages from available set"
+@@ -1983,7 +2064,7 @@ msgstr[0] "%d doppelte Pakete in der Liste der verf
+ msgstr[1] "%d doppeltes Paket aus der Liste der verf�gbaren Pakete entfernt"
+ msgstr[2] "%d doppelte Pakete aus der Liste der verf�gbaren Pakete entfernt"
+
+-#: pkgset.c:372
++#: pkgset.c:380
+ msgid ""
+ "\n"
+ "Verifying (pre)requirements..."
+@@ -1991,46 +2072,46 @@ msgstr ""
+ "\n"
+ "�berpr�fe (Vor)Vorraussetzungen..."
+
+-#: pkgset.c:394
++#: pkgset.c:402
+ #, fuzzy
+ msgid "Installation order:\n"
+ msgstr "Installation:"
+
+-#: pkgset.c:609
++#: pkgset.c:617
+ #, fuzzy, c-format
+ msgid "%s: req %s %s"
+ msgstr "%s: %m (%s)"
+
+-#: pkgset.c:611
++#: pkgset.c:619
+ msgid "version mismatch"
+ msgstr ""
+
+-#: pkgset.c:611
++#: pkgset.c:619
+ #, fuzzy
+ msgid "not found"
+ msgstr "mark: '%s' nicht gefunden"
+
+-#: pkgset.c:618
++#: pkgset.c:626
+ #, fuzzy, c-format
+ msgid "%d unsatisfied dependencies found"
+ msgstr "%s: nicht erf�llte Abh�ngigkeiten:"
+
+-#: pkgset.c:620
++#: pkgset.c:628
+ #, fuzzy
+ msgid "No unsatisfied dependencies found"
+ msgstr "%s: nicht erf�llte Abh�ngigkeiten:"
+
+-#: pkgset.c:675 pkgset.c:745
++#: pkgset.c:683 pkgset.c:753
+ #, fuzzy, c-format
+ msgid "%s: open failed: %m"
+ msgstr "%s: Lesen fehlgeschlagen"
+
+-#: pkgset.c:700
++#: pkgset.c:708
+ #, c-format
+ msgid "Graph saved as %s"
+ msgstr ""
+
+-#: pkgset.c:757
++#: pkgset.c:765
+ #, c-format
+ msgid "LanVi graph saved as %s"
+ msgstr ""
+@@ -2108,7 +2189,7 @@ msgstr "%s: Installation fehlgeschlagen:"
+ msgid "%s: installation failed (retcode=%d)"
+ msgstr "%s: Installation fehlgeschlagen:"
+
+-#: pm/rpm/misc.c:124
++#: pm/rpm/misc.c:128
+ #, fuzzy
+ msgid "Loading internal capabilities"
+ msgstr "Suche nach F�higkeiten"
+@@ -2179,9 +2260,9 @@ msgstr "%s: Betriebssystemkennzeichnung fehlt"
+ msgid "Executing %s "
+ msgstr "F�hre '%s' aus "
+
+-#: pm/rpm/rpminstall.c:184 pm/rpm/rpminstall.c:195 vfile/p_open.c:135
+-#: vfile/p_open.c:292 vfile/vfff/http.c:678 vfile/vopen3.c:177
+-#: vfile/vopen3.c:587
++#: pm/rpm/rpminstall.c:184 pm/rpm/rpminstall.c:195 vfile/p_open.c:136
++#: vfile/p_open.c:293 vfile/vfff/http.c:680 vfile/vopen3.c:178
++#: vfile/vopen3.c:588
+ #, c-format
+ msgid "%s: no such file"
+ msgstr "%s: Datei nicht gefunden"
+@@ -2191,12 +2272,12 @@ msgstr "%s: Datei nicht gefunden"
+ msgid "%s exited with %d"
+ msgstr "'%s' wurde beendet mit %d"
+
+-#: pm/rpm/rpminstall.c:211 vfile/p_open.c:205
++#: pm/rpm/rpminstall.c:211 vfile/p_open.c:206
+ #, c-format
+ msgid "%s terminated by signal %s"
+ msgstr "'%s' beendet durch Signal '%s'"
+
+-#: pm/rpm/rpminstall.c:214 vfile/p_open.c:208 vfile/vopen3.c:352
++#: pm/rpm/rpminstall.c:214 vfile/p_open.c:209 vfile/vopen3.c:353
+ #, c-format
+ msgid "%s terminated by signal %d"
+ msgstr "'%s' beendet durch Signal %d"
+@@ -2242,30 +2323,30 @@ msgstr "Starte '%s'..."
+ msgid "%s: %s signature not found"
+ msgstr "%s: %s-Signatur nicht gefunden"
+
+-#: poldek_term.c:193
++#: poldek_term.c:195
+ msgid "$TERM undefined"
+ msgstr "$TERM nicht definiert"
+
+-#: poldek_term.c:198
++#: poldek_term.c:200
+ #, c-format
+ msgid "%s: unknown terminal"
+ msgstr "%s: unbekanntes Terminal"
+
+-#: poldek_ts.c:644 uninstall.c:398
++#: poldek_ts.c:646 uninstall.c:399
+ #, c-format
+ msgid "mark %s"
+ msgstr "markiert '%s'"
+
+-#: poldek_ts.c:849
++#: poldek_ts.c:869
+ #, fuzzy
+ msgid "to install"
+ msgstr "installiert"
+
+-#: poldek_ts.c:855
++#: poldek_ts.c:875
+ msgid "to remove"
+ msgstr ""
+
+-#: poldek_ts.c:873
++#: poldek_ts.c:894
+ #, fuzzy, c-format
+ msgid "There are %d package %s"
+ msgid_plural "There are %d packages %s"
+@@ -2273,7 +2354,7 @@ msgstr[0] "Es sind %d Pakete zu installieren"
+ msgstr[1] "Es ist %d Paket zu installieren"
+ msgstr[2] "Es sind %d Pakete zu installieren"
+
+-#: poldek_ts.c:878
++#: poldek_ts.c:899
+ #, fuzzy, c-format
+ msgid " (%d marked by dependencies)"
+ msgid_plural " (%d marked by dependencies)"
+@@ -2281,154 +2362,164 @@ msgstr[0] "_ (%d markiert durch Abh
+ msgstr[1] "_ (%d markiert durch Abh�ngigkeiten)"
+ msgstr[2] "_ (%d markiert durch Abh�ngigkeiten)"
+
+-#: poldek_ts.c:882
++#: poldek_ts.c:903
+ #, c-format
+ msgid ", %d to remove"
+ msgstr ""
+
+-#: poldek_ts.c:1038
++#: poldek_ts.c:926
++#, c-format
++msgid "This operation will use %s of disk space."
++msgstr ""
++
++#: poldek_ts.c:928
++#, c-format
++msgid "This operation will free %s of disk space."
++msgstr ""
++
++#: poldek_ts.c:1069
+ #, fuzzy
+ msgid "Verifying dependencies..."
+ msgstr ""
+ "\n"
+ "�berpr�fe Abh�ngigkeiten..."
+
+-#: poldek_ts.c:1044
++#: poldek_ts.c:1075
+ #, fuzzy, c-format
+ msgid "Generating dependency graph %s..."
+ msgstr "Verarbeite Abh�ngigkeiten..."
+
+-#: poldek_ts.c:1057
++#: poldek_ts.c:1088
+ #, fuzzy
+ msgid "Verifying conflicts..."
+ msgstr ""
+ "\n"
+ "�berpr�fe Dateikonflikte..."
+
+-#: poldek_ts.c:1075
++#: poldek_ts.c:1106
+ #, fuzzy
+ msgid "Verifying file conflicts..."
+ msgstr ""
+ "\n"
+ "�berpr�fe Dateikonflikte..."
+
+-#: poldek_ts.c:1080
++#: poldek_ts.c:1111
+ #, fuzzy
+ msgid "Verifying file orphans..."
+ msgstr ""
+ "\n"
+ "�berpr�fe Dateikonflikte..."
+
+-#: poldek_ts.c:1085
++#: poldek_ts.c:1116
+ #, fuzzy
+ msgid "Verifying file semi-orphans (missing dependencies)..."
+ msgstr ""
+ "\n"
+ "�berpr�fe Abh�ngigkeiten..."
+
+-#: split.c:137
++#: split.c:138
+ #, c-format
+ msgid "%s:%d: syntax error near %s"
+ msgstr "%s:%d: Syntaxfehler bei '%s'"
+
+-#: split.c:173
++#: split.c:174
+ #, c-format
+ msgid "%s: give up at %d"
+ msgstr "%s: gebe auf bei %d"
+
+-#: split.c:316
++#: split.c:317
+ #, c-format
+ msgid "%s: rollback"
+ msgstr ""
+
+-#: split.c:384
++#: split.c:385
+ msgid "split failed: packages size is greater than chunk size"
+ msgstr ""
+
+-#: split.c:416
++#: split.c:417
+ #, fuzzy, c-format
+ msgid "Writing %s (%4d packages, %s (%lldb), pri min, max = %d, %d)"
+ msgstr "Speichere '%s' (%4d Pakete, % 10d Bytes)"
+
+-#: split.c:447
++#: split.c:448
+ #, fuzzy, c-format
+ msgid "%s: no priorities loaded"
+ msgstr "%s: keine Patches verf�gbar"
+
+-#: split.c:467
++#: split.c:468
+ #, c-format
+ msgid "split: assign %d pri to %s (mask %s)"
+ msgstr ""
+
+-#: split.c:479
++#: split.c:480
+ msgid "no maching priorities"
+ msgstr ""
+
+-#: split.c:537
++#: split.c:538
+ #, fuzzy
+ msgid "no available packages found"
+ msgstr "mark: %s: P�ket nicht gefunden"
+
+-#: uninstall.c:198
++#: uninstall.c:199
+ #, fuzzy, c-format
+ msgid " %s requires %s"
+ msgstr "%s: %m (%s)"
+
+-#: uninstall.c:203
++#: uninstall.c:204
+ #, fuzzy, c-format
+ msgid "%s marks orphaned %s (req %s)"
+ msgstr "%s%s markiert '%s' (%s %s)"
+
+-#: uninstall.c:264
++#: uninstall.c:265
+ #, c-format
+ msgid "%s (cap %s) is required by %s"
+ msgstr "'%s' (F�higkeit '%s') wird von '%s' ben�tigt"
+
+-#: uninstall.c:295
++#: uninstall.c:296
+ #, fuzzy, c-format
+ msgid "%s marks %s (req %s)"
+ msgstr "%s%s markiert '%s' (%s %s)"
+
+-#: uninstall.c:383
++#: uninstall.c:384
+ #, c-format
+ msgid "freedbset %d %s"
+ msgstr ""
+
+-#: uninstall.c:537
++#: uninstall.c:538
+ #, fuzzy, c-format
+ msgid "Trying %s\n"
+ msgstr "F�hre '%s' aus\n"
+
+-#: uninstall.c:549
++#: uninstall.c:550
+ #, fuzzy, c-format
+ msgid " Trying %s\n"
+ msgstr "Speichere '%s'..."
+
+-#: uninstall.c:561
++#: uninstall.c:562
+ #, fuzzy, c-format
+ msgid " Trying %s\n"
+ msgstr "Speichere '%s'..."
+
+-#: uninstall.c:573
++#: uninstall.c:574
+ #, c-format
+ msgid " Trying %s (arch=%s)\n"
+ msgstr ""
+
+-#: upgrade-dist.c:100
++#: upgrade-dist.c:111
+ #, c-format
+ msgid "%s: multiple instances installed, skipped"
+ msgstr "%s: mehrfach installiert, �bersprungen"
+
+-#: upgrade-dist.c:110
++#: upgrade-dist.c:121
+ #, c-format
+ msgid "%s: skip held package"
+ msgstr "%s: �berspringe gesperrtes (hold) Paket"
+
+-#: upgrade-dist.c:132
++#: upgrade-dist.c:143
+ msgid "Looking up packages for upgrade..."
+ msgstr "Suche zu aktualisierende Pakete ..."
+
+-#: vfile/extcompr.c:143 vfile/fetch.c:464
++#: vfile/extcompr.c:143 vfile/fetch.c:471
+ msgid "program exited with non-zero value"
+ msgstr "Programm wurde mit einem R�ckkehrwert ungleich 0 beendet"
+
+@@ -2442,37 +2533,37 @@ msgstr "Frage '%s' ab...\n"
+ msgid "Compressing %s...\n"
+ msgstr "Frage '%s' ab...\n"
+
+-#: vfile/fetch.c:442
++#: vfile/fetch.c:449
+ #, c-format
+ msgid "Running %s\n"
+ msgstr "F�hre '%s' aus\n"
+
+-#: vfile/p_open.c:215 vfile/vopen3.c:357
++#: vfile/p_open.c:216 vfile/vopen3.c:358
+ #, c-format
+ msgid "%s (%d) died under inscrutable circumstances"
+ msgstr "'%s' (%d) wurde unter r�tselhaften Umst�nden beendet"
+
+-#: vfile/vfetch.c:149
++#: vfile/vfetch.c:150
+ #, c-format
+ msgid "Retrying...(#%d)\n"
+ msgstr "Versuche erneut...(#%d)\n"
+
+-#: vfile/vfetch.c:243 vfile/vfetch.c:302
++#: vfile/vfetch.c:247 vfile/vfetch.c:311
+ #, fuzzy, c-format
+-msgid "Retrieving %s::%s...\n"
++msgid "Retrieving %s%s::%s...\n"
+ msgstr "Frage '%s' ab...\n"
+
+-#: vfile/vfetch.c:246 vfile/vfetch.c:305
+-#, c-format
+-msgid "Retrieving %s...\n"
++#: vfile/vfetch.c:250 vfile/vfetch.c:314
++#, fuzzy, c-format
++msgid "Retrieving %s%s...\n"
+ msgstr "Frage '%s' ab...\n"
+
+-#: vfile/vfetch.c:367
++#: vfile/vfetch.c:378
+ #, fuzzy, c-format
+ msgid "Retrieving status of %s...\n"
+ msgstr "Frage '%s' ab...\n"
+
+-#: vfile/vfff/ftp.c:90 vfile/vfff/http.c:215
++#: vfile/vfff/ftp.c:90 vfile/vfff/http.c:216
+ #, c-format
+ msgid "write to socket %s: %m"
+ msgstr "Schreibe in Socket '%s': %m"
+@@ -2482,17 +2573,17 @@ msgstr "Schreibe in Socket '%s': %m"
+ msgid "response parse error: %s"
+ msgstr "Fehler bei der Analyse der Antwort: %s"
+
+-#: vfile/vfff/ftp.c:226 vfile/vfff/ftp.c:237 vfile/vfff/http.c:414
+-#: vfile/vfff/http.c:650
++#: vfile/vfff/ftp.c:226 vfile/vfff/ftp.c:237 vfile/vfff/http.c:415
++#: vfile/vfff/http.c:651
+ #, c-format
+ msgid "%s: response parse error"
+ msgstr "%s: Fehler bei der Analyse der Antwort"
+
+-#: vfile/vfff/ftp.c:335 vfile/vfff/http.c:515
++#: vfile/vfff/ftp.c:335 vfile/vfff/http.c:516
+ msgid "response line too long"
+ msgstr "Antwortzeile ist zu lang"
+
+-#: vfile/vfff/ftp.c:348 vfile/vfff/http.c:528
++#: vfile/vfff/ftp.c:348 vfile/vfff/http.c:529
+ msgid "unexpected EOF"
+ msgstr "unerwartetes EOF"
+
+@@ -2520,62 +2611,62 @@ msgstr "%s: Adresse ist zu lang"
+ msgid "%s: no such file (serv said: %s)"
+ msgstr "%s: Datei nicht vorhanden (Server sagt: %s)"
+
+-#: vfile/vfff/http.c:682
++#: vfile/vfff/http.c:686
+ #, fuzzy, c-format
+ msgid "%s: permission denied"
+ msgstr "%s: keine Berechtigung"
+
+-#: vfile/vfff/http.c:686
++#: vfile/vfff/http.c:690
+ #, fuzzy, c-format
+ msgid "%s: invalid range requested"
+ msgstr "%s: ung�ltigen Bereich angefordert"
+
+-#: vfile/vfff/http.c:861
++#: vfile/vfff/http.c:865
+ #, fuzzy, c-format
+ msgid "Content-Length parse error (%s)"
+ msgstr "%s: Fehler bei der Analyse von 'Content-Length' (%s)"
+
+-#: vfile/vfff/http.c:990
++#: vfile/vfff/http.c:994
+ #, fuzzy, c-format
+ msgid "%s: Content-Range parse error (%s)"
+ msgstr "%s: Fehler bei den Analyse von 'Content-Range' (%s)"
+
+-#: vfile/vfff/http.c:998
++#: vfile/vfff/http.c:1002
+ #, fuzzy, c-format
+ msgid "%s: invalid Content-Range, truncate %s\n"
+ msgstr "%s: ung�ltige 'Content-Range' erreicht"
+
+-#: vfile/vfff/http.c:1008
++#: vfile/vfff/http.c:1012
+ #, fuzzy, c-format
+ msgid "%s: already downloaded; mtime %s\n"
+ msgstr "%s: bereits �bertragen\n"
+
+-#: vfile/vfff/http.c:1015
++#: vfile/vfff/http.c:1019
+ #, fuzzy, c-format
+ msgid "%s: invalid Content-Range reached"
+ msgstr "%s: ung�ltige 'Content-Range' erreicht"
+
+-#: vfile/vfff/vfff.c:76
++#: vfile/vfff/vfff.c:86
+ #, fuzzy
+ msgid "connection cancelled"
+ msgstr "Verbindung abgebrochen"
+
+-#: vfile/vfff/vfff.c:140
++#: vfile/vfff/vfff.c:150
+ #, c-format
+ msgid "unable to connect to %s:%s: %s"
+ msgstr "keine Verbindung zu %s:%s: %s"
+
+-#: vfile/vfff/vfff.c:170
++#: vfile/vfff/vfff.c:180
+ #, c-format
+ msgid "unable to connect to %s:%s: %m"
+ msgstr "keine Verbindung zu %s:%s: %m"
+
+-#: vfile/vflock.c:116
++#: vfile/vflock.c:117
+ #, fuzzy, c-format
+ msgid "Waiting for lock %s...\n"
+ msgstr "Speichere '%s'..."
+
+-#: vfile/vflock.c:147
++#: vfile/vflock.c:148
+ #, fuzzy, c-format
+ msgid "%s: unable to obtain lock\n"
+ msgstr "%s: dieser Quelltyp ist nicht aktualsierbar"
+@@ -2590,7 +2681,7 @@ msgstr " fertig"
+ msgid "%s: URL parse error\n"
+ msgstr "%s: Fehler bei der Analyse der URL"
+
+-#: vfile/vopen3.c:349
++#: vfile/vopen3.c:350
+ #, fuzzy, c-format
+ msgid "%s terminated by signal %d (%s)"
+ msgstr "'%s' beendet durch Signal %d"
+@@ -2803,9 +2894,6 @@ msgstr "'%s' beendet durch Signal %d"
+ #~ msgid "Remove all source files from cache directory"
+ #~ msgstr "L�sche alle Quelldateien aus dem Pufferverzeichnis"
+
+-#~ msgid "Verify options:"
+-#~ msgstr "Optionen f�r '�berpr�fen':"
+-
+ #~ msgid "Verify package dependencies"
+ #~ msgstr "�berpr�fe Paketabh�ngigkeiten"
+
+diff --git a/po/pl.po b/po/pl.po
+index 5fe36bf..9cfccca 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -6,206 +6,206 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: poldek 0.30\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-03-04 00:17+0200\n"
++"POT-Creation-Date: 2012-04-01 19:50+0200\n"
+ "PO-Revision-Date: 2010-12-15 21:34+0100\n"
+-"Last-Translator: Marcin Banasiak <marcin.banasiak at gmail.com>\n"
++"Last-Translator: Bartlomiej Zimon <uzi18 at o2.pl>\n"
+ "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\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"
++"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
++"|| n%100>=20) ? 1 : 2\n"
+
+-#: arg_packages.c:123
++#: arg_packages.c:124
+ #, c-format
+ msgid "%s:%d: syntax error"
+ msgstr "%s:%d: b��d sk�adniowy"
+
+-#: arg_packages.c:125
++#: arg_packages.c:126
+ msgid "syntax error in package specification"
+ msgstr "b��d sk�adniowy w specyfikacji pakietu"
+
+-#: arg_packages.c:393
++#: arg_packages.c:394
+ #, c-format
+ msgid "Removed %d duplicates from given packages"
+ msgstr "Usuni�to %d zduplikowanych pakiet�w z listy dost�pnych"
+
+-#: arg_packages.c:431
++#: arg_packages.c:432
+ #, c-format
+ msgid "%s: %d package(s) found:"
+ msgstr "%s: znaleziono %d pakiet�w:"
+
+-#: arg_packages.c:501
+-#: arg_packages.c:530
+-#: arg_packages.c:556
+-#: uninstall.c:592
++#: arg_packages.c:502 arg_packages.c:531 arg_packages.c:557 uninstall.c:593
+ #, c-format
+ msgid "%s: no such package"
+ msgstr "%s: nie ma takiego pakietu"
+
+-#: arg_packages.c:507
+-#: cli/dent.c:666
++#: arg_packages.c:508 cli/dent.c:675
+ #, c-format
+ msgid "%s: ambiguous name"
+ msgstr "niejednoznaczna nazwa %s"
+
+-#: arg_packages.c:632
++#: arg_packages.c:633
+ #, c-format
+ msgid "%s: choosen %s among %d packages"
+ msgstr "%s: wybrano %s spo�r�d %d pakiet�w"
+
+-#: ask.c:79
+-#: ask.c:83
++#: ask.c:80 ask.c:84
+ msgid "Proceed?"
+ msgstr "Kontynuowa�?"
+
+-#: ask.c:106
++#: ask.c:115
+ #, c-format
+ msgid "%s: required \"%s\" is provided by the following packages:"
+ msgstr "%s: wymagany \"%s\" jest dostarczany przez nast�puj�ce pakiety:"
+
+-#: ask.c:109
++#: ask.c:118
+ #, c-format
+ msgid "Required \"%s\" is provided by the following packages:"
+ msgstr "Wymagany \"%s\" jest dostarczany przez nast�puj�ce pakiety:"
+
+-#: ask.c:128
++#: ask.c:131
++msgid "-/backspace/pgup) page up"
++msgstr "-/backspace/pgup) poprzednia strona"
++
++#: ask.c:143
++msgid "+/space/tab/pgdown) page down"
++msgstr "+/space/tab/pgdown) nastepna strona"
++
++#: ask.c:151
+ #, c-format
+-msgid "Which one do you want to install ('Q' to abort)? [%c]"
+-msgstr "Kt�ry z nich chcesz zainstalowa� ('Q' anuluje)? [%c]"
++msgid "Which one do you want to install ('Q' to abort)? [%s]"
++msgstr "Kt�ry z nich chcesz zainstalowa� ('Q' anuluje)? [%s]"
+
+-#: ask.c:166
++#: ask.c:198
+ #, c-format
+ msgid "Package %s suggests installation of:"
+ msgstr "Pakiet %s sugeruje instalacj�:"
+
+-#: ask.c:168
++#: ask.c:200
+ msgid "Try to install it?"
+ msgid_plural "Try to install them?"
+ msgstr[0] "Spr�bowa� go zainstalowa�?"
+ msgstr[1] "Spr�bowa� je zainstalowa�?"
+ msgstr[2] "Spr�bowa� je zainstalowa�?"
+
+-#: ask.c:180
++#: ask.c:212
+ #, c-format
+ msgid "(y - all, n - nothing, s - select some of)? [%s]"
+-msgstr ""
++msgstr "(y - wszystkie, n - �aden, s - wybierz z listy)? [%s]"
+
+-#: ask.c:203
++#: ask.c:235
+ #, c-format
+ msgid "Try to install %s?"
+ msgstr "Spr�bowa� zainstalowa� %s?"
+
+-#: capreq.c:343
++#: capreq.c:344
+ #, c-format
+ msgid "%s: invalid rpmlib capreq"
+ msgstr "%s: nieprawid�owa rpmlib()owa zale�no��"
+
+-#: cli/alias.c:40
++#: cli/alias.c:41
+ msgid "Print defined command aliases"
+ msgstr "Wy�wietl zdefiniowane aliasy polece�"
+
+-#: cli/alias.c:100
++#: cli/alias.c:101
+ #, c-format
+ msgid "%s: alias could not shadow a command"
+ msgstr "%s: alias nie mo�e przes�ania� polecenia"
+
+-#: cli/alias.c:105
++#: cli/alias.c:106
+ #, c-format
+ msgid "%s (%s) overwrites %s"
+ msgstr "%s (%s) nadpisuje %s"
+
+-#: cli/alias.c:159
<Skipped 6696 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/a9509223080f5faa486ee17dce055a07aff2da0e
More information about the pld-cvs-commit
mailing list