break;
case HTTP_STATUS_FORBIDDEN:
-commit 0fcb9d8a7fe825c1a4c5f3cff2bd30312b615510
-Author: Bartlomiej Zimon <uzi18@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@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@gmx.net>\n"
- "Language-Team: Polish <pl@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@gmail.com>\n"
-+"Last-Translator: Bartlomiej Zimon <uzi18@o2.pl>\n"
- "Language-Team: Polish <translation-team-pl@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
-+#: cli/alias.c:160
- #, c-format
- msgid "%s: could not determine aliased command"
- msgstr "%s: nie mo¿na okre¶liæ zaliasowanego polecenia"
-
--#: 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 "[¦CIE¯KA]"
-
--#: cli/cd.c:31
-+#: cli/cd.c:32
- msgid "Change current package directory"
- msgstr "Zmieñ aktualny katalog pakietów"
-
--#: cli/cd.c:38
-+#: cli/cd.c:39
- msgid "Print name of current directory"
- msgstr "Podaj nazwê aktualnego katalogu"
-
--#: cli/cli.c:211
-+#: cli/cli.c:212
- msgid " Defined aliases:\n"
- msgstr " Zdefiniowane aliasy:\n"
-
--#: cli/cli.c:230
--#: cli/main.c:127
-+#: cli/cli.c:231 cli/main.c:128
- msgid "Be verbose."
- msgstr "B±d¼ gadatliwy"
-
--#: cli/cli.c:231
-+#: cli/cli.c:232
- msgid "Be quiet"
- msgstr "B±d¼ cichy"
-
--#: cli/cli.c:232
-+#: cli/cli.c:233
- msgid "Help"
- msgstr "Pomoc"
-
--#: cli/cli.c:419
-+#: cli/cli.c:420
- #, c-format
- msgid "ambiguous command %s"
- msgstr "niejednoznaczna komenda %s"
-
--#: cli/cmd_chain.c:194
-+#: cli/cmd_chain.c:195
- #, c-format
- msgid "%s: no such command"
- msgstr "%s: nie ma takiej komendy"
-
--#: cli/cmd_chain.c:211
-+#: cli/cmd_chain.c:212
- #, c-format
- msgid "%s: ambiguous command"
- msgstr "%s: niejednoznaczna komenda"
-
--#: cli/cmd_chain.c:303
-+#: cli/cmd_chain.c:304
- #, c-format
- msgid "%s: alias needs an arguments"
- msgstr "%s: alias wymaga argumentu"
-
--#: cli/cmd_chain.c:309
-+#: cli/cmd_chain.c:310
- #, c-format
- msgid "%s: apply arguments failed (not enough arguments?)"
- msgstr "%s: zastosowanie argumentów nie powiod³o siê (za ma³o argumentów?)"
-
--#: 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
- #, c-format
- msgid "%s: parse error"
- msgstr "%s: b³±d przetwarzania"
-
--#: cli/cmd_chain.c:435
-+#: cli/cmd_chain.c:436
- #, c-format
- msgid "%s: not a right pipe-able command"
- msgstr "Wyniku komendy %s nie mo¿na przekazaæ do potoku"
-
--#: cli/cmd_chain.c:446
-+#: cli/cmd_chain.c:447
- #, c-format
- msgid "%s: where is the pipe going?"
- msgstr "%s: gdzie¿ trafia rura?"
-
--#: 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 "B³±d odczytu zainstalowanych pakietów"
-
--#: 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"
-@@ -213,81 +213,79 @@ msgstr[0] "Przeczytano %d pakiet"
- msgstr[1] "Przeczytano %d pakiety"
- msgstr[2] "Przeczytano %d pakietów"
-
--#: cli/dent.c:660
-+#: cli/dent.c:669
- #, c-format
- msgid "%s: no such package or directory"
- msgstr "%s: nie ma takiego pakietu lub katalogu"
-
--#: cli/desc.c:71
-+#: cli/desc.c:72
- msgid "Show all fields described below"
- msgstr "Poka¿ wszystkie pozycje wymienione poni¿ej"
-
--#: cli/desc.c:74
-+#: cli/desc.c:75
- msgid "Show capabilities, requirements, conflicts and obsolences"
- msgstr "Poka¿ w³asno¶ci, wymagania, konflikty i zast±pienia(iii... obsoletes)"
-
--#: cli/desc.c:77
-+#: cli/desc.c:78
- msgid "Show package's capablities"
- msgstr "Poka¿ w³asno¶ci (capablities) pakietu"
-
--#: cli/desc.c:80
-+#: cli/desc.c:81
- msgid "Show requirements"
- msgstr "Poka¿ wymagania (requirements)"
-
--#: cli/desc.c:83
-+#: cli/desc.c:84
- msgid "Show required packages"
- msgstr "Poka¿ wymagane pakiety"
-
--#: cli/desc.c:86
-+#: cli/desc.c:87
- msgid "Show packages which requires given package"
- msgstr "Poka¿ pakiety, które wymagaj± podanego pakietu"
-
--#: cli/desc.c:89
-+#: cli/desc.c:90
- msgid "Show conflicts and obsolences"
- msgstr "Poka¿ konflikty i zast±pienia(sic!)"
-
--#: cli/desc.c:91
-+#: cli/desc.c:92
- msgid "Show description (the default)"
- msgstr "Poka¿ opis pakietu (akcja domy¶lna)"
-
--#: cli/desc.c:94
-+#: cli/desc.c:95
- msgid "Show package files (doubled gives long listing format)"
--msgstr "Poka¿ pliki pakietu (opcja dana dwukrotnie wy¶wietli listê w pe³nym formacie)"
-+msgstr ""
-+"Poka¿ pliki pakietu (opcja dana dwukrotnie wy¶wietli listê w pe³nym formacie)"
-
--#: cli/desc.c:97
-+#: cli/desc.c:98
- msgid "Show package changelog"
- msgstr "Poka¿ changelog pakietu"
-
--#: 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 "PAKIET..."
-
--#: cli/desc.c:104
-+#: cli/desc.c:105
- msgid "Display packages info"
- msgstr "Wy¶wietlaj informacje o pakietach"
-
--#: cli/desc.c:635
-+#: cli/desc.c:636
-+#, fuzzy
- msgid "mode"
--msgstr "mode"
-+msgstr "prawa"
-
--#: 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 "rozmiar"
-
--#: cli/desc.c:635
-+#: cli/desc.c:636
- msgid "name"
- msgstr "nazwa"
-
--#: cli/desc.c:998
-+#: cli/desc.c:999
- #, c-format
--msgid "%s: full description unavailable (index without packages info loaded?)\n"
--msgstr "%s: pe³ny opis niedostêpny (za³adowany indeks bez informacji o pakietach?)\n"
-+msgid ""
-+"%s: full description unavailable (index without packages info loaded?)\n"
-+msgstr ""
-+"%s: pe³ny opis niedostêpny (za³adowany indeks bez informacji o pakietach?)\n"
-
- #: cli/external.c:35
- msgid "COMMAND"
-@@ -302,31 +300,30 @@ msgstr "Wykonaj zewn
- msgid "%s: external command not found"
- msgstr "%s: zewnêtrzne polecenie nie zosta³o znalezione"
-
--#: cli/get.c:41
-+#: cli/get.c:42
- msgid "Download to directory DIR instead to current one"
- msgstr "Zapisuj pobierane pliki w katalogu DIR, zamiast w bie¿±cym"
-
--#: cli/get.c:47
-+#: cli/get.c:48
- msgid "Download packages"
- msgstr "¦ci±gaj pakiety"
-
--#: 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: nie ma takiego katalogu"
-
--#: cli/help.c:28
-+#: cli/help.c:29
-+#, fuzzy
- msgid "Display this help"
--msgstr "Poka¿ w³a¶nie wy¶wietlan± pomoc"
-+msgstr "Pokazuje t± pomoc"
-
--#: cli/help.c:56
-+#: cli/help.c:57
- #, c-format
- msgid "[OPTION...] %s"
- msgstr "[OPCJA...] %s"
-
--#: cli/help.c:61
-+#: cli/help.c:62
- #, c-format
- msgid ""
- "\n"
-@@ -335,647 +332,733 @@ msgstr ""
- "\n"
- "Wpisz KOMENDA -? by otrzymaæ pomoc na temat danej komendy.\n"
-
--#: cli/install.c:74
-+#: cli/install.c:77
- msgid "Install, not upgrade packages"
- msgstr "Instaluj, nie aktualizuj"
-
--#: cli/install.c:75
-+#: cli/install.c:78
- msgid "Reinstall"
- msgstr "Reinstaluj"
-
--#: cli/install.c:76
--#: cli/install.c:155
-+#: cli/install.c:79 cli/install.c:161
- msgid "Downgrade"
- msgstr "Downgrade"
-
--#: cli/install.c:78
-+#: cli/install.c:81
- msgid "Install packages ignoring broken dependencies, conflicts, etc"
- msgstr "Instaluj pakiety ignoruj±c niespe³nione zale¿no¶ci, konflikty, etc"
-
--#: cli/install.c:79
-+#: cli/install.c:82
- msgid "Don't install, but tell if it would work or not"
- msgstr "Nie instaluj, tylko sprawd¼ czy instalacja przebiegnie pomy¶lnie"
-
--#: cli/install.c:81
-+#: cli/install.c:84
- msgid "Upgrade packages, but only if an earlier version currently exists"
--msgstr "Aktualizuj pakiety tylko w przypadku gdy wcze¶niejsza ich wersja jest zainstalowana"
-+msgstr ""
-+"Aktualizuj pakiety tylko w przypadku gdy wcze¶niejsza ich wersja jest "
-+"zainstalowana"
-
--#: cli/install.c:83
-+#: cli/install.c:86
- msgid "Don't install packages required by selected ones"
- msgstr "Nie instaluj pakietów wymaganych przez wybrane pakiety"
-
--#: cli/install.c:87
-+#: cli/install.c:90
- msgid "Install packages required by selected ones"
- msgstr "Instaluj pakiety wymagane przez wybrane pakiety"
-
--#: cli/install.c:90
--#: cli/install.c:95
--msgid "Automatically upgrade packages which dependencies are broken by unistalled ones"
--msgstr "Aktualizuj pakiety których zale¿no¶ci s± naruszane przez te w³a¶nie usuwane"
-+#: cli/install.c:93 cli/install.c:98
-+msgid ""
-+"Automatically upgrade packages which dependencies are broken by unistalled "
-+"ones"
-+msgstr ""
-+"Aktualizuj pakiety których zale¿no¶ci s± naruszane przez te w³a¶nie usuwane"
-
--#: cli/install.c:99
--msgid "Download packages to DIR (poldek's cache directory by default)instead of install them"
--msgstr "¦ci±gnij pakiety do KATALOGU (domy¶lnie katalog cache poldka) zamiast je instalowaæ"
-+#: cli/install.c:102
-+msgid ""
-+"Download packages to DIR (poldek's cache directory by default)instead of "
-+"install them"
-+msgstr ""
-+"¦ci±gnij pakiety do KATALOGU (domy¶lnie katalog cache poldka) zamiast je "
-+"instalowaæ"
-
--#: cli/install.c:103
-+#: cli/install.c:106
- msgid "Install packages with broken dependencies"
- msgstr "Instaluj pakiety z niespe³nionymi zale¿no¶ciami"
-
--#: cli/install.c:105
--msgid "Treat requirements with EVR as satisfied by unversioned capabilities (old RPM behaviour)"
-+#: cli/install.c:108
-+msgid ""
-+"Treat requirements with EVR as satisfied by unversioned capabilities (old "
-+"RPM behaviour)"
- msgstr ""
-
--#: cli/install.c:109
--msgid "Promote non-existent requirement's epoch to package's one (rpm prior to 4.2.1 behaviour)"
-+#: 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
--msgid "Print packages file names to FILE (stdout by default) instead of install them"
--msgstr "Nie instaluj, a tylko wypisz pliki pakietów przeznaczonych do instalacji do PLIKU (standardowo stdout)"
-+#: cli/install.c:117
-+msgid ""
-+"Print packages file names to FILE (stdout by default) instead of install them"
-+msgstr ""
-+"Nie instaluj, a tylko wypisz pliki pakietów przeznaczonych do instalacji do "
-+"PLIKU (standardowo stdout)"
-
--#: cli/install.c:118
--msgid "Print packages names to FILE (stdout by default) instead of install them"
--msgstr "Wypisz nazwy pakietów do PLIKU (standardowo stdout) zamiast je instalowaæ"
-+#: cli/install.c:121
-+msgid ""
-+"Print packages names to FILE (stdout by default) instead of install them"
-+msgstr ""
-+"Wypisz nazwy pakietów do PLIKU (standardowo stdout) zamiast je instalowaæ"
-
--#: cli/install.c:120
-+#: cli/install.c:123
- msgid "Modify only the database"
- msgstr "Modyfikuj jedynie bazê zainstalowanych pakietów"
-
--#: cli/install.c:123
-+#: cli/install.c:126
- msgid "Same as --nodeps but applied to PM (rpm) only"
--msgstr "To samo co --nodeps, ale zastosowane tylko do zarz±dcy pakietów (rpm-a)"
-+msgstr ""
-+"To samo co --nodeps, ale zastosowane tylko do zarz±dcy pakietów (rpm-a)"
-
--#: cli/install.c:128
-+#: cli/install.c:131
- msgid "Same as --force but applied to PM (rpm) only)"
- msgstr "To samo co --force, ale zastosowane tylko do zarz±dcy pakietów (rpm-a)"
-
--#: cli/install.c:132
-+#: cli/install.c:135
- msgid "pass option OPTION to PM binary"
- msgstr "przeka¿ opcjê OPCJA do binarki zarz±dcy pakietów"
-
--#: cli/install.c:137
--#: cli/install.c:179
-+#: cli/install.c:140 cli/install.c:185
- msgid "Do not hold any packages. Disables --hold settings."
- msgstr "Nie wstrzymuj ¿adnych pakietów. Wy³±cza ustawienia --hold."
-
--#: cli/install.c:141
-+#: cli/install.c:144
- msgid "Do not download packages"
- msgstr "Nie ¶ci±gaj pakietów"
-
--#: 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
- msgid "Package installation:"
- msgstr "Instalacja pakietów:"
-
--#: cli/install.c:149
-+#: cli/install.c:155
- msgid "Install given packages"
- msgstr "Instaluj podane pakiety"
-
--#: cli/install.c:153
-+#: cli/install.c:159
- msgid "Reinstall given packages"
- msgstr "Przeinstaluj podane pakiety"
-
--#: cli/install.c:156
-+#: cli/install.c:162
- msgid "Upgrade given packages"
- msgstr "Aktualizuj podane pakiety"
-
--#: cli/install.c:161
-+#: cli/install.c:167
- msgid "Distribution installation/upgrade:"
- msgstr "Instalacja/uaktualnienie dystrybucji:"
-
--#: cli/install.c:163
-+#: cli/install.c:169
- msgid "Install package set under DIR as root directory"
- msgstr "Instaluj u¿ywaj±c katalogu DIR jako /"
-
--#: cli/install.c:166
-+#: cli/install.c:172
- msgid "Upgrade all packages needs upgrade"
- msgstr "Aktualizuj wszystkie pakiety mog±ce zostaæ zaktualizowane"
-
--#: cli/install.c:169
-+#: cli/install.c:175
- msgid "Reinstall all packages under DIR as root directory"
- msgstr "Przeinstaluj wszystkie pakiety u¿ywaj±c katalogu DIR jako /"
-
--#: cli/install.c:171
-+#: cli/install.c:177
- msgid "Set top directory to DIR"
- msgstr "U¿yj DIR jako /"
-
--#: cli/install.c:173
-+#: cli/install.c:179
- msgid "Installation switches:"
- msgstr "Podopcje instalacji:"
-
--#: cli/install.c:175
--msgid "Prevent packages listed from being upgraded if they are already installed."
-+#: cli/install.c:181
-+msgid ""
-+"Prevent packages listed from being upgraded if they are already installed."
- msgstr "Nie aktualizuj wymienionych pakietów je¿eli takie s± zainstalowane"
-
--#: cli/install.c:182
-+#: cli/install.c:188
- msgid "Make packages listed invisible."
- msgstr "Zniknij wymienione pakiety z listy dostêpnych."
-
--#: cli/install.c:185
-+#: cli/install.c:191
- msgid "Make invisibled packages visible. Disables --ignore settings."
- msgstr "Uczyñ znikniête pakiety widocznymi. Wy³±cza ustawienia --ignore."
-
--#: cli/install.c:188
-+#: cli/install.c:194
- msgid "Remove package duplicates from available package list"
- msgstr "Usuñ duplikaty pakietów z listy dostêpnych pakietów"
-
--#: cli/install.c:194
-+#: cli/install.c:200
- msgid "Print installation summary in parseable form"
- msgstr "Wy¶wietl podsumowanie instalacji w sformatowanej postaci"
-
--#: cli/install.c:206
-+#: cli/install.c:212
- msgid "Install packages"
- msgstr "Instaluj pakiety"
-
--#: cli/install.c:423
-+#: cli/install.c:429
- #, c-format
- msgid "invalid value ('%s') of option 'follow'"
- msgstr "niedozwolona warto¶æ ('%s') dla opcji 'follow'"
-
--#: cli/install.c:446
--#: cli/uninstall.c:173
-+#: cli/install.c:452 cli/uninstall.c:174
- #, c-format
- msgid "invalid value ('%s') of option 'greedy'"
- msgstr "niedozwolona warto¶æ ('%s') dla opcji 'greedy'"
-
--#: cli/install.c:564
-+#: cli/install.c:574
- msgid "There were errors"
- msgstr "Wyst±pi³y b³êdy podczas instalacji"
-
--#: cli/install.c:584
-+#: cli/install.c:594
- msgid "no packages specified"
- msgstr "nie podano pakietów"
-
--#: cli/ls.c:57
-+#: cli/ls.c:62
- msgid "Use a long listing format"
- msgstr "Wypisuj u¿ywaj±c rozszerzonego formatu"
-
--#: cli/ls.c:58
-+#: cli/ls.c:63
- msgid "Show upgrade-able packages only"
- msgstr "Poka¿ pakiety, które mog± zostaæ zaktualizowane"
-
--#: cli/ls.c:60
-+#: cli/ls.c:65
- msgid "Likewise but omit packages with different releases only"
- msgstr "jw. z pominiêciem pakietów ró¿ni±cych siê jedynie Release"
-
--#: cli/ls.c:62
-+#: cli/ls.c:67
- msgid "Show upgrade-able packages with potential security fixes"
--msgstr "Poka¿ pakiety z potencjalnymi poprawkami bezpieczeñstwa, które mog± zostaæ zaktualizowane"
-+msgstr ""
-+"Poka¿ pakiety z potencjalnymi poprawkami bezpieczeñstwa, które mog± zostaæ "
-+"zaktualizowane"
-
--#: cli/ls.c:63
-+#: cli/ls.c:68
- msgid "List installed packages"
- msgstr "Poka¿ zainstalowane pakiety"
-
--#: cli/ls.c:64
-+#: cli/ls.c:69
- msgid "Sort by build time"
- msgstr "Sortuj wg czasu budowania pakietu"
-
--#: cli/ls.c:65
-+#: cli/ls.c:70
- msgid "Sort by build day"
- msgstr "Sortuj wg. dnia budowania pakietu"
-
--#: cli/ls.c:66
-+#: cli/ls.c:71
- msgid "Reverse order while sorting"
- msgstr "Odwróæ kolejno¶æ podczas sortowania"
-
--#: cli/ls.c:67
-+#: cli/ls.c:72
- msgid "Print only package names"
- msgstr "Poka¿ tylko nazwy pakietów"
-
--#: cli/ls.c:68
-+#: cli/ls.c:73
- msgid "Print package groups"
- msgstr "Poka¿ grupy pakietów"
-
--#: cli/ls.c:69
-+#: cli/ls.c:74
- msgid "Print package summaries"
- msgstr "Poka¿ krótkie opisy pakietów"
-
-+#: cli/ls.c:75
-+msgid "Print package source rpm"
-+msgstr "Poka¿ pakiety ¼ród³owe"
-+
-+#: cli/ls.c:76
-+msgid "Query format options:"
-+msgstr "Opcje formatu zapytañ:"
-+
- #: cli/ls.c:77
--#: cli/main.c:52
-+msgid "Use the following query format"
-+msgstr "Wypisuj u¿ywaj±c nastêpuj±cego formatu zapytania"
-+
-+#: cli/ls.c:78
-+msgid "Show supported tags"
-+msgstr "Poka¿ wspierane tagi"
-+
-+#: cli/ls.c:85 cli/main.c:53
- msgid "[PACKAGE...]"
- msgstr "[PAKIET...]"
-
--#: cli/ls.c:77
-+#: cli/ls.c:85
- msgid "List packages"
- msgstr "Poka¿ pakiety"
-
--#: cli/ls.c:87
--msgid "ls: -l and -G are exclusive"
--msgstr "opcje -l i -G wykluczaj± siê"
-+#: cli/ls.c:95
-+msgid "ls: -l, -s and -G are exclusive"
-+msgstr "opcje -l, -s i -G wykluczaj± siê"
-
--#: cli/ls.c:221
-+#: cli/ls.c:256
- #, c-format
- msgid "%s: no packages found"
- msgstr "%s: nie znaleziono pakietów"
-
--#: cli/ls.c:413
--#: cli/ls.c:425
-+#: cli/ls.c:453 cli/ls.c:455 cli/ls.c:466
- msgid "package"
- msgstr "pakiet"
-
--#: cli/ls.c:413
-+#: cli/ls.c:453
- msgid "group"
- msgstr "grupa"
-
--#: cli/ls.c:425
--#: cli/ls.c:439
--#: cli/ls.c:442
-+#: cli/ls.c:455
-+msgid "source rpm"
-+msgstr "¼ród³owy rpm"
-+
-+#: cli/ls.c:466 cli/ls.c:480 cli/ls.c:483
- msgid "build date"
- msgstr "data zbudowania"
-
--#: cli/ls.c:438
--#: cli/ls.c:442
-+#: cli/ls.c:479 cli/ls.c:483
- msgid "installed"
- msgstr "zainstalowany"
-
--#: cli/ls.c:439
--#: cli/ls.c:441
-+#: cli/ls.c:480 cli/ls.c:482
- msgid "available"
- msgstr "dostêpny"
-
--#: cli/main.c:84
-+#: cli/ls_queryfmt.c:38
-+msgid "invalid format:"
-+msgstr "niepoprawny format:"
-+
-+#: cli/ls_queryfmt.c:718
-+#, c-format
-+msgid "%s missing { after %%"
-+msgstr "%s brak { przed %%"
-+
-+#: cli/ls_queryfmt.c:734
-+#, c-format
-+msgid "%s missing } after %%{"
-+msgstr "%s brak } po %%"
-+
-+#: cli/ls_queryfmt.c:742
-+#, c-format
-+msgid "%s empty tag name"
-+msgstr "%s brak nazwy tagu"
-+
-+#: cli/ls_queryfmt.c:754
-+#, c-format
-+msgid "%s unknown tag: '%s'"
-+msgstr "%s nieznany tag: '%s'"
-+
-+#: cli/ls_queryfmt.c:789
-+#, c-format
-+msgid "%s missing ] at end of array"
-+msgstr "%s: brak ] na koñcu listy"
-+
-+#: cli/ls_queryfmt.c:800
-+#, c-format
-+msgid "%s unexpected ]"
-+msgstr "%s niespodziewany ]"
-+
-+#: cli/ls_queryfmt.c:814
-+#, c-format
-+msgid "%s unexpected }"
-+msgstr "%s niespodziewany }"
-+
-+#: 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 "Ró¿norodne opcje"
-
--#: cli/main.c:86
-+#: cli/main.c:87
- msgid "Use FILE as PM(rpm) binary"
- msgstr "U¿yj PLIKU jako binarki zarz±dcy pakietów (rpm-a)"
-
--#: cli/main.c:88
-+#: cli/main.c:89
- msgid "Use FILE as sudo binary"
- msgstr "U¿yj PLIKU jako binarki sudo"
-
--#: cli/main.c:91
-+#: cli/main.c:92
- msgid "Store downloaded files and co. under DIR"
- msgstr "Umieszczaj ¶ci±gniête pliki itp. w katalogu DIR"
-
--#: cli/main.c:94
-+#: cli/main.c:95
- msgid "Run in command mode (like ipoldek does by default)"
- msgstr "Uruchom w trybie poleceñ (tak jak ipoldek robi domy¶lnie)"
-
--#: cli/main.c:96
--msgid "Confirm packages installation and let user choose among equivalent packages"
--msgstr "Potwierdzaj instalacjê oraz pozwól u¿ytkownikowi wybieraæ po¶ród równowa¿nych pakietów"
-+#: cli/main.c:97
-+msgid ""
-+"Confirm packages installation and let user choose among equivalent packages"
-+msgstr ""
-+"Potwierdzaj instalacjê oraz pozwól u¿ytkownikowi wybieraæ po¶ród "
-+"równowa¿nych pakietów"
-
--#: cli/main.c:98
-+#: cli/main.c:99
- msgid "Don't ask about anything"
- msgstr "O nic nie pytaj"
-
--#: cli/main.c:100
-+#: cli/main.c:101
- msgid "Run in interactive mode (default)"
- msgstr "Uruchom w trybie interaktywnym (domy¶lne)"
-
--#: cli/main.c:103
-+#: cli/main.c:104
- msgid "Run poldek shell COMMAND and exit"
- msgstr "Uruchom komendê COMMAND i wyjd¼"
-
--#: cli/main.c:106
-+#: cli/main.c:107
- msgid "Don't load installed packages at startup"
- msgstr "Nie ³aduj bazy zainstalowanych pakietów przy starcie"
-
--#: cli/main.c:110
--#: cli/main.c:112
-+#: cli/main.c:111 cli/main.c:113
- msgid "Read configuration from FILE"
- msgstr "Czytaj konfiguracjê z pliku FILE"
-
--#: cli/main.c:114
-+#: cli/main.c:115
- msgid "Do not read configuration"
- msgstr "Nie czytaj ¿adnej konfiguracji"
-
--#: cli/main.c:115
-+#: cli/main.c:116
- msgid "Update remote configuration files (if any)"
- msgstr "Uaktualnij zdalne pliki konfiguracyjne (je¿eli s±)"
-
--#: cli/main.c:119
-+#: cli/main.c:120
- msgid "Display program version information and exit"
- msgstr "Wypisz informacjê o wersji programu i wyjd¼"
-
--#: cli/main.c:121
-+#: cli/main.c:122
- msgid "Log program messages to FILE"
- msgstr "Rejestruj wszystkie komunikaty w pliku FILE"
-
--#: cli/main.c:122
-+#: cli/main.c:123
- msgid "Run program as user USER"
- msgstr "Uruchom program jako u¿ytkownik USER"
-
--#: cli/main.c:123
-+#: cli/main.c:124
- msgid "Set configuration option"
- msgstr "Ustaw opcjê konfiguracji"
-
--#: cli/main.c:125
-+#: cli/main.c:126
- msgid "Dump options in docbook format"
- msgstr "Zrzuæ opcje w formacje docbooka"
-
--#: cli/main.c:128
-+#: cli/main.c:129
- msgid "Do not produce any output."
- msgstr "Nie wypisuj ¿anych komunikatów"
-
--#: cli/main.c:229
-+#: cli/main.c:230
- msgid "-c is depreciated, use --conf instead"
- msgstr "-c jest przestarza³e, u¿ywaj --conf w zamian"
-
--#: cli/main.c:577
-+#: cli/main.c:578
- #, c-format
- msgid "%s: option '%s' requires an argument\n"
- msgstr "%s: opcja '%s' wymaga argumentu\n"
-
--#: cli/main.c:581
-+#: cli/main.c:582
- #, c-format
- msgid "%s: option '%s' gives no effect if program executed by ordinary user"
--msgstr "%s: opcja '%s' nie ma efektu gdy program jest uruchomiony przez zwyk³ego u¿ytkownika"
-+msgstr ""
-+"%s: opcja '%s' nie ma efektu gdy program jest uruchomiony przez zwyk³ego "
-+"u¿ytkownika"
-
--#: cli/op.c:69
--#: cli/op.c:73
-+#: cli/op.c:70 cli/op.c:80
- msgid " and "
- msgstr " i "
-
--#: cli/op.c:80
-+#: cli/op.c:87
- #, c-format
- msgid "%s options are exclusive"
- msgstr "opcje %s wykluczaj± siê"
-
--#: cli/op_makeidx.c:51
--#: cli/op_split.c:81
-+#: cli/op_makeidx.c:52 cli/op_split.c:82
- msgid "Repository index creation:"
- msgstr "Tworzenie indeksu repozytorium:"
-
--#: cli/op_makeidx.c:54
-+#: cli/op_makeidx.c:55
- msgid "Create package index (under SOURCE-PATH by default)"
- msgstr "Utwórz pakietowy indeks (domy¶lnie: SOURCE-PATH)"
-
--#: cli/op_makeidx.c:59
-+#: cli/op_makeidx.c:60
- msgid "Set created index type (use --stl to list available values)"
--msgstr "Ustaw typ tworzonego indeksu (u¿yj --stl ¿eby wy¶wietliæ dostêpne warto¶ci)"
-+msgstr ""
-+"Ustaw typ tworzonego indeksu (u¿yj --stl ¿eby wy¶wietliæ dostêpne warto¶ci)"
-
--#: cli/op_makeidx.c:65
-+#: cli/op_makeidx.c:66
- msgid "Likewise, but gzipped file is created"
- msgstr "jw. z tym, ¿e indeks jest kopresowany gzipem"
-
--#: cli/op_makeidx.c:72
-+#: cli/op_makeidx.c:73
- msgid "Create options (type --mo=help for help)"
- msgstr "Opcje tworzenia (wpisz --mo=help dla pomocy)"
-
--#: cli/op_makeidx.c:85
-+#: cli/op_makeidx.c:86
- msgid "Omit package user-level information (like Summary or Description)"
--msgstr "Buduj indeks bez informacji o pakietach przydatnych jedynie u¿ytkownikowi (jak podsumowanie czy opis)"
-+msgstr ""
-+"Buduj indeks bez informacji o pakietach przydatnych jedynie u¿ytkownikowi "
-+"(jak podsumowanie czy opis)"
-
--#: cli/op_makeidx.c:88
-+#: cli/op_makeidx.c:89
- msgid "Don't create index delta files"
- msgstr "Nie twórz indeksowych plików ró¿nicowych"
-
--#: cli/op_makeidx.c:91
-+#: cli/op_makeidx.c:92
- msgid "Create pdir compatibile with versions prior 0.18.9"
- msgstr "Utwórz pdir zgodny z wersjami przed 0.18.9"
-
--#: cli/op_makeidx.c:93
-+#: cli/op_makeidx.c:94
- msgid "Create uncompressed index"
- msgstr "Stwórz nieskompresowany indeks"
-
--#: cli/op_makeidx.c:151
-+#: cli/op_makeidx.c:152
- #, c-format
- msgid "--%s is deprecated, use --mo=%s"
- msgstr "--%s jest przestarza³e, u¿ywaj --mo=%s"
-
--#: cli/op_makeidx.c:258
-+#: cli/op_makeidx.c:259
- #, c-format
- msgid "%s: unknown option"
- msgstr "%s: nieznana opcja"
-
--#: cli/op_makeidx.c:298
-+#: cli/op_makeidx.c:299
- #, c-format
- msgid "Index create options are:\n"
- msgstr "Opcje tworzenia indeksu:\n"
-
--#: cli/op_makeidx.c:352
-+#: cli/op_makeidx.c:353
- msgid "no sources specified"
- msgstr "nie podano ¼róde³"
-
--#: cli/op_packages.c:36
-+#: cli/op_packages.c:37
- msgid "Package related options:"
- msgstr "Opcje odnosz±ce siê do pakietów:"
-
--#: cli/op_packages.c:37
-+#: cli/op_packages.c:38
- msgid "Take package set definition from FILE"
- msgstr "We¼ definicjê zestaw pakietów z pliku 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 "opcja '%s' powinna byæ ustawiona przez --%s"
-
--#: cli/op_source.c:66
-+#: cli/op_source.c:67
- msgid "Repository selection:"
- msgstr "Wybór repozytorium:"
-
--#: cli/op_source.c:67
-+#: cli/op_source.c:68
- msgid "Get packages info from repository under PATH"
- msgstr "Pobierz informacje o pakietach z repozytorium w ¶cie¿ce PATH"
-
--#: cli/op_source.c:70
-+#: cli/op_source.c:71
- msgid "Get packages info from repository named SOURCE-NAME"
- msgstr "Pobierz informacje o pakietach ze ¼ród³a o nazwie 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 "Instaluj do podanej lokacji"
-
--#: 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 "We¼ informacje o pakietach z indeksu FILE"
-
--#: cli/op_source.c:88
-+#: cli/op_source.c:89
- msgid "Get packages info from directory DIR by scanning it"
- msgstr "Pobieraj informacje o pakietach skanuj±c katalog DIR"
-
--#: cli/op_source.c:91
-+#: cli/op_source.c:92
- msgid "Get packages info from package header list file (aka hdlist)"
- msgstr "Pobieraj informacje o pakietach pliku z surowymi nag³ówkami pakietów"
-
--#: 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 "Pobieraj pakiety ze ¼ród³a PREFIX zamiast z SOURCE"
-
--#: cli/op_source.c:101
-+#: cli/op_source.c:102
- msgid "Repository related actions:"
- msgstr "Akcje zwi±zane z repozytorium:"
-
--#: cli/op_source.c:102
-+#: cli/op_source.c:103
- msgid "List available source types"
- msgstr "Poka¿ dostêpne typy ¼róde³"
-
--#: cli/op_source.c:105
-+#: cli/op_source.c:106
- msgid "List configured sources"
- msgstr "Poka¿ skonfigurowane ¼ród³a"
-
--#: cli/op_source.c:108
-+#: cli/op_source.c:109
- msgid "Update the source and verify it"
- msgstr "Aktualizuj indeks i sprawd¼ jego integralno¶æ"
-
--#: cli/op_source.c:113
-+#: cli/op_source.c:114
- msgid "Update whole index of source"
- msgstr "Aktualizuj indeks przez pobranie go w ca³o¶ci"
-
--#: cli/op_source.c:118
-+#: cli/op_source.c:119
- msgid "Remove source index files from cache directory"
- msgstr "Usuñ lokalne pliki indeksów"
-
--#: cli/op_source.c:121
-+#: cli/op_source.c:122
- msgid "Remove cached packages of the source"
- msgstr "Usuñ lokalnie przechowywane pakiety ¼ród³a"
-
--#: cli/op_source.c:124
-+#: cli/op_source.c:125
- msgid "Remove all files belongs to source from cache directory"
- msgstr "Usuñ wszystkie lokalnie przechowywane pliki z danego ¼ród³a"
-
--#: cli/op_source.c:264
-+#: cli/op_source.c:265
- msgid "--dt: destination is already set, use me before --destination"
- msgstr "--dt: cel jest ju¿ ustawiony, u¿yj mnie przed --destination"
-
--#: cli/op_source.c:273
-+#: cli/op_source.c:274
- msgid "--destination: destination is already set"
- msgstr "--destination: cel jest ju¿ ustawiony"
-
--#: cli/op_source.c:284
-+#: cli/op_source.c:285
- msgid "prefix option should be preceded by source one"
- msgstr "opcja 'prefix' musi byæ poprzedzona opcj± 'source'"
-
--#: cli/op_source.c:288
-+#: cli/op_source.c:289
- msgid "prefix for directory source makes no sense"
- msgstr "podanie opcji 'prefix' dla katalou nie ma sensu"
-
--#: cli/op_source.c:293
-+#: cli/op_source.c:294
- msgid "poldek's panic"
- msgstr "poldek panikuje"
-
--#: cli/op_split.c:41
-+#: cli/op_split.c:42
- msgid "Splitting:"
- msgstr "Dzielenie:"
-
--#: cli/op_split.c:43
--msgid "Split package set to SIZE MB size chunks, the first chunk will be FIRST_FREE_SPACE MB smaller"
--msgstr "Podziel zestaw pakietów na SIZE megabajtowe czê¶ci, pierwsza z nich bêdzie mniejsza o FIRST_FREE_SPACE MB"
-+#: cli/op_split.c:44
-+msgid ""
-+"Split package set to SIZE MB size chunks, the first chunk will be "
-+"FIRST_FREE_SPACE MB smaller"
-+msgstr ""
-+"Podziel zestaw pakietów na SIZE megabajtowe czê¶ci, pierwsza z nich bêdzie "
-+"mniejsza o FIRST_FREE_SPACE MB"
-
--#: 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 "Pobierz priorytety pakietów z pliku FILE"
-
--#: cli/op_split.c:53
-+#: cli/op_split.c:54
- msgid "Write chunks to PREFIX.XX, default PREFIX is 'packages.chunk'"
- msgstr "Zapisuj czê¶ci do PREFIX.XX, domy¶lny PREFIX to 'packages.chunk'"
-
--#: cli/op_split.c:136
-+#: cli/op_split.c:137
- msgid "split: bad option argument"
- msgstr "split: z³y argument"
-
--#: cli/op_split.c:162
-+#: cli/op_split.c:163
- msgid "split size too small"
- msgstr "rozmiar zbyt ma³y"
-
--#: cli/op_split.c:167
-+#: cli/op_split.c:168
- msgid "first free space bigger than chunk size"
- msgstr "wolne miejsce w pierwszej czê¶ci wiêksze od rozmiaru czê¶ci"
-
--#: cli/op_verify.c:49
-+#: cli/op_verify.c:50
- msgid "Package set verification:"
- msgstr "Weryfikacja zestawu pakietów:"
-
--#: cli/op_verify.c:51
--msgid "Verify package set, available reports are: 'deps', 'order', 'conflicts', 'file-conflicts', 'file-orphans' and 'file-missing-deps'. Default is 'deps'."
-+#: 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
- msgid "Verify conflicts"
- msgstr "Sprawd¼ konflikty"
-
--#: cli/op_verify.c:56
-+#: cli/op_verify.c:57
- msgid "Verify file conflicts"
- msgstr "Sprawd¼ konflikty plików"
-
--#: cli/op_verify.c:59
-+#: cli/op_verify.c:60
- msgid "Find orphaned directories"
- msgstr "Znajd¼ osierocone katalogi"
-
--#: cli/op_verify.c:62
-+#: cli/op_verify.c:63
- msgid "Verify dependencies, conflicts, file conflicts and orphaned directories"
- msgstr "Sprawd¼ zale¿no¶ci, konflikty (w tym plikowe) i osierocone katalogi"
-
--#: 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 "Prze³aduj listê zainstalowanych pakietów"
-
--#: cli/search.c:98
-+#: cli/search.c:100
- msgid "Search capabilities"
- msgstr "Przeszukuj w³asno¶ci (capablities)"
-
--#: cli/search.c:99
-+#: cli/search.c:101
- msgid "Search requirements"
- msgstr "Przeszukuj wymagania (requirements)"
-
--#: cli/search.c:100
-+#: cli/search.c:102
- msgid "Search conflicts"
- msgstr "Przeszukuj konflikty"
-
--#: cli/search.c:101
-+#: cli/search.c:103
- msgid "Search obsolences"
- msgstr "Przeszukuj przedawnienia (sic!, obsolences)"
-
--#: cli/search.c:102
-+#: cli/search.c:104
- msgid "Search summaries, urls and license"
- msgstr "Przeszukuj licencje, URLe oraz krótkie opisy pakietów"
-
--#: cli/search.c:103
-+#: cli/search.c:105
- msgid "Search descriptions"
- msgstr "Przeszukuj opisy"
-
--#: cli/search.c:104
-+#: cli/search.c:106
- msgid "Search groups"
- msgstr "Przeszukuj grupy"
-
--#: cli/search.c:105
-+#: cli/search.c:107
- msgid "Search file list"
- msgstr "Przeszukuj listy plików"
-
--#: cli/search.c:107
-+#: cli/search.c:109
- msgid "Search changelogs"
- msgstr "Przeszukiwanie changelogów"
-
--#: cli/search.c:109
-+#: cli/search.c:111
- msgid "Search all described fields, the defaults are: -sd"
- msgstr "Przeszukuj wszystkie pola pakietów, domy¶lnie s± to -sd"
-
--#: cli/search.c:111
-+#: cli/search.c:113
- msgid "Threat PATTERN as Perl regular expression"
- msgstr "Traktuj WZORZEC jako perlowe wyra¿enie regularne"
-
--#: cli/search.c:119
-+#: cli/search.c:121
- msgid "PATTERN [PACKAGE...]"
- msgstr "WZORZEC [PAKIET...]"
-
--#: cli/search.c:119
-+#: cli/search.c:121
- msgid "Search packages"
- msgstr "Przeszukiwanie pakietów"
-
--#: cli/search.c:123
-+#: cli/search.c:125
- msgid ""
- "With --perlre pattern must be supplied as:\n"
- " <delimiter>perl-regexp<delimiter>[imsx]\n"
-@@ -989,51 +1072,51 @@ msgstr ""
- " search --perlre /foo\\.bar/\n"
- "Wiêcej informacji mo¿na znale¼æ w perlre(1).\n"
-
--#: cli/search.c:184
-+#: cli/search.c:186
- #, c-format
- msgid "search: unknown regexp option -- %c"
- msgstr "search: nieznana opcja wzorca -- %c"
-
--#: cli/search.c:326
-+#: cli/search.c:328
- #, c-format
- msgid "search: pattern: %s:%d: %s"
- msgstr "search: wzorzec: %s:%d: %s"
-
--#: cli/search.c:335
-+#: cli/search.c:337
- #, c-format
- msgid "search: pattern study: %s: %s"
- msgstr "search: wzorzec: %s: %s"
-
--#: cli/search.c:522
-+#: cli/search.c:524
- #, c-format
- msgid "%s: load package info failed"
- msgstr "%s: b³±d odczytu informacji o pakiecie"
-
--#: cli/search.c:570
-+#: cli/search.c:572
- msgid "search: no pattern given"
- msgstr "search: nie podano wzorca"
-
--#: cli/search.c:604
-+#: cli/search.c:606
- msgid "Searching packages..."
- msgstr "Przeszukiwanie pakietów..."
-
--#: cli/search.c:624
-+#: cli/search.c:636
- msgid "_interrupted."
- msgstr "_przerwano"
-
--#: cli/search.c:630
-+#: cli/search.c:641
- msgid "_done."
- msgstr "_zrobione."
-
--#: cli/shell.c:53
-+#: cli/shell.c:54
- msgid "Exit poldek"
- msgstr "Zamknij poldka"
-
--#: cli/shell.c:434
-+#: cli/shell.c:503
- msgid "not a tty"
- msgstr "to nie jest terminal"
-
--#: cli/shell.c:456
-+#: cli/shell.c:525
- #, c-format
- msgid ""
- "\n"
-@@ -1044,249 +1127,249 @@ msgstr ""
- "Witaj w poldkowym trybie interaktywnym. Wpisz \"help\" aby otrzymaæ pomoc.\n"
- "\n"
-
--#: cli/su.c:91
-+#: cli/su.c:92
- #, c-format
- msgid "%s: could not retrieve account (%m)"
- msgstr "%s: nie mo¿na u¿yæ konta (%m)"
-
--#: cli/su.c:104
-+#: cli/su.c:105
- #, c-format
- msgid "setgid %s: %m"
- msgstr "setgid %s: %m"
-
--#: cli/su.c:109
-+#: cli/su.c:110
- #, c-format
- msgid "setuid %s: %m"
- msgstr "setuid %s: %m"
-
--#: cli/su.c:114
-+#: cli/su.c:115
- #, c-format
- msgid "chdir %s: %m"
- msgstr "chdir %s: %m"
-
--#: cli/su.c:118
-+#: cli/su.c:119
- #, c-format
- msgid "Running as user '%s'\n"
- msgstr "Uruchamianie jako u¿ytkownik %s\n"
-
--#: cli/uninstall.c:43
-+#: cli/uninstall.c:44
- msgid "Do not remove, but tell if it would work or not"
- msgstr "Nie usuwaj, ale powiedz czy by siê uda³o, czy nie"
-
--#: cli/uninstall.c:45
-+#: cli/uninstall.c:46
- msgid "Remove only selected packages"
- msgstr "Usuñ tylko zaznaczone pakiety"
-
--#: cli/uninstall.c:47
-+#: cli/uninstall.c:48
- msgid "Ignore broken dependencies"
- msgstr "Ignoruj niespe³nione zale¿no¶ci"
-
--#: cli/uninstall.c:50
-+#: cli/uninstall.c:51
- msgid "Remove packages required by selected ones if possible."
- msgstr "Usuñ pakiety wymagane przez usuniête pakiety, je¿eli jest to mo¿liwe"
-
--#: cli/uninstall.c:53
-+#: cli/uninstall.c:54
- msgid "pass option OPTION to PM binary (ex. --pmop noscripts)"
- msgstr "przeka¿ opcjê OPCJA do binarki zarz±dcy pakietów"
-
--#: cli/uninstall.c:61
-+#: cli/uninstall.c:62
- msgid "Package deinstallation:"
- msgstr "Usuwanie pakietów:"
-
--#: cli/uninstall.c:62
-+#: cli/uninstall.c:63
- msgid "Uninstall given packages"
- msgstr "Usuñ podane pakiety"
-
--#: cli/uninstall.c:71
-+#: cli/uninstall.c:72
- msgid "Uninstall packages"
- msgstr "Deinstaluj pakiety"
-
--#: cli/uninstall.c:239
-+#: cli/uninstall.c:240
- #, c-format
- msgid "%s: installed packages are not loaded, type \"reload\" to load them"
--msgstr "%s: zainstalowane pakiety nie s± za³adowane, wpisz \"reload\" by je za³adowaæ"
-+msgstr ""
-+"%s: zainstalowane pakiety nie s± za³adowane, wpisz \"reload\" by je za³adowaæ"
-
--#: cli/uninstall.c:242
-+#: cli/uninstall.c:243
- #, c-format
- msgid "%s: installed packages are not loaded"
- msgstr "%s: zainstalowane pakiety nie s± za³adowane"
-
--#: conf.c:194
-+#: conf.c:195
- #, c-format
- msgid "%s:%d: missing '\"'"
- msgstr "%s:%d: brakuj±cy '\"'"
-
--#: conf.c:481
-+#: conf.c:482
- #, c-format
- msgid "%s %s::%s redefined"
- msgstr "%s %s::%s redefiniowany"
-
--#: conf.c:485
-+#: conf.c:486
- #, c-format
- msgid "%s: multiple '%s' not allowed"
- msgstr "%s: wielokrotne '%s' niedozwolone"
-
--#: conf.c:530
-+#: conf.c:531
- #, c-format
- msgid "%s unknown option '%s::%s'"
- msgstr "%s nieznana opcja '%s::%s'"
-
--#: conf.c:574
-+#: conf.c:575
- #, c-format
- msgid "%s invalid value of '%s::%s'"
- msgstr "%s niedozwolona warto¶æ '%s::%s'"
-
--#: conf.c:588
-+#: conf.c:589
- #, c-format
- msgid "%s invalid value '%s' of '%s::%s'"
- msgstr "%s niedozwolona warto¶æ '%s' opcji '%s::%s'"
-
--#: conf.c:816
-+#: conf.c:817
- #, c-format
- msgid "'%s': invalid section name"
- msgstr "'%s': nieprawid³owa nazwa sekcji"
-
--#: conf.c:883
-+#: conf.c:884
- #, c-format
- msgid "%s:%d: missing '='"
- msgstr "%s:%d: brak '='"
-
--#: conf.c:885
-+#: conf.c:886
- #, c-format
- msgid "%s: missing '='"
- msgstr "%s: brak '='"
-
--#: conf.c:1052
-+#: conf.c:1056
- #, c-format
- msgid "%s:%d: wrong %%includedir"
- msgstr "%s:%d: nieprawid³owa warto¶æ %%includedir"
-
--#: conf.c:1085
-+#: conf.c:1089
- #, c-format
- msgid "%s:%d: wrong %%include"
- msgstr "%s:%d: nieprawid³owa warto¶æ %%include"
-
--#: conf.c:1114
-+#: conf.c:1117
- #, c-format
- msgid "%s:%d: '%s': invalid section name"
- msgstr "%s:%d %s: nieprawid³owa nazwa sekcji"
-
--#: conf.c:1136
-+#: conf.c:1139
- #, c-format
- msgid "%s: skipped %s::%s"
- msgstr "%s: pominiêto %s::%s"
-
--#: conf.c:1140
-+#: conf.c:1143
- #, c-format
- msgid "-- %s EOF --"
- msgstr ""
-
--#: conf.c:1157
-+#: conf.c:1160
- #, c-format
- msgid "%s: load configuration failed"
- msgstr "%s: b³±d odczytu konfiguracji"
-
--#: conf.c:1256
-+#: conf.c:1259
- #, c-format
- msgid "%s: legacy configuration detected but ignored"
- msgstr "%s: stara konfiguracja wykryta ale pominiêta"
-
--#: conf.c:1411
-+#: conf.c:1414
- #, c-format
- msgid "invalid value ('%s') of integer option '%s'"
- msgstr "niedozwolona warto¶æ ('%s') dla opcji '%s'"
-
--#: conf.c:1428
-+#: conf.c:1431
- #, c-format
- msgid "invalid value ('%s') of boolean option '%s'"
- msgstr "niedozwolona warto¶æ ('%s') dla opcji '%s'"
-
--#: conf.c:1444
-+#: conf.c:1447
- #, c-format
- msgid "invalid value ('%s') of option '%s'"
- msgstr "niedozwolona warto¶æ ('%s') dla opcji '%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
- #, c-format
- msgid "%d file conflicts found"
- msgstr "wykryto %d konfliktów plików"
-
--#: fileindex.c:646
-+#: fileindex.c:647
- #, c-format
- msgid "[%d packages left]"
- msgstr "[pozosta³o %d pakietów]"
-
--#: fileindex.c:647
-+#: fileindex.c:648
- #, c-format
- msgid "%s: orphaned directory from %s"
- msgstr "%s: osierocone katalogi z %s"
-
--#: fileindex.c:650
-+#: fileindex.c:651
- #, c-format
- msgid "%d orphaned directories found"
- msgstr "Znaleziono %d osierocone katalogi"
-
--#: 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
- #, c-format
- msgid "%d semi-orphaned directories found"
- msgstr "Znaleziono %d czê¶ciowo osierocone katalogi"
-
--#: install-dist.c:101
-+#: install-dist.c:102
- #, c-format
- msgid "Need to get about %s of archives."
- msgstr "Potrzeba pobraæ oko³o %s archiwów."
-
--#: install-dist.c:105
-+#: install-dist.c:106
- #, c-format
- msgid " After unpacking about %s will be used."
- msgstr " Po rozpakowaniu oko³o %s bêdzie u¿yte."
-
--#: install-dist.c:119
-+#: install-dist.c:120
- #, c-format
- msgid "Installing #%d package of total %d (%s left to get)\n"
- msgstr "Instalacja #%d pakietu z %d (%s pozosta³o do pobrania)\n"
-
--#: install-dist.c:172
-+#: install-dist.c:173
- msgid "Interrupted"
- msgstr "Przerwano"
-
--#: install-dist.c:197
-+#: install-dist.c:198
- #, c-format
- msgid "Done, %d packages were installed.\n"
- msgstr "Zrobione, zainstalowano %d pakietów.\n"
-
--#: install-dist.c:200
-+#: install-dist.c:201
- msgid "There were errors during install"
- msgstr "Wyst±pi³y b³êdy podczas instalacji"
-
--#: install-dist.c:252
-+#: install-dist.c:253
- msgid "Buggy package set"
- msgstr "Zarobaczony zestaw pakietów"
-
--#: install3/conflicts.c:205
--#: install3/conflicts.c:208
-+#: install3/conflicts.c:205 install3/conflicts.c:208
- #, c-format
- msgid "%s (cnfl %s) conflicts with installed %s"
- msgstr "%s (cnfl %s) jest w konflicie z zainstalowanm %s"
-@@ -1316,8 +1399,7 @@ msgstr "%s: pakiet zbudowano dla innej architektury (%s)"
- msgid "%s: package is for a different operating system (%s)"
- msgstr "%s: pakiet zbudowano dla innego systemu operacyjnego (%s)"
-
--#: install3/install.c:162
--#: uninstall.c:667
-+#: install3/install.c:162 uninstall.c:668
- #, c-format
- msgid "%d unresolved dependency"
- msgid_plural "%d unresolved dependencies"
-@@ -1325,41 +1407,37 @@ msgstr[0] "%d niespe
- msgstr[1] "%d niespe³nione zale¿no¶ci"
- msgstr[2] "%d niespe³nionych zale¿no¶ci"
-
--#: 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 "Przetwarzanie zale¿no¶ci..."
-
--#: install3/misc.c:79
-+#: install3/misc.c:92
- #, c-format
- msgid "%s: multiple instances installed, give up"
- msgstr "%s: wielokrotnie zainstalowany, poddajê siê"
-
--#: install3/misc.c:110
-+#: install3/misc.c:123
- #, c-format
- msgid "%s: refusing to upgrade held package"
- msgstr "%s: odmawiam aktualizacji wstrzymanego (hold) pakietu"
-
--#: install3/obsoletes.c:244
-+#: install3/obsoletes.c:245
- #, c-format
- msgid "%s obsoleted by %s"
- msgstr "%s zostanie zast±piony przez %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
- #, c-format
- msgid "%s: %s version of %s is installed (%s), skipped"
- msgstr "%s: %s wersji pakietu %s jest zainstalowanych (%s), pominiêto"
-
--#: 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 "Nie ma roboty"
-
-@@ -1390,78 +1468,74 @@ msgstr "'osierocony' "
- msgid "%s%s marks %s (%s %s)"
- msgstr "%s%s zaznaczy³ %s (%s %s)"
-
--#: install3/requirements.c:433
-+#: install3/requirements.c:441
- #, c-format
- msgid "%s is required by installed %s, give up"
- msgstr "%s jest wymagany przez zainstalowany pakiet %s, poddajê siê"
-
--#: install3/requirements.c:435
-+#: install3/requirements.c:443
- #, c-format
- msgid "%s is required by installed %s"
- msgstr "%s jest wymagany przez zainstalowany pakiet %s"
-
--#: install3/requirements.c:581
-+#: install3/requirements.c:589
- #, c-format
- msgid "%s: req %s not found, upgrade rpm"
- msgstr "%s: nie znaleziono wymaganej w³a¶no¶ci rpm (%s), aktualizuj rpm"
-
--#: install3/requirements.c:583
-+#: install3/requirements.c:591
- #, c-format
- msgid "%s: req %s not found"
- msgstr "%s: nie znaleziono wymaganego %s"
-
--#: install3/requirements.c:638
-+#: install3/requirements.c:658
- #, c-format
- msgid "%s: suggested %s not found, skipped"
--msgstr "%s: nie znaleziono sugerowanego %s, pominiête"
-+msgstr "%s: nie znaleziono sugerowanego %s, pominiêto"
-
--#: 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: nie ma takiego ¼ród³a"
-
--#: lib_init.c:1069
-+#: lib_init.c:1070
- msgid "I'm set*id'ed, give up"
--msgstr "Mam ustawiony bit suid/sgid, wymiêkam"
-+msgstr "Mam ustawiony bit suid/sgid, poddajê siê"
-
--#: lib_init.c:1074
-+#: lib_init.c:1075
- msgid "Running me as root is not a good habit"
- msgstr "Uruchamianie mnie jako root jest z³ym nawykiem"
-
--#: lib_init.c:1539
-+#: lib_init.c:1540
- msgid "RPM works in multilib mode, while poldek not"
- msgstr "RPM dzia³a w trybie multilib, a poldek nie"
-
--#: lib_init.c:1543
-+#: lib_init.c:1544
- msgid "poldek works in multilib mode, while rpm not"
- msgstr "poldek dzia³a w trybie multilib, a RPM nie"
-
--#: lib_pkgset.c:76
--#: pm/pset/pset.c:200
-+#: lib_pkgset.c:79 pm/pset/pset.c:200
- msgid "no packages loaded"
- msgstr "nie za³adowano ¿adnych pakietów"
-
--#: log.c:249
--#: log.c:283
-+#: log.c:251 log.c:285
- msgid "error: "
- msgstr "b³±d: "
-
--#: log.c:253
--#: log.c:286
-+#: log.c:255 log.c:288
- msgid "warn: "
- msgstr "uwaga: "
-
--#: log.c:257
-+#: log.c:259
- msgid "notice: "
--msgstr "uwaga: "
-+msgstr "powiadomienie: "
-
--#: misc.c:301
-+#: misc.c:302
- #, c-format
- msgid "%s: mkdir: permission denied"
- msgstr "%s: mkdir: brak dostêpu"
-
--#: misc.c:348
-+#: misc.c:349
- #, c-format
- msgid "%d package"
- msgid_plural "%d packages"
-@@ -1469,39 +1543,37 @@ msgstr[0] "%d pakiet"
- msgstr[1] "%d pakiety"
- msgstr[2] "%d pakietów"
-
--#: pkgcmp.c:345
-+#: pkgcmp.c:355
- #, c-format
- msgid "duplicated name %s"
- msgstr "zdublowana nazwa %s"
-
--#: pkgcmp.c:372
--#: pkgcmp.c:392
-+#: pkgcmp.c:382 pkgcmp.c:402
- #, c-format
- msgid "%s%s%s: removed duplicate package"
- msgstr "%s%s%s: usuniêto zdublowany pakiet"
-
--#: 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
- #, c-format
- msgid "%s: read header failed, skipped"
- msgstr "%s: odczyt nag³ówka siê nie powiód³"
-
--#: 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
- #, c-format
- msgid "%s: loading header..."
- msgstr "%s: ³adowanie nag³ówków..."
-
--#: pkgdir/pdir/digest.c:175
--#: pkgdir/pndir/digest.c:137
-+#: pkgdir/pdir/digest.c:175 pkgdir/pndir/digest.c:137
- #, c-format
- msgid "%s: broken digest file (%d)"
- msgstr "%s: uszkodzony plik z sum± kontroln± (%d)"
-@@ -1519,15 +1591,12 @@ msgstr "Weryfikacja %s..."
- msgid "BROKEN"
- msgstr "USZKODZONY"
-
--#: pkgdir/pdir/digest.c:483
--#: pkgdir/pdir/digest.c:484
-+#: pkgdir/pdir/digest.c:483 pkgdir/pdir/digest.c:484
- #, c-format
- msgid "Writing digest %s..."
- msgstr "Zapisywanie sumy kontrolnej %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
- #, c-format
- msgid "%s: desynchronized index, try --upa"
- msgstr "%s: rozsynchronizowany indeks, spróbuj opcji --upa"
-@@ -1543,10 +1612,10 @@ msgstr "uszkodzony index: spr
-
- #: pkgdir/pdir/pdir.c:243
- msgid "assuming index is not fully downloaded, retrying..."
--msgstr "zak³adam, ¿e indeks nie jest ¶ci±gniêty w ca³o¶ci, ponawiam pobieranie..."
-+msgstr ""
-+"zak³adam, ¿e indeks nie jest ¶ci±gniêty w ca³o¶ci, ponawiam pobieranie..."
-
--#: pkgdir/pdir/pdir.c:326
--#: pkgdir/pndir/update.c:237
-+#: pkgdir/pdir/pdir.c:326 pkgdir/pndir/update.c:237
- #, c-format
- msgid "%s: broken patch list"
- msgstr "%s: uszkodzona lista ³atek"
-@@ -1556,46 +1625,37 @@ msgstr "%s: uszkodzona lista
- msgid "%s: no patches available"
- msgstr "%s: nie odnaleziono ³at"
-
--#: 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: odczyt siê nie powiód³"
-
--#: pkgdir/pdir/pdir.c:461
--#: pkgdir/pndir/update.c:338
-+#: pkgdir/pdir/pdir.c:461 pkgdir/pndir/update.c:432
- #, c-format
- msgid "Applying %s..."
- msgstr "Nak³adanie ³aty %s..."
-
--#: pkgdir/pdir/pdir.c:505
--#: pkgdir/pndir/pndir.c:377
-+#: pkgdir/pdir/pdir.c:505 pkgdir/pndir/pndir.c:377
- #, c-format
- msgid "%s: invalid version string %s"
- msgstr "%s: nieprawid³owy zapis wersji %s"
-
--#: pkgdir/pdir/pdir.c:510
--#: pkgdir/pndir/pndir.c:382
-+#: pkgdir/pdir/pdir.c:510 pkgdir/pndir/pndir.c:382
- #, c-format
- msgid "%s: unsupported version %s (%d.x is required)"
- msgstr "%s: nieobs³iwana wersja %s (wymagana jest wersja %d.x)"
-
--#: pkgdir/pdir/pdir.c:514
--#: pkgdir/pndir/pndir.c:386
--#, c-format
-+#: pkgdir/pdir/pdir.c:514 pkgdir/pndir/pndir.c:386
-+#, fuzzy, c-format
- msgid "%s: unsupported version %s (upgrade the poldek)"
--msgstr "%s: wersja %s nie jest nieobs³ugiwana (poldek wywmaga aktualizacji)"
-+msgstr "%s: wersja %s nie jest nieobs³ugiwana (poldek wymaga aktualizacji)"
-
--#: pkgdir/pdir/pdir.c:587
--#: pkgdir/pndir/pndir.c:399
-+#: pkgdir/pdir/pdir.c:587 pkgdir/pndir/pndir.c:399
- #, c-format
- msgid "%s: broken index (empty %s tag)"
- msgstr "%s: uszkodzony indeks (pusty %s)"
-
--#: pkgdir/pdir/pdir.c:641
--#: pkgdir/pndir/pndir.c:431
--#: pkgdir/pndir/pndir.c:451
-+#: pkgdir/pdir/pdir.c:641 pkgdir/pndir/pndir.c:431 pkgdir/pndir/pndir.c:451
- #, c-format
- msgid "%s: not a poldek index file"
- msgstr "%s: nie jest to poldkowy indeks"
-@@ -1605,8 +1665,7 @@ msgstr "%s: nie jest to poldkowy indeks"
- msgid "%s: missing '%s' tag"
- msgstr "%s: brak '%s'"
-
--#: pkgdir/pdir/pdir_pkg_restore.c:177
--#: pkgdir/pdir/pdir_pkg_restore.c:214
-+#: pkgdir/pdir/pdir_pkg_restore.c:177 pkgdir/pdir/pdir_pkg_restore.c:214
- #, c-format
- msgid "%s:%ld: syntax error"
- msgstr "%s:%ld: b³±d sk³adniowy"
-@@ -1616,14 +1675,12 @@ msgstr "%s:%ld: b
- msgid "%s:%ld:%s ':' expected"
- msgstr "%s:%ld:%s oczekiwany ':'"
-
--#: 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: interpertacja siê nie powiod³a"
-
--#: 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 "b³±d odczytu danych z %s"
-@@ -1633,8 +1690,7 @@ msgstr "b
- msgid "pdir: %s%s%s: removed duplicate package"
- msgstr "pdir: %s%s%s: usuniêto zdublowany pakiet"
-
--#: pkgdir/pdir/save.c:233
--#: pkgdir/pkgdir.c:732
-+#: pkgdir/pdir/save.c:233 pkgdir/pkgdir.c:732
- #, c-format
- msgid "removed %d duplicate package"
- msgid_plural "removed %d duplicate packages"
-@@ -1642,9 +1698,7 @@ msgstr[0] "usuni
- msgstr[1] "usuniêto %d zdublowane pakiety"
- msgstr[2] "usuniêto %d zdublowanych pakietów"
-
--#: pkgdir/pdir/save.c:313
--#: pkgdir/pdir/save.c:314
--#: pkgdir/pndir/save.c:666
-+#: pkgdir/pdir/save.c:313 pkgdir/pdir/save.c:314 pkgdir/pndir/save.c:666
- #: pkgdir/pndir/save.c:667
- #, c-format
- msgid "Writing %s..."
-@@ -1660,78 +1714,73 @@ msgstr "%s: b
- msgid "Removing outdated diff %s"
- msgstr "Usuwanie przedawnionego pliku ró¿nicowego %s"
-
--#: pkgdir/pkg_restore.c:198
--#: pkgdir/pkg_restore.c:246
-+#: pkgdir/pkg_restore.c:199 pkgdir/pkg_restore.c:247
- #, c-format
- msgid "%s:%lu: syntax error"
- msgstr "%s:%lu: b³±d sk³adniowy"
-
--#: pkgdir/pkgdir.c:269
-+#: pkgdir/pkgdir.c:270
- #, c-format
- msgid "%s: unknown index type"
- msgstr "%s: nieznany typ indeksu"
-
--#: pkgdir/pkgdir.c:298
-+#: pkgdir/pkgdir.c:299
- #, c-format
- msgid "%s: this type of source is not updateable"
- msgstr "%s: tego typu ¼ród³a nie mo¿na aktualizowaæ"
-
--#: pkgdir/pkgdir.c:308
--#: pkgdir/pkgdir.c:334
-+#: pkgdir/pkgdir.c:309 pkgdir/pkgdir.c:335
- #, c-format
- msgid "%s is up to date"
- msgstr "%s jest aktualny"
-
--#: pkgdir/pkgdir.c:345
-+#: pkgdir/pkgdir.c:346
- #, c-format
- msgid "%s: desynchronized index, trying to update whole index..."
- msgstr "%s: uaktualnienie nie powiod³o siê, próbujê pobraæ ca³y indeks..."
-
--#: pkgdir/pkgdir.c:634
--#: pkgdir/pkgdir.c:636
-+#: pkgdir/pkgdir.c:634 pkgdir/pkgdir.c:636
- #, c-format
- msgid "Loading [%s]%s..."
- msgstr "Wczytywanie [%s]%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
- #, c-format
- msgid "%s: repository could not be created (missing feature)"
- msgstr "%s: tego typu ¼ród³a nie mo¿na aktualizowaæ"
-
- #: pkgdir/pkgdir.c:983
--#, c-format
-+#, fuzzy, c-format
- msgid "clock skew detected; create index with fake timestamp (orig %lu > %lu)"
--msgstr "wykryto przekrêcenie zegara; utworzono indeks z oszukanym czasem %lu %lu"
-+msgstr ""
-+"wykryto przekrêcenie zegara; utworzono indeks z oszukanym czasem (%lu > %lu)"
-
- #: pkgdir/pkgdir.c:1004
- #, c-format
- msgid "%s: index not changed, not saved"
- msgstr "%s: indeks nie zmieni³ siê, nie zapisujê"
-
--#: pkgdir/pkgdir_clean.c:49
-+#: pkgdir/pkgdir_clean.c:50
- #, c-format
- msgid " Removing %s"
- msgstr " Usuwanie %s"
-
--#: pkgdir/pkgdir_clean.c:85
--#: pkgdir/pkgdir_clean.c:123
-+#: pkgdir/pkgdir_clean.c:86 pkgdir/pkgdir_clean.c:124
- #, c-format
- msgid "Cleaning up %s..."
- msgstr "Czyszczenie %s..."
-
--#: pkgdir/pkgdir_dirindex.c:390
-+#: pkgdir/pkgdir_dirindex.c:402
- #, c-format
- msgid "%s: invalid directory index"
- msgstr "%s: nieprawid³owy indeks katalogu"
-
--#: pkgdir/pkgdir_dirindex.c:512
-+#: pkgdir/pkgdir_dirindex.c:530
- #, c-format
- msgid "%s: broken directory index"
- msgstr "%s: uszkodzony indeks katalogu"
-
--#: pkgdir/pkgdir_dirindex.c:621
-+#: pkgdir/pkgdir_dirindex.c:641
- #, c-format
- msgid "%s: outdated directory index"
- msgstr "%s: przestarza³y indeks katalogu"
-@@ -1762,9 +1811,9 @@ msgid "%s:%s: failed to parse evr string"
- msgstr "%s:%s: nie uda³o siê zinterpretowaæ ci±gu evr"
-
- #: pkgdir/pndir/save.c:440
--#, c-format
-+#, fuzzy, c-format
- msgid "vaccum: %s: format error"
--msgstr "%s: b³êdny format"
-+msgstr "wyci±gam: %s: b³êdny format"
-
- #: pkgdir/pndir/save.c:464
- #, c-format
-@@ -1776,113 +1825,114 @@ msgstr "Usuwanie przedawnionego %s"
- msgid " Writing '%s' descriptions %s..."
- msgstr "Zapisywanie '%s' opisów %s..."
-
--#: pkgdir/pndir/update.c:307
--#, c-format
-+#: pkgdir/pndir/update.c:366
-+#, fuzzy
-+msgid "Index patches size too big\n"
-+msgstr "Zbyt du¿o ³atek indeksu"
-+
-+#: pkgdir/pndir/update.c:367
-+#, fuzzy
-+msgid "Retrieving whole index ...\n"
-+msgstr "Pobieranie ca³ego indeksu...\n"
-+
-+#: pkgdir/pndir/update.c:401
-+#, fuzzy, c-format
- msgid "Check diff (ts = %ld, %ld) %s (searching %s)\n"
--msgstr ""
-+msgstr "Sprawdzana ³ata (ts = %ld, %ld) %s (szukana %s)\n"
-
--#: pkgdir/pndir/update.c:315
-+#: pkgdir/pndir/update.c:409
- #, c-format
- msgid "%s: no patches available(fake)"
- msgstr "%s: nie odnaleziono ³at"
-
--#: pkgdir/rpmdb/rpmdb.c:192
-+#: pkgdir/rpmdb/rpmdb.c:191
- #, c-format
- msgid "Loading db packages%s%s%s..."
- msgstr "£adowanie pakietów z bazy%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: %s nieznana opcja"
-
--#: pkgdir/source.c:140
-+#: pkgdir/source.c:147
- #, c-format
- msgid "%s%sinvalid value ('%s') for option '%s'"
- msgstr "%s%sniedozwolona warto¶æ ('%s') dla opcji '%s'"
-
--#: pkgdir/source.c:660
-+#: pkgdir/source.c:672
- #, c-format
- msgid "removed duplicated source %s%s%s"
- msgstr "usuniêto zdublowane '¼ród³o' %s%s%s"
-
--#: pkgdir/source.c:720
-+#: pkgdir/source.c:732
- #, c-format
- msgid "%s: this type (%s) of source is not updateable"
- msgstr "%s: ¼ród³a typu (%s) nie mo¿na aktualizowaæ"
-
--#: pkgdir/source.c:727
--#, c-format
-+#: pkgdir/source.c:739
-+#, fuzzy, c-format
- msgid "%s: this type (%s) of source is not updateable; use --upa to refresh it"
--msgstr "%s: ¼ród³a typu %s nie mo¿na aktualizowaæ przyrostowo; u¿yj --upa by pobraæ go raz jeszcze"
-+msgstr ""
-+"%s: ¼ród³a typu %s nie mo¿na aktualizowaæ przyrostowo; u¿yj --upa by go "
-+"zaktualizowaæ"
-
--#: pkgdir/source_mkidx.c:246
-+#: pkgdir/source_mkidx.c:247
- #, c-format
- msgid "%s: unable to write remote index"
- msgstr "%s: nie uda³o siê zapisaæ zdalnego indeksu"
-
--#: pkgdir/source_mkidx.c:254
-+#: pkgdir/source_mkidx.c:255
- #, c-format
- msgid "%s: refusing to overwrite index"
- msgstr "%s: odmawiam nadpisania indeksu"
-
--#: pkgdir/yum/yum.c:160
--#: pkgdir/yum/yum.c:170
--#: pkgdir/yum/yum.c:181
-+#: pkgdir/yum/yum.c:160 pkgdir/yum/yum.c:170 pkgdir/yum/yum.c:181
- #, c-format
- msgid "%s:%d syntax error"
- msgstr "%s:%d b³±d sk³adniowy"
-
--#: pkgfetch.c:98
-+#: pkgfetch.c:99
- #, c-format
- msgid "Need to get %s of archives"
- msgstr "Potrzeba pobraæ %s archiwów"
-
--#: pkgfetch.c:105
-+#: pkgfetch.c:106
- #, c-format
- msgid "_ (%s to download)."
- msgstr "_ (%s do pobrania)."
-
--#: pkgfetch.c:111
--#, c-format
--msgid "After unpacking %s will be used."
--msgstr "Po rozpakowaniu %s bêdzie u¿yte."
--
--#: pkgfetch.c:163
--#: pkgfetch.c:262
-+#: pkgfetch.c:160 pkgfetch.c:263
- #, c-format
- msgid "%s: MD5 signature verification failed"
- msgstr "%s: suma kontrolna MD5 siê nie zgadza"
-
--#: pkgmark.c:212
-+#: pkgmark.c:213
- #, c-format
- msgid "%s marks %s (cap %s)"
- msgstr "%s zaznaczy³ %s (cap %s)"
-
--#: pkgmark.c:350
-+#: pkgmark.c:351
- #, c-format
- msgid "%s: conflicts with %s"
- msgstr "%s: jest w konflicie z %s"
-
--#: pkgmark.c:358
-+#: pkgmark.c:359
- #, c-format
- msgid "%d conflicts found"
- msgstr "znaleziono %d konfliktów"
-
--#: 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
- #, c-format
- msgid "trying to scan directory %s..."
- msgstr "próbujê odczytaæ katalog %s..."
-
--#: pkgset-load.c:64
--#, c-format
-+#: pkgset-load.c:70
-+#, fuzzy, c-format
- msgid "%s: load failed, skipped"
--msgstr "%s: za³adunek siê nie powiód³, pominiêto"
-+msgstr "%s: ³adowanie siê nie powiód³o, pominiêto"
-
--#: pkgset-load.c:122
-+#: pkgset-load.c:131
- #, c-format
- msgid "%d package read"
- msgid_plural "%d packages read"
-@@ -1890,16 +1940,15 @@ msgstr[0] "Przeczytano %d pakiet"
- msgstr[1] "Przeczytano %d pakiety"
- msgstr[2] "Przeczytano %d pakietów"
-
--#: pkgset-order.c:142
-+#: pkgset-order.c:143
- msgid "Requires(pre) loop: "
- msgstr "Zapêtlenie zale¿no¶ci: "
-
--#: pkgset-order.c:278
-+#: pkgset-order.c:279
- msgid "Verifying packages ordering..."
- msgstr "Sprawdzanie kolejno¶ci pakietów..."
-
--#: pkgset-order.c:283
--#: pkgset.c:382
-+#: pkgset-order.c:284 pkgset.c:390
- #, c-format
- msgid "%d prerequirement loop detected"
- msgid_plural "%d prerequirement loops detected"
-@@ -1907,16 +1956,16 @@ msgstr[0] "Wykryto %d zap
- msgstr[1] "Wykryto %d zapêtlenia zale¿no¶ci"
- msgstr[2] "Wykryto %d zapêtleñ zale¿no¶ci"
-
--#: pkgset-order.c:288
--#: pkgset.c:387
-+#: pkgset-order.c:289 pkgset.c:395
-+#, fuzzy
- msgid "No loops -- OK"
--msgstr "Brak zapêtleñ -- To dobrze"
-+msgstr "Brak zapêtleñ -- OK"
-
--#: pkgset-req.c:121
-+#: pkgset-req.c:124
- msgid "Packages with unsatisfied dependencies:"
- msgstr "Pakiety z niespe³nionymi zale¿no¶ciami:"
-
--#: pkgset-req.c:162
-+#: pkgset-req.c:166
- msgid ""
- "\n"
- "Verifying dependencies..."
-@@ -1924,37 +1973,38 @@ msgstr ""
- "\n"
- "Sprawdzanie zale¿no¶ci..."
-
--#: 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
-+#, fuzzy
- msgid "No unsatisfied dependencies detected -- OK"
--msgstr "Brak niespe³nionych zale¿no¶ci -- To dobrze"
-+msgstr "Brak niespe³nionych zale¿no¶ci -- OK"
-
--#: pkgset-req.c:235
--#, c-format
-+#: pkgset-req.c:240
-+#, fuzzy, c-format
- msgid "%d unsatisfied dependencies, %d packages cannot be installed"
--msgstr "%d niespe³nionych zale¿no¶ci, %d pakiet(ów)"
-+msgstr ""
-+"%d niespe³nionych zale¿no¶ci, %d pakiet(ów) nie mo¿e zostaæ zainstalowanych"
-
--#: pkgset-req.c:388
-+#: pkgset-req.c:393
- #, c-format
- msgid "%s: provides rpmlib cap \"%s\""
- msgstr "%s zawiera rpmlib()ow± w³asno¶æ \"%s\""
-
--#: 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"
-@@ -1962,7 +2012,7 @@ msgstr[0] "Usuni
- msgstr[1] "Usuniêto %d zdublowane pakiety z listy dostêpnych"
- msgstr[2] "Usuniêto %d zdublowanych pakietów z listy dostêpnych"
-
--#: pkgset.c:372
-+#: pkgset.c:380
- msgid ""
- "\n"
- "Verifying (pre)requirements..."
-@@ -1970,47 +2020,47 @@ msgstr ""
- "\n"
- "Sprawdzanie \"pre\" wymagañ..."
-
--#: pkgset.c:394
-+#: pkgset.c:402
- msgid "Installation order:\n"
- msgstr "Kolejno¶æ instalacji:\n"
-
--#: pkgset.c:609
-+#: pkgset.c:617
- #, c-format
- msgid "%s: req %s %s"
- msgstr "%s: req %s %s"
-
--#: pkgset.c:611
-+#: pkgset.c:619
- msgid "version mismatch"
- msgstr "niezgodno¶æ wersji"
-
--#: pkgset.c:611
-+#: pkgset.c:619
- msgid "not found"
- msgstr "nie znaleziono"
-
--#: pkgset.c:618
-+#: pkgset.c:626
- #, c-format
- msgid "%d unsatisfied dependencies found"
- msgstr "Znaleziono %d niespe³nionych zale¿no¶ci"
-
--#: pkgset.c:620
-+#: pkgset.c:628
-+#, fuzzy
- msgid "No unsatisfied dependencies found"
--msgstr "Nie znaleziono niespe³nionych zale¿no¶ci"
-+msgstr "Brak niespe³nionych zale¿no¶ci"
-
--#: pkgset.c:675
--#: pkgset.c:745
--#, c-format
-+#: pkgset.c:683 pkgset.c:753
-+#, fuzzy, c-format
- msgid "%s: open failed: %m"
--msgstr "%s: nie powiód³ siê odczyt %m"
-+msgstr "%s: nie mo¿na otworzyæ: %m"
-
--#: pkgset.c:700
--#, c-format
-+#: pkgset.c:708
-+#, fuzzy, c-format
- msgid "Graph saved as %s"
--msgstr ""
-+msgstr "Graf zapisany jako %s"
-
--#: pkgset.c:757
--#, c-format
-+#: pkgset.c:765
-+#, fuzzy, c-format
- msgid "LanVi graph saved as %s"
--msgstr ""
-+msgstr "Graf LanVi zapisany jako %s"
-
- #: pm/pset/pset.c:160
- #, c-format
-@@ -2022,9 +2072,9 @@ msgid "Could not open 'pset' database: missing source parameter"
- msgstr "Nie mo¿na otworzyæ bazy 'pset': brak parametru ¼ród³a"
-
- #: pm/pset/pset.c:587
--#, c-format
-+#, fuzzy, c-format
- msgid "%s: recno is set, should not happen"
--msgstr ""
-+msgstr "%s: recno ustwione, nie powinno sie to zdarzyæ"
-
- #: pm/pset/pset.c:603
- #, c-format
-@@ -2085,14 +2135,14 @@ msgstr "%s: instalacja si
- msgid "%s: installation failed (retcode=%d)"
- msgstr "%s: instalacja siê nie powiod³a (kod b³êdu = %d)"
-
--#: pm/rpm/misc.c:124
-+#: pm/rpm/misc.c:128
- msgid "Loading internal capabilities"
- msgstr "£adowanie wewnêtrznych w³a¶ciwo¶ci"
-
- #: pm/rpm/rpm.c:123
--#, c-format
-+#, fuzzy, c-format
- msgid "%s: invalid macro definition"
--msgstr "%s: nieprawid³owa definicja makra"
-+msgstr "%s: nieprawid³owa makrodefinicja"
-
- #: pm/rpm/rpm.c:208
- #, c-format
-@@ -2141,9 +2191,9 @@ msgid "%s: missing %s in some packages"
- msgstr "%s: brak '%s' w niektórych pakietach"
-
- #: pm/rpm/rpm_pkg_ld.c:491
--#, c-format
-+#, fuzzy, c-format
- msgid "%s: read name/version/release failed"
--msgstr "%s: odczyt nazwy/wersji/release nie uda³ siê"
-+msgstr "%s: odczyt nazwy/wersji/wydania nie powiód³ siê"
-
- #: pm/rpm/rpm_pkg_ld.c:501
- #, c-format
-@@ -2155,13 +2205,9 @@ msgstr "%s: brak tagu OS"
- msgid "Executing %s "
- msgstr "Uruchamianie %s "
-
--#: 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: nie ma takiego pliku"
-@@ -2171,27 +2217,22 @@ msgstr "%s: nie ma takiego pliku"
- msgid "%s exited with %d"
- msgstr "%s zakoñczony z rezultatem %d"
-
--#: pm/rpm/rpminstall.c:211
--#: vfile/p_open.c:205
--#, c-format
-+#: pm/rpm/rpminstall.c:211 vfile/p_open.c:206
-+#, fuzzy, c-format
- msgid "%s terminated by signal %s"
--msgstr "%s usieczon za spraw± sygna³u %s"
-+msgstr "%s zamkniêty za spraw± sygna³u %s"
-
--#: pm/rpm/rpminstall.c:214
--#: vfile/p_open.c:208
--#: vfile/vopen3.c:352
--#, c-format
-+#: pm/rpm/rpminstall.c:214 vfile/p_open.c:209 vfile/vopen3.c:353
-+#, fuzzy, c-format
- msgid "%s terminated by signal %d"
--msgstr "%s usieczon za spraw± sygna³u %d"
-+msgstr "%s zamkniêty za spraw± sygna³u %d"
-
- #: pm/rpm/rpminstall.c:219
- #, c-format
- msgid "%s died under inscrutable circumstances"
- msgstr "%s zgin±³ w podejrzanych okoliczno¶ciach"
-
--#: pm/rpm/rpminstall.c:302
--#: pm/rpm/rpminstall.c:318
--#: pm/rpm/rpminstall.c:485
-+#: pm/rpm/rpminstall.c:302 pm/rpm/rpminstall.c:318 pm/rpm/rpminstall.c:485
- #: pm/rpm/rpminstall.c:501
- #, c-format
- msgid "%s: command not found"
-@@ -2210,8 +2251,7 @@ msgstr "Wyst
- msgid "There were package coloring mismatches. Proceed?"
- msgstr "Wyst±pi³y b³êdy kolorów pakietów. Kontynuowaæ? [y/N]"
-
--#: pm/rpm/rpminstall.c:465
--#: pm/rpm/signature4.c:353
-+#: pm/rpm/rpminstall.c:465 pm/rpm/signature4.c:353
- #, c-format
- msgid "Executing%s..."
- msgstr "Uruchamianie%s..."
-@@ -2221,37 +2261,34 @@ msgstr "Uruchamianie%s..."
- msgid "Running%s..."
- msgstr "Uruchamianie%s..."
-
--#: pm/rpm/signature4.c:206
--#: pm/rpm/signature4.c:251
--#: pm/rpm/signature5.c:177
-+#: pm/rpm/signature4.c:206 pm/rpm/signature4.c:251 pm/rpm/signature5.c:177
- #, c-format
- msgid "%s: %s signature not found"
- msgstr "%s: %s nie znaleziono podpisu"
-
--#: poldek_term.c:193
-+#: poldek_term.c:195
- msgid "$TERM undefined"
- msgstr "niezdefiniowana zmienna $TERM"
-
--#: poldek_term.c:198
-+#: poldek_term.c:200
- #, c-format
- msgid "%s: unknown terminal"
- msgstr "%s: nieznana nazwa terminala"
-
--#: poldek_ts.c:644
--#: uninstall.c:398
-+#: poldek_ts.c:646 uninstall.c:399
- #, c-format
- msgid "mark %s"
- msgstr "zazn. %s"
-
--#: poldek_ts.c:849
-+#: poldek_ts.c:869
- msgid "to install"
- msgstr "do instalacji"
-
--#: poldek_ts.c:855
-+#: poldek_ts.c:875
- msgid "to remove"
- msgstr "do usuniêcia"
-
--#: poldek_ts.c:873
-+#: poldek_ts.c:894
- #, c-format
- msgid "There are %d package %s"
- msgid_plural "There are %d packages %s"
-@@ -2259,7 +2296,7 @@ msgstr[0] "Jest %d pakiet %s"
- msgstr[1] "S± %d pakiety %s"
- msgstr[2] "Jest %d pakietów %s"
-
--#: poldek_ts.c:878
-+#: poldek_ts.c:899
- #, c-format
- msgid " (%d marked by dependencies)"
- msgid_plural " (%d marked by dependencies)"
-@@ -2267,139 +2304,151 @@ msgstr[0] " (%d zaznaczony po
- msgstr[1] " (%d zaznaczone po¶rednio)"
- msgstr[2] " (%d zaznaczonych po¶rednio)"
-
--#: poldek_ts.c:882
-+#: poldek_ts.c:903
- #, c-format
- msgid ", %d to remove"
- msgstr ", %d do usuniêcia"
-
--#: poldek_ts.c:1038
-+#: poldek_ts.c:926
-+#, fuzzy, c-format
-+msgid "This operation will use %s of disk space."
-+msgstr "Ta operacja zajmie dodatkowe %s miejsca na dysku."
-+
-+#: poldek_ts.c:928
-+#, fuzzy, c-format
-+msgid "This operation will free %s of disk space."
-+msgstr "Ta operacja zwolni %s miejsca na dysku."
-+
-+#: poldek_ts.c:1069
- msgid "Verifying dependencies..."
- msgstr "Sprawdzanie zale¿no¶ci..."
-
--#: poldek_ts.c:1044
-+#: poldek_ts.c:1075
- #, c-format
- msgid "Generating dependency graph %s..."
- msgstr "Generowanie grafu zach³annych zale¿no¶ci %s..."
-
--#: poldek_ts.c:1057
-+#: poldek_ts.c:1088
- msgid "Verifying conflicts..."
- msgstr "Sprawdzanie konfliktów..."
-
--#: poldek_ts.c:1075
-+#: poldek_ts.c:1106
- msgid "Verifying file conflicts..."
- msgstr "Sprawdzanie konfliktów plikowych..."
-
--#: poldek_ts.c:1080
-+#: poldek_ts.c:1111
- msgid "Verifying file orphans..."
- msgstr "Sprawdzanie sierot plikowych..."
-
--#: poldek_ts.c:1085
-+#: poldek_ts.c:1116
- msgid "Verifying file semi-orphans (missing dependencies)..."
- msgstr "Sprawdzanie pliku pó³sierot (brakuj±ce zale¿no¶ci)..."
-
--#: split.c:137
-+#: split.c:138
- #, c-format
- msgid "%s:%d: syntax error near %s"
- msgstr "%s:%d: b³±d sk³adniowy w okolicach %s"
-
--#: split.c:173
-+#: split.c:174
- #, c-format
- msgid "%s: give up at %d"
- msgstr "%s: wymiêk³em przy linii %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 "podzia³ siê nie powiód³ -- rozmiar pakietów jest wiêkszy ni¿ zadany rozmiar czê¶ci"
-+msgstr ""
-+"podzia³ siê nie powiód³ -- rozmiar pakietów jest wiêkszy ni¿ zadany rozmiar "
-+"czê¶ci"
-
--#: split.c:416
-+#: split.c:417
- #, c-format
- msgid "Writing %s (%4d packages, %s (%lldb), pri min, max = %d, %d)"
- msgstr "Zapisywanie %s (%4d pakiety, %s (%lldb), pri min, max = %d, %d)"
-
--#: split.c:447
-+#: split.c:448
- #, c-format
- msgid "%s: no priorities loaded"
- msgstr "%s: brak za³adowanych priorytetów"
-
--#: split.c:467
-+#: split.c:468
- #, c-format
- msgid "split: assign %d pri to %s (mask %s)"
- msgstr ""
-
--#: split.c:479
-+#: split.c:480
-+#, fuzzy
- msgid "no maching priorities"
--msgstr ""
-+msgstr "brak wymaganego priorytetu"
-
--#: split.c:537
-+#: split.c:538
- msgid "no available packages found"
- msgstr "nie znaleziono dostêpnych pakietów"
-
--#: uninstall.c:198
-+#: uninstall.c:199
- #, c-format
- msgid " %s requires %s"
- msgstr " %s wymaga %s"
-
--#: uninstall.c:203
-+#: uninstall.c:204
- #, c-format
- msgid "%s marks orphaned %s (req %s)"
- msgstr "%s zaznaczy³ osierocony %s (wymaga %s)"
-
--#: uninstall.c:264
-+#: uninstall.c:265
- #, c-format
- msgid "%s (cap %s) is required by %s"
- msgstr "%s (w³. %s) jest wymagany przez %s"
-
--#: uninstall.c:295
-+#: uninstall.c:296
- #, c-format
- msgid "%s marks %s (req %s)"
- msgstr "%s zaznacza %s (wymaga %s)"
-
--#: uninstall.c:383
-+#: uninstall.c:384
- #, c-format
- msgid "freedbset %d %s"
- msgstr ""
-
--#: uninstall.c:537
-+#: uninstall.c:538
- #, c-format
- msgid "Trying %s\n"
- msgstr "Próbujê %s\n"
-
--#: uninstall.c:549
-+#: uninstall.c:550
- #, c-format
- msgid " Trying %s\n"
- msgstr " Próbujê %s...\n"
-
--#: uninstall.c:561
-+#: uninstall.c:562
- #, c-format
- msgid " Trying %s\n"
- msgstr " Próbujê %s...\n"
-
--#: 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: wielokrotnie zainstalowany, pominiêto"
-
--#: upgrade-dist.c:110
-+#: upgrade-dist.c:121
- #, c-format
- msgid "%s: skip held package"
- msgstr "%s: pomijam wstrzymany (hold) pakiet"
-
--#: upgrade-dist.c:132
-+#: upgrade-dist.c:143
- msgid "Looking up packages for upgrade..."
- msgstr "Szukam pakietów do aktualizacji..."
-
--#: vfile/extcompr.c:143
--#: vfile/fetch.c:464
-+#: vfile/extcompr.c:143 vfile/fetch.c:471
- msgid "program exited with non-zero value"
- msgstr "program zakoñczy³ siê z niezerowym wynikiem"
-
-@@ -2413,66 +2462,57 @@ msgstr "Dekompresja %s...\n"
- msgid "Compressing %s...\n"
- msgstr "Kompresja %s...\n"
-
--#: vfile/fetch.c:442
-+#: vfile/fetch.c:449
- #, c-format
- msgid "Running %s\n"
- msgstr "Uruchamianie %s\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) zgin±³ w podejrzanych okoliczno¶ciach"
-
--#: vfile/vfetch.c:149
-+#: vfile/vfetch.c:150
- #, c-format
- msgid "Retrying...(#%d)\n"
- msgstr "Ponowna próba...(#%d)\n"
-
--#: vfile/vfetch.c:243
--#: vfile/vfetch.c:302
-+#: vfile/vfetch.c:247 vfile/vfetch.c:311
- #, c-format
--msgid "Retrieving %s::%s...\n"
--msgstr "Pobieranie %s::%s...\n"
-+msgid "Retrieving %s%s::%s...\n"
-+msgstr "Pobieranie %s%s::%s...\n"
-
--#: vfile/vfetch.c:246
--#: vfile/vfetch.c:305
-+#: vfile/vfetch.c:250 vfile/vfetch.c:314
- #, c-format
--msgid "Retrieving %s...\n"
--msgstr "Pobieranie %s...\n"
-+msgid "Retrieving %s%s...\n"
-+msgstr "Pobieranie %s%s...\n"
-
--#: vfile/vfetch.c:367
-+#: vfile/vfetch.c:378
- #, c-format
- msgid "Retrieving status of %s...\n"
- msgstr "Pobieranie statusu %s...\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 "zapis do socketa %s: %m"
-
--#: vfile/vfff/ftp.c:169
--#: vfile/vfff/ftp.c:185
-+#: vfile/vfff/ftp.c:169 vfile/vfff/ftp.c:185
- #, c-format
- msgid "response parse error: %s"
- msgstr "b³±d interpretacji odpowiedzi: %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: b³±d interpretacji odpowiedzi"
-
--#: 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 "zbyt d³uga linia w odpowiedzi"
-
--#: vfile/vfff/ftp.c:348
--#: vfile/vfff/http.c:528
-+#: vfile/vfff/ftp.c:348 vfile/vfff/http.c:529
- msgid "unexpected EOF"
- msgstr "niespodziewany EOF"
-
-@@ -2482,11 +2522,11 @@ msgid "login failed: %s"
- msgstr "b³±d logowania: %s"
-
- #: vfile/vfff/ftp.c:461
-+#, fuzzy
- msgid "unknown error"
--msgstr "b³±d nieokre¶lony"
-+msgstr "nieokre¶lony b³±d"
-
--#: vfile/vfff/ftp.c:505
--#: vfile/vfff/ftp.c:538
-+#: vfile/vfff/ftp.c:505 vfile/vfff/ftp.c:538
- #, c-format
- msgid "%s: PASV response parse error"
- msgstr "%s: b³±d interpretacji odpowiedzi PASV"
-@@ -2497,65 +2537,65 @@ msgid "%s: address too long"
- msgstr "%s: zbyt d³ugi adres"
-
- #: vfile/vfff/ftp.c:719
--#, c-format
-+#, fuzzy, c-format
- msgid "%s: no such file (serv said: %s)"
--msgstr "%s: nie ma takiego pliku (odpowied¼ serwera: %s)"
-+msgstr "%s: nie ma takiego pliku (odp. serwera: %s)"
-
--#: vfile/vfff/http.c:682
-+#: vfile/vfff/http.c:686
- #, c-format
- msgid "%s: permission denied"
- msgstr "%s: brak dostêpu"
-
--#: vfile/vfff/http.c:686
-+#: vfile/vfff/http.c:690
- #, c-format
- msgid "%s: invalid range requested"
- msgstr "%s: podano nieprawid³owy zakres"
-
--#: vfile/vfff/http.c:861
-+#: vfile/vfff/http.c:865
- #, c-format
- msgid "Content-Length parse error (%s)"
- msgstr "B³±d interpretacji nag³ówka 'Content-Length' (%s)"
-
--#: vfile/vfff/http.c:990
-+#: vfile/vfff/http.c:994
- #, c-format
- msgid "%s: Content-Range parse error (%s)"
- msgstr "%s: b³±d interpretacji nag³ówka Content-Range (%s)"
-
--#: vfile/vfff/http.c:998
-+#: vfile/vfff/http.c:1002
- #, c-format
- msgid "%s: invalid Content-Range, truncate %s\n"
- msgstr "%s: nieprawid³owy Content-Range, usuniête %s\n"
-
--#: vfile/vfff/http.c:1008
--#, c-format
-+#: vfile/vfff/http.c:1012
-+#, fuzzy, c-format
- msgid "%s: already downloaded; mtime %s\n"
--msgstr "%s: ju¿ pobrany; mtime %s\n"
-+msgstr "%s: ju¿ pobrany; czas: %s\n"
-
--#: vfile/vfff/http.c:1015
-+#: vfile/vfff/http.c:1019
- #, c-format
- msgid "%s: invalid Content-Range reached"
- msgstr "%s: nieprawid³owy Content-Range"
-
--#: vfile/vfff/vfff.c:76
-+#: vfile/vfff/vfff.c:86
- msgid "connection cancelled"
- msgstr "po³±czenie anulowane"
-
--#: vfile/vfff/vfff.c:140
-+#: vfile/vfff/vfff.c:150
- #, c-format
- msgid "unable to connect to %s:%s: %s"
--msgstr "niemo¿no¶æ po³±czenia z %s:%s: %s"
-+msgstr "brak po³±czenia do %s:%s: %s"
-
--#: vfile/vfff/vfff.c:170
-+#: vfile/vfff/vfff.c:180
- #, c-format
- msgid "unable to connect to %s:%s: %m"
- msgstr "niemo¿no¶æ po³±czenia z %s:%s: %m"
-
--#: vfile/vflock.c:116
-+#: vfile/vflock.c:117
- #, c-format
- msgid "Waiting for lock %s...\n"
- msgstr "Oczekiwanie na blokadê %s...\n"
-
--#: vfile/vflock.c:147
-+#: vfile/vflock.c:148
- #, c-format
- msgid "%s: unable to obtain lock\n"
- msgstr "%s: nie mo¿na uzyskaæ blokady\n"
-@@ -2569,10 +2609,13 @@ msgstr "zrobione"
- msgid "%s: URL parse error\n"
- msgstr "%s: b³±d interpretacji URL-a\n"
-
--#: vfile/vopen3.c:349
-+#: vfile/vopen3.c:350
- #, c-format
- msgid "%s terminated by signal %d (%s)"
--msgstr "%s usieczon za spraw± sygna³u %d (%s)"
-+msgstr "%s zamkniety za spraw± sygna³u %d (%s)"
-+
-+#~ msgid "After unpacking %s will be used."
-+#~ msgstr "Po rozpakowaniu %s bêdzie u¿yte."
-
- #~ msgid "There are more than one package which provide \"%s\":"
- #~ msgstr "Wiêcej ni¿ jeden pakiet udostêpnia w³a¶ciwo¶æ \"%s\":"
-@@ -2601,7 +2644,6 @@ msgstr "%s usieczon za spraw
- #~ msgstr "Kontynuowaæ? [y/N]"
-
- #~ msgid "There are %d package to remove"
--
- #~ msgid_plural "There are %d packages to remove"
- #~ msgstr[0] "Zaznaczono %d pakiet do usuniêcia"
- #~ msgstr[1] "Zaznaczono %d pakiety do usuniêcia"
-@@ -2643,22 +2685,18 @@ msgstr "%s usieczon za spraw
- #~ msgid "%s: installation failed (hgw why)"
- #~ msgstr "%s: instalacja siê nie powiod³a (nie wiadomo dlaczego)"
-
--#, fuzzy
- #~ msgid "Show required directories"
- #~ msgstr "Poka¿ wymagane pakiety"
-
- #~ msgid "Sets compression type (none, bz2, gz)"
- #~ msgstr "Ustaw typ kompresji (none, bz2, gz)"
-
--#, fuzzy
- #~ msgid "%s: invalid destination specified"
- #~ msgstr "%s: nieprawid³owy zapis wersji %s"
-
--#, fuzzy
- #~ msgid "%s: unknown PM specified"
- #~ msgstr "%s: nieznana opcja"
-
--#, fuzzy
- #~ msgid "Nothing to doX"
- #~ msgstr "Nie ma roboty"
-
-@@ -2671,43 +2709,35 @@ msgstr "%s usieczon za spraw
- #~ msgid "Other:"
- #~ msgstr "Pozosta³e:"
-
--#, fuzzy
- #~ msgid "Run in cmd mode"
- #~ msgstr "Uruchom w trybie interaktywnym"
-
--#, fuzzy
- #~ msgid "Repository index creationX:"
- #~ msgstr "Tworzenie indeksu:"
-
--#, fuzzy
- #~ msgid "Verification options/switches:"
- #~ msgstr "Opcje weryfikacji zestawu pakietów:"
-
--#, fuzzy
- #~ msgid "Verify dependencies"
- #~ msgstr ""
- #~ "\n"
- #~ "Sprawdzanie zale¿no¶ci..."
-
--#, fuzzy
- #~ msgid "Remove packages ignoring broken dependencies"
- #~ msgstr "Instaluj pakiety z niespe³nionymi zale¿no¶ciami"
-
- #~ msgid "Don't uninstall, but tell if it would work or not"
- #~ msgstr "Nie deinstaluj, tylko sprawd¼ czy operacja przebiegnie pomy¶lnie"
-
--#, fuzzy
- #~ msgid "Don't remove packages orphaned by selected ones"
- #~ msgstr "Nie usuwaj pakietów wymaganych przez wybrane pakiety"
-
- #~ msgid "Be unconcerned"
- #~ msgstr "B±d¼ niefrasobliwy"
-
--#, fuzzy
- #~ msgid "Install packages with broken dependencies (applied to PM only)"
- #~ msgstr "Instaluj pakiety z niespe³nionymi zale¿no¶ciami"
-
--#, fuzzy
- #~ msgid "Source related actions:"
- #~ msgstr "Opcje dot. \"¼róde³\" pakietów:"
-
-@@ -2725,7 +2755,6 @@ msgstr "%s usieczon za spraw
- #~ msgid "so what?"
- #~ msgstr "no i?"
-
--#, fuzzy
- #~ msgid "%s: this type of source could not be created"
- #~ msgstr "%s: tego typu ¼ród³a nie mo¿na aktualizowaæ"
-
-@@ -2760,7 +2789,6 @@ msgstr "%s usieczon za spraw
- #~ msgid "duplicated %s"
- #~ msgstr "zdublowany %s"
-
--#, fuzzy
- #~ msgid "%s: no such packageXX"
- #~ msgstr "%s: nie ma takiego pakietu"
-
-@@ -2782,9 +2810,6 @@ msgstr "%s usieczon za spraw
- #~ msgid "Remove all source files from cache directory"
- #~ msgstr "Usuñ wszystkie lokalnie przechowywane pliki z danego ¼ród³a"
-
--#~ msgid "Verify options:"
--#~ msgstr "Opcje weryfikacji zestawu pakietów:"
--
- #~ msgid "Verify package dependencies"
- #~ msgstr "Sprawd¼ zale¿no¶ci"
-
-@@ -2859,7 +2884,6 @@ msgstr "%s usieczon za spraw
- #~ msgid "%s: req %s not matched"
- #~ msgstr "%s: nie dopasowano %s"
-
--#, fuzzy
- #~ msgid "%s: no such packageMM"
- #~ msgstr "%s: nie ma takiego pakietu"
-
-@@ -2888,7 +2912,6 @@ msgstr "%s usieczon za spraw
- #~ msgid "Just type \"reload\"\n"
- #~ msgstr "Po prostu daj \"reload\"\n"
-
--#, fuzzy
- #~ msgid "%s: %s: no such command"
- #~ msgstr "%s: nie ma takiej komendy"
-
-@@ -2901,11 +2924,9 @@ msgstr "%s usieczon za spraw
- #~ msgid "Applying patch %s..."
- #~ msgstr "Nak³adanie ³aty %s..."
-
--#, fuzzy
- #~ msgid "greedy and follow options are inclusive"
- #~ msgstr "opcje --greedy i --nofollow wykluczaj± siê"
-
--#, fuzzy
- #~ msgid "%s:%d: '%s': invalid value name"
- #~ msgstr "%s:%d %s: nieprawid³owa nazwa pakietu"
-
+++ /dev/null
-commit 4b027294335c0672311f021f2dc76edaab049b11
-Author: Marcin Banasiak <marcin.banasiak@gmail.com>
-Date: Sun Dec 13 20:50:11 2009 +0100
-
- Support for query format in ls command.
-
- Syntax of the queryfmt is almost the same as in rpm except query
- expressions which are not (yet) supported.
-
- To see supported tags type:
- ls --querytags
-
-diff --git a/cli/Makefile.am b/cli/Makefile.am
-index 53fcdfd..4a32e01 100644
---- a/cli/Makefile.am
-+++ b/cli/Makefile.am
-@@ -28,6 +28,7 @@ libpoclidek_la_SOURCES = \
- op_split.c \
- op_verify.c \
- ls.c \
-+ ls_queryfmt.c ls_queryfmt.h \
- install.c \
- uninstall.c \
- desc.c \
-diff --git a/cli/ls_queryfmt.c b/cli/ls_queryfmt.c
-new file mode 100644
-index 0000000..1a0c02f
---- /dev/null
-+++ b/cli/ls_queryfmt.c
-@@ -0,0 +1,1096 @@
-+/*
-+ Copyright (C) 2009 Marcin Banasiak <megabajt@pld-linux.org>
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License, version 2 as
-+ published by the Free Software Foundation (see file COPYING for details).
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
-+/* for asprintf() from stdio.h */
-+#define _GNU_SOURCE
-+
-+/* FIXME: nbuf.h should include stdint.h */
-+#include <stdint.h>
-+
-+#include <sys/stat.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <time.h>
-+
-+#include <trurl/trurl.h>
-+
-+#include "capreq.h"
-+#include "i18n.h"
-+#include "log.h"
-+#include "ls_queryfmt.h"
-+#include "pkgu.h"
-+#include "pkgfl.h"
-+
-+#define n_strcase_eq(s, p) (strcasecmp(s, p) == 0)
-+
-+static const char *invalid_format = N_("invalid format:");
-+
-+enum LsqfParseMode {
-+ LSQF_PARSE_NORMAL = 0,
-+ LSQF_PARSE_ARRAY
-+};
-+
-+/* Tags have to be in alphabetical order. */
-+enum {
-+ LSQF_TAG_UNKNOWN = -1,
-+
-+ LSQF_TAG_ARCH = 0,
-+ LSQF_TAG_BASENAMES,
-+ LSQF_TAG_BUILDHOST,
-+ LSQF_TAG_BUILDTIME,
-+ LSQF_TAG_CONFLICTFLAGS,
-+ LSQF_TAG_CONFLICTS,
-+ LSQF_TAG_CONFLICTVERSION,
-+ LSQF_TAG_DESCRIPTION,
-+ LSQF_TAG_DIRNAMES,
-+ LSQF_TAG_EPOCH,
-+ LSQF_TAG_FILELINKTOS,
-+ LSQF_TAG_FILEMODES,
-+ LSQF_TAG_FILENAMES,
-+ LSQF_TAG_FILESIZES,
-+ LSQF_TAG_GROUP,
-+ LSQF_TAG_LICENSE,
-+ LSQF_TAG_NAME,
-+ LSQF_TAG_NVRA,
-+ LSQF_TAG_OBSOLETEFLAGS,
-+ LSQF_TAG_OBSOLETES,
-+ LSQF_TAG_OBSOLETEVERSION,
-+ LSQF_TAG_PACKAGECOLOR,
-+ LSQF_TAG_PROVIDEFLAGS,
-+ LSQF_TAG_PROVIDES,
-+ LSQF_TAG_PROVIDEVERSION,
-+ LSQF_TAG_RELEASE,
-+ LSQF_TAG_REQUIREFLAGS,
-+ LSQF_TAG_REQUIRES,
-+ LSQF_TAG_REQUIREVERSION,
-+ LSQF_TAG_SIZE,
-+ LSQF_TAG_SOURCERPM,
-+ LSQF_TAG_SUGGESTSFLAGS,
-+ LSQF_TAG_SUGGESTS,
-+ LSQF_TAG_SUGGESTSVERSION,
-+ LSQF_TAG_SUMMARY,
-+ LSQF_TAG_URL,
-+ LSQF_TAG_VENDOR,
-+ LSQF_TAG_VERSION,
-+
-+ LSQF_N_TAGS
-+};
-+
-+enum {
-+ LSQF_TAG_OUTFMTFN_NONE = 0,
-+
-+ LSQF_TAG_OUTFMTFN_DATE,
-+ LSQF_TAG_OUTFMTFN_DAY,
-+ LSQF_TAG_OUTFMTFN_DEPFLAGS
-+};
-+
-+struct lsqf_tags {
-+ int tagid;
-+ int is_array : 1;
-+ int need_uinf : 1;
-+ int need_flist : 1;
-+ const char *tagname[4];
-+};
-+
-+/*
-+ * LSQF_TAG_* have to be added in the same sequence as in enumeration
-+ * (LSQF_TAG_ value is an index in lsqf_tags[] array).
-+ */
-+static const struct lsqf_tags lsqf_tags[] = {
-+ { LSQF_TAG_ARCH, 0, 0, 0, { "ARCH", NULL } },
-+ { LSQF_TAG_BASENAMES, 1, 0, 1, { "BASENAMES", NULL } },
-+ { LSQF_TAG_BUILDHOST, 0, 1, 0, { "BUILDHOST", NULL } },
-+ { LSQF_TAG_BUILDTIME, 0, 0, 0, { "BUILDTIME", NULL } },
-+ { LSQF_TAG_CONFLICTFLAGS, 1, 0, 0, { "CONFLICTFLAGS", NULL } },
-+ { LSQF_TAG_CONFLICTS, 1, 0, 0, { "C", "CONFLICTNAME", "CONFLICTS", NULL } },
-+ { LSQF_TAG_CONFLICTVERSION, 1, 0, 0, { "CONFLICTVERSION", NULL } },
-+ { LSQF_TAG_DESCRIPTION, 0, 1, 0, { "DESCRIPTION", NULL } },
-+ { LSQF_TAG_DIRNAMES, 1, 0, 1, { "DIRNAMES", NULL } },
-+ { LSQF_TAG_EPOCH, 0, 0, 0, { "E", "EPOCH", NULL } },
-+ { LSQF_TAG_FILELINKTOS, 1, 0, 1, { "FILELINKTOS", NULL } },
-+ { LSQF_TAG_FILEMODES, 1, 0, 1, { "FILEMODES", NULL } },
-+ { LSQF_TAG_FILENAMES, 1, 0, 1, { "FILENAMES", NULL } },
-+ { LSQF_TAG_FILESIZES, 1, 0, 1, { "FILESIZES", NULL } },
-+ { LSQF_TAG_GROUP, 0, 0, 0, { "GROUP", NULL } },
-+ { LSQF_TAG_LICENSE, 0, 1, 0, { "LICENSE", NULL } },
-+ { LSQF_TAG_NAME, 0, 0, 0, { "N", "NAME", NULL } },
-+ { LSQF_TAG_NVRA, 0, 0, 0, { "NVRA", NULL } },
-+ { LSQF_TAG_OBSOLETEFLAGS, 1, 0, 0, { "OBSOLETEFLAGS", NULL } },
-+ { LSQF_TAG_OBSOLETES, 1, 0, 0, { "O", "OBSOLETENAME", "OBSOLETES", NULL } },
-+ { LSQF_TAG_OBSOLETEVERSION, 1, 0, 0, { "OBSOLETEVERSION", NULL } },
-+ { LSQF_TAG_PACKAGECOLOR, 0, 0, 0, { "PACKAGECOLOR", NULL } },
-+ { LSQF_TAG_PROVIDEFLAGS, 1, 0, 0, { "PROVIDEFLAGS", NULL } },
-+ { LSQF_TAG_PROVIDES, 1, 0, 0, { "P", "PROVIDENAME", "PROVIDES", NULL } },
-+ { LSQF_TAG_PROVIDEVERSION, 1, 0, 0, { "PROVIDEVERSION", NULL } },
-+ { LSQF_TAG_RELEASE, 0, 0, 0, { "R", "RELEASE", NULL } },
-+ { LSQF_TAG_REQUIREFLAGS, 1, 0, 0, { "REQUIREFLAGS", NULL } },
-+ { LSQF_TAG_REQUIRES, 1, 0, 0, { "REQUIRENAME", "REQUIRES", NULL } },
-+ { LSQF_TAG_REQUIREVERSION, 1, 0, 0, { "REQUIREVERSION", NULL } },
-+ { LSQF_TAG_SIZE, 0, 0, 0, { "SIZE", NULL } },
-+ { LSQF_TAG_SOURCERPM, 0, 0, 0, { "SOURCERPM", NULL } },
-+ { LSQF_TAG_SUGGESTSFLAGS, 1, 0, 0, { "SUGGESTSFLAGS", NULL } },
-+ { LSQF_TAG_SUGGESTS, 1, 0, 0, { "SUGGESTS", "SUGGESTSNAME", NULL } },
-+ { LSQF_TAG_SUGGESTSVERSION, 1, 0, 0, { "SUGGESTSVERSION", NULL } },
-+ { LSQF_TAG_SUMMARY, 0, 1, 0, { "SUMMARY", NULL } },
-+ { LSQF_TAG_URL, 0, 1, 0, { "URL", NULL } },
-+ { LSQF_TAG_VENDOR, 0, 1, 0, { "VENDOR", NULL } },
-+ { LSQF_TAG_VERSION, 0, 0, 0, { "V", "VERSION", NULL } },
-+ { LSQF_N_TAGS, 0, 0, 0, { NULL } }
-+};
-+
-+struct lsqf_pkgdata {
-+ const struct pkg *pkg;
-+ struct pkgflist *flist;
-+ struct pkguinf *uinf;
-+};
-+
-+static struct lsqf_pkgdata *lsqf_pkgdata_new(const struct pkg *pkg)
-+{
-+ struct lsqf_pkgdata *pkgdata = NULL;
-+
-+ pkgdata = n_malloc(sizeof(struct lsqf_pkgdata));
-+
-+ if (pkgdata) {
-+ pkgdata->pkg = pkg;
-+ pkgdata->flist = NULL;
-+ pkgdata->uinf = NULL;
-+ }
-+
-+ return pkgdata;
-+}
-+
-+static struct pkgflist *lsqf_pkgdata_flist(struct lsqf_pkgdata *pkgdata)
-+{
-+ if (pkgdata->flist == NULL)
-+ pkgdata->flist = pkg_get_flist(pkgdata->pkg);
-+
-+ return pkgdata->flist;
-+}
-+
-+static struct pkguinf *lsqf_pkgdata_uinf(struct lsqf_pkgdata *pkgdata)
-+{
-+ if (pkgdata->uinf == NULL)
-+ pkgdata->uinf = pkg_uinf(pkgdata->pkg);
-+
-+ return pkgdata->uinf;
-+}
-+
-+static void lsqf_pkgdata_free(struct lsqf_pkgdata *pkgdata)
-+{
-+ if (pkgdata) {
-+ if (pkgdata->flist)
-+ pkgflist_free(pkgdata->flist);
-+
-+ if (pkgdata->uinf)
-+ pkguinf_free(pkgdata->uinf);
-+
-+ n_free(pkgdata);
-+ }
-+}
-+
-+static int get_tagid_by_name(char *tag)
-+{
-+ if (tag) {
-+ unsigned int i, j;
-+
-+ for (i = 0; i < LSQF_N_TAGS; i++) {
-+ for (j = 0; lsqf_tags[i].tagname[j]; j++) {
-+ if (n_strcase_eq(tag, lsqf_tags[i].tagname[j])) {
-+ return lsqf_tags[i].tagid;
-+ }
-+ }
-+ }
-+ }
-+
-+ return LSQF_TAG_UNKNOWN;
-+}
-+
-+static int get_outfmtfnid_by_name(char *outfmtfn)
-+{
-+ if (outfmtfn && *outfmtfn) {
-+ if (n_str_eq(outfmtfn, "date"))
-+ return LSQF_TAG_OUTFMTFN_DATE;
-+ if (n_str_eq(outfmtfn, "day"))
-+ return LSQF_TAG_OUTFMTFN_DAY;
-+ if (n_str_eq(outfmtfn, "depflags"))
-+ return LSQF_TAG_OUTFMTFN_DEPFLAGS;
-+ }
-+
-+ return LSQF_TAG_OUTFMTFN_NONE;
-+}
-+
-+/* TODO: move to capreq.c */
-+static int capreq_snprintf_evr(char *str, size_t size, const struct capreq *cr)
-+{
-+ int n = 0;
-+
-+ n_assert(size > 0);
-+
-+ if (capreq_has_epoch(cr))
-+ n += n_snprintf(&str[n], size - n, "%d:", capreq_epoch(cr));
-+
-+ if (capreq_has_ver(cr))
-+ n += n_snprintf(&str[n], size - n, "%s", capreq_ver(cr));
-+
-+ if (capreq_has_rel(cr)) {
-+ n_assert(capreq_has_ver(cr));
-+
-+ n += n_snprintf(&str[n], size - n, "-%s", capreq_rel(cr));
-+ }
-+
-+ return n;
-+}
-+
-+static char *format_date(int outfmtfnid, uint32_t time)
-+{
-+ char *buf = NULL, datestr[32];;
-+
-+ if (outfmtfnid == LSQF_TAG_OUTFMTFN_DATE) {
-+ strftime(datestr, sizeof(datestr), "%c", gmtime((time_t *)&time));
-+ asprintf(&buf, "%s", datestr);
-+ } else if (outfmtfnid == LSQF_TAG_OUTFMTFN_DAY) {
-+ strftime(datestr, sizeof(datestr), "%a %b %d %Y", gmtime((time_t *)&time));
-+ asprintf(&buf, "%s", datestr);
-+ } else {
-+ asprintf(&buf, "%u", time);
-+ }
-+
-+ return buf;
-+}
-+
-+static char *format_flags(int outfmtfnid, struct capreq *cr)
-+{
-+ char *buf = NULL;
-+
-+ if (outfmtfnid == LSQF_TAG_OUTFMTFN_DEPFLAGS) {
-+ char relstr[3], *p;
-+
-+ p = relstr;
-+ *p = '\0';
-+
-+ if (cr->cr_relflags & REL_LT)
-+ *p++ = '<';
-+ else if (cr->cr_relflags & REL_GT)
-+ *p++ = '>';
-+
-+ if (cr->cr_relflags & REL_EQ)
-+ *p++ = '=';
-+
-+ *p = '\0';
-+
-+ asprintf(&buf, " %s ", relstr);
-+ } else {
-+ asprintf(&buf, "%u", cr->cr_relflags);
-+ }
-+
-+ return buf;
-+}
-+
-+static char *get_str_by_tagid(const struct lsqf_ent *ent, struct lsqf_pkgdata *pkgdata, unsigned int num)
-+{
-+ const struct pkg *pkg = pkgdata->pkg;
-+ struct capreq *c = NULL;
-+ char *buf = NULL, evr[32];
-+ unsigned int i;
-+
-+ if (lsqf_tags[ent->tag.id].need_uinf) {
-+ struct pkguinf *pkgu = lsqf_pkgdata_uinf(pkgdata);
-+ const char *str = NULL;
-+
-+ switch (ent->tag.id) {
-+ case LSQF_TAG_BUILDHOST:
-+ str = pkguinf_get(pkgu, PKGUINF_BUILDHOST);
-+ break;
-+
-+ case LSQF_TAG_DESCRIPTION:
-+ str = pkguinf_get(pkgu, PKGUINF_DESCRIPTION);
-+ break;
-+
-+ case LSQF_TAG_LICENSE:
-+ str = pkguinf_get(pkgu, PKGUINF_LICENSE);
-+ break;
-+
-+ case LSQF_TAG_SUMMARY:
-+ str = pkguinf_get(pkgu, PKGUINF_SUMMARY);
-+ break;
-+
-+ case LSQF_TAG_URL:
-+ str = pkguinf_get(pkgu, PKGUINF_URL);
-+ break;
-+
-+ case LSQF_TAG_VENDOR:
-+ str = pkguinf_get(pkgu, PKGUINF_VENDOR);
-+ break;
-+
-+ default:
-+ n_assert(0);
-+ }
-+
-+ if (str)
-+ buf = n_strdup(str);
-+ else
-+ buf = n_strdup("(none)");
-+
-+ } else if (lsqf_tags[ent->tag.id].need_flist) {
-+ struct pkgflist *flist = lsqf_pkgdata_flist(pkgdata);
-+ struct pkgfl_ent *flent;
-+
-+ if (flist) {
-+ switch (ent->tag.id) {
-+ case LSQF_TAG_BASENAMES:
-+ case LSQF_TAG_FILELINKTOS:
-+ case LSQF_TAG_FILEMODES:
-+ case LSQF_TAG_FILENAMES:
-+ case LSQF_TAG_FILESIZES:
-+ for (i = 0; i < n_tuple_size(flist->fl); i++) {
-+ flent = n_tuple_nth(flist->fl, i);
-+
-+ if (flent->items <= num)
-+ num -= flent->items;
-+ else
-+ break;
-+ }
-+
-+ if (ent->tag.id == LSQF_TAG_BASENAMES)
-+ buf = n_strdup(flent->files[num]->basename);
-+ else if (ent->tag.id == LSQF_TAG_FILEMODES)
-+ asprintf(&buf, "%u", flent->files[num]->mode);
-+ else if (ent->tag.id == LSQF_TAG_FILENAMES) {
-+ if (*flent->dirname == '/')
-+ asprintf(&buf, "%s%s", flent->dirname, flent->files[num]->basename);
-+ else
-+ asprintf(&buf, "/%s%s%s", flent->dirname,
-+ *flent->files[num]->basename ? "/" : "",
-+ flent->files[num]->basename);
-+ } else if (ent->tag.id == LSQF_TAG_FILESIZES)
-+ asprintf(&buf, "%u", flent->files[num]->size);
-+ else
-+ if (S_ISLNK(flent->files[num]->mode))
-+ buf = n_strdup(flent->files[num]->basename + strlen(flent->files[num]->basename) + 1);
-+
-+ break;
-+
-+ case LSQF_TAG_DIRNAMES:
-+ flent = n_tuple_nth(flist->fl, num);
-+
-+ asprintf(&buf, "%s%s", *flent->dirname == '/' ? "" : "/",
-+ flent->dirname);
-+ break;
-+
-+ default:
-+ n_assert(0);
-+ }
-+ }
-+ } else {
-+ switch (ent->tag.id) {
-+ case LSQF_TAG_ARCH:
-+ buf = n_strdup(pkg_arch(pkg));
-+ break;
-+
-+ case LSQF_TAG_BUILDTIME:
-+ buf = format_date(ent->tag.outfmtfnid, pkg->btime);
-+ break;
-+
-+ case LSQF_TAG_CONFLICTFLAGS:
-+ case LSQF_TAG_CONFLICTS:
-+ case LSQF_TAG_CONFLICTVERSION:
-+ case LSQF_TAG_OBSOLETEFLAGS:
-+ case LSQF_TAG_OBSOLETES:
-+ case LSQF_TAG_OBSOLETEVERSION:
-+ {
-+ unsigned int n = 0;
-+
-+ for (i = 0; i < n_array_size(pkg->cnfls); i++) {
-+ struct capreq *cr = n_array_nth(pkg->cnfls, i);
-+
-+ if (ent->tag.id == LSQF_TAG_CONFLICTS || ent->tag.id == LSQF_TAG_CONFLICTFLAGS) {
-+ if (!capreq_is_obsl(cr)) {
-+ if (n == num) {
-+ c = cr;
-+ break;
-+ }
-+
-+ n++;
-+ }
-+ } else {
-+ if (capreq_is_obsl(cr)) {
-+ if (n == num) {
-+ c = cr;
-+ break;
-+ }
-+
-+ n++;
-+ }
-+ }
-+ }
-+
-+ if (c) {
-+ if (ent->tag.id == LSQF_TAG_CONFLICTS || ent->tag.id == LSQF_TAG_OBSOLETES)
-+ buf = n_strdup(capreq_name(c));
-+ else if (ent->tag.id == LSQF_TAG_CONFLICTFLAGS || ent->tag.id == LSQF_TAG_OBSOLETEFLAGS)
-+ buf = format_flags(ent->tag.outfmtfnid, c);
-+ else if (ent->tag.id == LSQF_TAG_CONFLICTVERSION || ent->tag.id == LSQF_TAG_OBSOLETEVERSION)
-+ if (capreq_snprintf_evr(evr, sizeof(evr), c) > 0)
-+ buf = n_strdup(evr);
-+
-+ }
-+ break;
-+ }
-+
-+ case LSQF_TAG_EPOCH:
-+ asprintf(&buf, "%d", pkg->epoch);
-+ break;
-+
-+ case LSQF_TAG_GROUP:
-+ buf = n_strdup(pkg_group(pkg));
-+ break;
-+
-+ case LSQF_TAG_NAME:
-+ buf = n_strdup(pkg->name);
-+ break;
-+
-+ case LSQF_TAG_NVRA:
-+ buf = n_strdup(pkg_id(pkg));
-+ break;
-+
-+ case LSQF_TAG_PACKAGECOLOR:
-+ asprintf(&buf, "%d", pkg->color);
-+ break;
-+
-+ case LSQF_TAG_PROVIDEFLAGS:
-+ buf = format_flags(ent->tag.outfmtfnid, n_array_nth(pkg->caps, num));
-+ break;
-+
-+ case LSQF_TAG_PROVIDES:
-+ c = n_array_nth(pkg->caps, num);
-+ buf = n_strdup(capreq_name(c));
-+ break;
-+
-+ case LSQF_TAG_PROVIDEVERSION:
-+ c = n_array_nth(pkg->caps, num);
-+
-+ if (capreq_snprintf_evr(evr, sizeof(evr), c) > 0)
-+ buf = n_strdup(evr);
-+
-+ break;
-+
-+ case LSQF_TAG_RELEASE:
-+ buf = n_strdup(pkg->rel);
-+ break;
-+
-+ case LSQF_TAG_REQUIREFLAGS:
-+ buf = format_flags(ent->tag.outfmtfnid, n_array_nth(pkg->reqs, num));
-+ break;
-+
-+ case LSQF_TAG_REQUIRES:
-+ c = n_array_nth(pkg->reqs, num);
-+
-+ if (capreq_is_rpmlib(c))
-+ asprintf(&buf, "rpmlib(%s)", capreq_name(c));
-+ else
-+ buf = n_strdup(capreq_name(c));
-+
-+ break;
-+
-+ case LSQF_TAG_REQUIREVERSION:
-+ c = n_array_nth(pkg->reqs, num);
-+
-+ if (capreq_snprintf_evr(evr, sizeof(evr), c) > 0)
-+ buf = n_strdup(evr);
-+
-+ break;
-+
-+ case LSQF_TAG_VERSION:
-+ buf = n_strdup(pkg->ver);
-+ break;
-+
-+ case LSQF_TAG_SIZE:
-+ asprintf(&buf, "%u", pkg->size);
-+ break;
-+
-+ case LSQF_TAG_SOURCERPM:
-+ buf = n_strdup(pkg_srcfilename_s(pkg));
-+ break;
-+
-+ case LSQF_TAG_SUGGESTSFLAGS:
-+ buf = format_flags(ent->tag.outfmtfnid, n_array_nth(pkg->sugs, num));
-+ break;
-+
-+ case LSQF_TAG_SUGGESTS:
-+ c = n_array_nth(pkg->sugs, num);
-+ buf = n_strdup(capreq_name(c));
-+ break;
-+
-+ case LSQF_TAG_SUGGESTSVERSION:
-+ c = n_array_nth(pkg->sugs, num);
-+
-+ if (capreq_snprintf_evr(evr, sizeof(evr), c) > 0)
-+ buf = n_strdup(evr);
-+
-+ break;
-+
-+ default:
-+ n_assert(0);
-+ }
-+ }
-+
-+ return buf;
-+}
-+
-+static char get_escaped_char(char zn)
-+{
-+ switch (zn) {
-+ case 'a': return '\a';
-+ case 'b': return '\b';
-+ case 'f': return '\f';
-+ case 'n': return '\n';
-+ case 'r': return '\r';
-+ case 't': return '\t';
-+ case 'v': return '\v';
-+ default: return zn;
-+ }
-+}
-+
-+static struct lsqf_ent *lsqf_ent_new(int type)
-+{
-+ struct lsqf_ent *ent = NULL;
-+
-+ ent = n_malloc(sizeof(struct lsqf_ent));
-+
-+ if (ent) {
-+ ent->type = type;
-+
-+ switch (type) {
-+ case LSQF_ENT_TYPE_TAG:
-+ ent->tag.id = 0;
-+ ent->tag.iterate = 0;
-+ ent->tag.countArray = 0;
-+ ent->tag.pad = 0;
-+ break;
-+
-+ case LSQF_ENT_TYPE_STRING:
-+ ent->string = NULL;
-+ break;
-+
-+ case LSQF_ENT_TYPE_ARRAY:
-+ ent->array = lsqf_ent_array_new();
-+ break;
-+
-+ default:
-+ n_assert(0);
-+ }
-+ }
-+
-+ return ent;
-+}
-+
-+static void lsqf_ent_free(struct lsqf_ent *ent)
-+{
-+ if (ent) {
-+ switch (ent->type) {
-+ case LSQF_ENT_TYPE_TAG:
-+ break;
-+
-+ case LSQF_ENT_TYPE_STRING:
-+ if (ent->string)
-+ n_free(ent->string);
-+
-+ break;
-+
-+ case LSQF_ENT_TYPE_ARRAY:
-+ lsqf_ent_array_free(ent->array);
-+ break;
-+ }
-+
-+ n_free(ent);
-+ }
-+}
-+
-+struct lsqf_ent_array *lsqf_ent_array_new(void)
-+{
-+ struct lsqf_ent_array *array = NULL;
-+
-+ array = n_malloc(sizeof(struct lsqf_ent_array));
-+
-+ if (array) {
-+ array->ents = NULL;
-+ array->items = 0;
-+ }
-+
-+ return array;
-+}
-+
-+void lsqf_ent_array_free(struct lsqf_ent_array *array)
-+{
-+ unsigned int i;
-+
-+ if (array) {
-+ for (i = 0; i < array->items; i++) {
-+ struct lsqf_ent *ent = array->ents[i];
-+
-+ lsqf_ent_free(ent);
-+ }
-+
-+ if (array->ents)
-+ n_free(array->ents);
-+
-+ n_free(array);
-+ }
-+}
-+
-+static void lsqf_ent_array_add_ent(struct lsqf_ent_array *array, struct lsqf_ent *ent)
-+{
-+ array->ents = n_realloc(array->ents, (array->items + 1) * sizeof(struct lsqf_ent *));
-+
-+ if (array->ents) {
-+ array->ents[array->items] = ent;
-+
-+ array->items++;
-+ }
-+}
-+
-+static void lsqf_ent_array_add_ent_string(struct lsqf_ent_array *array, tn_buf *nbuf)
-+{
-+ struct lsqf_ent *ent = NULL;
-+
-+ if (n_buf_size(nbuf) > 0) {
-+ n_buf_putc(nbuf, '\0');
-+
-+ if ((ent = lsqf_ent_new(LSQF_ENT_TYPE_STRING))) {
-+ ent->string = n_strdup(n_buf_ptr(nbuf));
-+
-+ lsqf_ent_array_add_ent(array, ent);
-+
-+ n_buf_clean(nbuf);
-+ }
-+ }
-+}
-+
-+/**
-+ * do_parse:
-+ *
-+ * Returns: 1 on error.
-+ **/
-+static int do_parse(struct lsqf_ent_array *array, char *fmt, char **endfmt, enum LsqfParseMode mode)
-+{
-+ struct lsqf_ent *ent;
-+ tn_buf *nbuf = NULL;
-+ int done = 0, error = 0;
-+ char *end;
-+
-+ if (fmt == NULL)
-+ return 1;
-+
-+ nbuf = n_buf_new(8);
-+
-+ while (*fmt && !done && !error) {
-+ switch (*fmt) {
-+ case '%':
-+ {
-+ char *p, *outfmtfn;
-+ int tagid, pad, countArray = 0, iterate = 0;
-+
-+ fmt++;
-+
-+ /* catch %% */
-+ if (*fmt == '%') {
-+ n_buf_putc(nbuf, '%');
-+ break;
-+ }
-+
-+ pad = strtoul(fmt, &p, 10);
-+
-+ fmt = p;
-+
-+ if (*fmt != '{') {
-+ logn(LOGERR, _("%s missing { after %%"), invalid_format);
-+ error = 1;
-+ break;
-+ }
-+
-+ fmt++;
-+
-+ if (*fmt == '#') {
-+ countArray = 1;
-+ fmt++;
-+ } else if (*fmt == '=') {
-+ iterate = 1;
-+ fmt++;
-+ }
-+
-+ if ((p = strchr(fmt, '}')) == NULL) {
-+ logn(LOGERR, _("%s missing } after %%{"), invalid_format);
-+ error = 1;
-+ break;
-+ }
-+
-+ *p = '\0';
-+
-+ if (*fmt == '\0') {
-+ logn(LOGERR, _("%s empty tag name"), invalid_format);
-+ error = 1;
-+ break;
-+ }
-+
-+ /* check if another output format is requested */
-+ if ((outfmtfn = strchr(fmt, ':')) != NULL) {
-+ *outfmtfn = '\0';
-+ outfmtfn++;
-+ }
-+
-+ if ((tagid = get_tagid_by_name(fmt)) == LSQF_TAG_UNKNOWN) {
-+ logn(LOGERR, _("%s unknown tag: \'%s\'"), invalid_format, fmt);
-+ error = 1;
-+ break;
-+ }
-+
-+ /* create new ent with a string that is currently stored in nbuf */
-+ lsqf_ent_array_add_ent_string(array, nbuf);
-+
-+ ent = lsqf_ent_new(LSQF_ENT_TYPE_TAG);
-+ ent->tag.id = tagid;
-+ ent->tag.pad = pad;
-+ ent->tag.countArray = countArray;
-+ ent->tag.iterate = iterate;
-+ ent->tag.outfmtfnid = get_outfmtfnid_by_name(outfmtfn);
-+
-+ lsqf_ent_array_add_ent(array, ent);
-+
-+ fmt = p;
-+
-+ break;
-+ }
-+ case '[':
-+ fmt++;
-+
-+ lsqf_ent_array_add_ent_string(array, nbuf);
-+
-+ ent = lsqf_ent_new(LSQF_ENT_TYPE_ARRAY);
-+ lsqf_ent_array_add_ent(array, ent);
-+
-+ if (do_parse(ent->array, fmt, &end, LSQF_PARSE_ARRAY)) {
-+ error = 1;
-+ break;
-+ }
-+
-+ if (*end == '\0') {
-+ logn(LOGERR, _("%s missing ] at end of array"), invalid_format);
-+ error = 1;
-+ break;
-+ }
-+
-+ fmt = end;
-+
-+ break;
-+
-+ case ']':
-+ if (mode != LSQF_PARSE_ARRAY) {
-+ logn(LOGERR, _("%s unexpected ]"), invalid_format);
-+ error = 1;
-+ break;
-+ }
-+
-+ /* found end of array -> stop parsing */
-+ done = 1;
-+
-+ /* save address of the last character we parsed */
-+ *endfmt = fmt;
-+
-+ break;
-+
-+ case '}':
-+ logn(LOGERR, _("%s unexpected }"), invalid_format);
-+ error = 1;
-+ break;
-+
-+ default:
-+ if (fmt[0] == '\\' && fmt[1] != '\0') {
-+ fmt++;
-+
-+ n_buf_putc(nbuf, get_escaped_char(*fmt));
-+
-+ } else {
-+ n_buf_putc(nbuf, *fmt);
-+ }
-+ }
-+
-+ fmt++;
-+ }
-+
-+ if (error) {
-+ n_buf_free(nbuf);
-+ return 1;
-+ }
-+
-+ lsqf_ent_array_add_ent_string(array, nbuf);
-+
-+ if (!done && endfmt)
-+ *endfmt = fmt;
-+
-+ n_buf_free(nbuf);
-+
-+ return 0;
-+}
-+
-+/**
-+ * lsqf_parse:
-+ *
-+ * Returns: On success, pointer to structure which is a base to display requested information or NULL when parsing failed.
-+ **/
-+struct lsqf_ent_array *lsqf_parse(char *fmt)
-+{
-+ struct lsqf_ent_array *array = NULL;
-+
-+ if ((array = lsqf_ent_array_new())) {
-+ if (do_parse(array, fmt, NULL, LSQF_PARSE_NORMAL)) {
-+ lsqf_ent_array_free(array);
-+ array = NULL;
-+ }
-+ }
-+
-+ return array;
-+}
-+
-+static int get_tag_array_size(const struct lsqf_ent *ent, struct lsqf_pkgdata *pkgdata)
-+{
-+ const struct pkg *pkg = pkgdata->pkg;
-+ unsigned int i;
-+ int size = 1;
-+
-+ n_assert(ent->type == LSQF_ENT_TYPE_TAG);
-+
-+ if (lsqf_tags[ent->tag.id].is_array) {
-+ size = 0;
-+
-+ if (lsqf_tags[ent->tag.id].need_flist) {
-+ struct pkgflist *flist = lsqf_pkgdata_flist(pkgdata);
-+
-+ if (flist) {
-+ switch (ent->tag.id) {
-+ case LSQF_TAG_BASENAMES:
-+ case LSQF_TAG_FILELINKTOS:
-+ case LSQF_TAG_FILEMODES:
-+ case LSQF_TAG_FILENAMES:
-+ case LSQF_TAG_FILESIZES:
-+ for (i = 0; i < n_tuple_size(flist->fl); i++) {
-+ struct pkgfl_ent *flent = n_tuple_nth(flist->fl, i);
-+
-+ size += flent->items;
-+ }
-+
-+ break;
-+
-+ case LSQF_TAG_DIRNAMES:
-+ size = n_tuple_size(flist->fl);
-+ break;
-+
-+ default:
-+ n_assert(0);
-+ }
-+ }
-+ } else {
-+ switch (ent->tag.id) {
-+ case LSQF_TAG_CONFLICTFLAGS:
-+ case LSQF_TAG_CONFLICTS:
-+ case LSQF_TAG_CONFLICTVERSION:
-+ case LSQF_TAG_OBSOLETEFLAGS:
-+ case LSQF_TAG_OBSOLETES:
-+ case LSQF_TAG_OBSOLETEVERSION:
-+ if (pkg->cnfls) {
-+ int nobsl = 0, ncnfls = 0;
-+
-+ for (i = 0; i < n_array_size(pkg->cnfls); i++) {
-+ struct capreq *cr = n_array_nth(pkg->cnfls, i);
-+
-+ if (capreq_is_obsl(cr))
-+ nobsl++;
-+ else
-+ ncnfls++;
-+ }
-+
-+ if (ent->tag.id == LSQF_TAG_CONFLICTFLAGS || ent->tag.id == LSQF_TAG_CONFLICTS
-+ || ent->tag.id == LSQF_TAG_CONFLICTVERSION)
-+ size = ncnfls;
-+ else
-+ size = nobsl;
-+ }
-+
-+ break;
-+
-+ case LSQF_TAG_PROVIDEFLAGS:
-+ case LSQF_TAG_PROVIDES:
-+ case LSQF_TAG_PROVIDEVERSION:
-+ if (pkg->caps)
-+ size = n_array_size(pkg->caps);
-+ break;
-+
-+ case LSQF_TAG_REQUIREFLAGS:
-+ case LSQF_TAG_REQUIRES:
-+ case LSQF_TAG_REQUIREVERSION:
-+ if (pkg->reqs)
-+ size = n_array_size(pkg->reqs);
-+ break;
-+
-+ case LSQF_TAG_SUGGESTSFLAGS:
-+ case LSQF_TAG_SUGGESTS:
-+ case LSQF_TAG_SUGGESTSVERSION:
-+ if (pkg->sugs)
-+ size = n_array_size(pkg->sugs);
-+ break;
-+
-+ default:
-+ n_assert(0);
-+ }
-+ }
-+ }
-+
-+ return size;
-+}
-+
-+/**
-+ * Returns 1 when arrays size differ.
-+ **/
-+static int check_size(const struct lsqf_ent_array *array, struct lsqf_pkgdata *pkgdata, unsigned int *s)
-+{
-+ unsigned int i;
-+ int size = 1, prev_size = -1;
-+
-+ for (i = 0; i < array->items; i++) {
-+ struct lsqf_ent *ent = array->ents[i];
-+
-+ if (ent->type == LSQF_ENT_TYPE_TAG) {
-+ if (lsqf_tags[ent->tag.id].is_array) {
-+ size = get_tag_array_size(ent, pkgdata);
-+ } else {
-+ /* check whether we want to print this tag with every iteration */
-+ if (ent->tag.iterate)
-+ continue;
-+
-+ size = 1;
-+ }
-+
-+ if (prev_size < 0)
-+ prev_size = size;
-+
-+ if (prev_size != size)
-+ return 1;
-+ }
-+ }
-+
-+ *s = size;
-+
-+ return 0;
-+}
-+
-+static void add_tagstr_to_nbuf(tn_buf *nbuf, const struct lsqf_ent *ent, struct lsqf_pkgdata *pkgdata, unsigned int num)
-+{
-+ char *str = NULL, fmt[16];
-+
-+ if (ent->tag.countArray) {
-+ n_snprintf(fmt, sizeof(fmt), "%%%dd", ent->tag.pad);
-+ n_buf_printf(nbuf, fmt, get_tag_array_size(ent, pkgdata));
-+
-+ } else if ((str = get_str_by_tagid(ent, pkgdata, num))) {
-+ n_snprintf(fmt, sizeof(fmt), "%%%ds", ent->tag.pad);
-+ n_buf_printf(nbuf, fmt, str);
-+
-+ n_free(str);
-+ }
-+}
-+
-+/**
-+ * tags_size - number of items in tags. It's mostly used by tag-arrays (for example REQUIRES)
-+ */
-+static int ent_array_to_string(const struct lsqf_ent_array *array,
-+ struct lsqf_pkgdata *pkgdata,
-+ tn_buf *nbuf, int tags_size)
-+{
-+ unsigned int i, j, size = 0;
-+
-+ for (j = 0; j < tags_size; j++) {
-+ for (i = 0; i < array->items; i++) {
-+ struct lsqf_ent *ent = array->ents[i];
-+ int ret = 1;
-+
-+ switch (ent->type) {
-+ case LSQF_ENT_TYPE_TAG:
-+ add_tagstr_to_nbuf(nbuf, ent, pkgdata, j);
-+ break;
-+
-+ case LSQF_ENT_TYPE_STRING:
-+ n_buf_puts_z(nbuf, ent->string);
-+ break;
-+
-+ case LSQF_ENT_TYPE_ARRAY:
-+ if (check_size(ent->array, pkgdata, &size)) {
-+ logn(LOGERR, _("%s array iterator used with different sized arrays"), invalid_format);
-+ ret = 0;
-+ } else {
-+ ret = ent_array_to_string(ent->array, pkgdata, nbuf, size);
-+ }
-+
-+ break;
-+
-+ default:
-+ n_assert(0);
-+ }
-+
-+ /* break on error */
-+ if (ret == 0)
-+ return 0;
-+ }
-+ }
-+
-+ return 1;
-+}
-+
-+char *lsqf_to_string(const struct lsqf_ent_array *array, const struct pkg *pkg)
-+{
-+ struct lsqf_pkgdata *pkgdata = NULL;
-+ tn_buf *nbuf = NULL;
-+ char *buf = NULL;
-+
-+ pkgdata = lsqf_pkgdata_new(pkg);
-+ nbuf = n_buf_new(64);
-+
-+ /* In the first array there can't be more than one item per tag,
-+ * so force tags_size = 1 */
-+ if (ent_array_to_string(array, pkgdata, nbuf, 1)) {
-+ buf = n_strdup(n_buf_ptr(nbuf));
-+ }
-+
-+ n_buf_free(nbuf);
-+ lsqf_pkgdata_free(pkgdata);
-+
-+ return buf;
-+}
-+
-+/**
-+ * lsqf_show_querytags:
-+ *
-+ * Print all supported tags.
-+ */
-+void lsqf_show_querytags(struct cmdctx *cmdctx)
-+{
-+ int i, j;
-+
-+ for (i = 0; i < LSQF_N_TAGS; i++) {
-+ for (j = 0; lsqf_tags[i].tagname[j]; j++) {
-+ cmdctx_printf(cmdctx, "%s\n", lsqf_tags[i].tagname[j]);
-+ }
-+ }
-+}
-diff --git a/cli/ls_queryfmt.h b/cli/ls_queryfmt.h
-new file mode 100644
-index 0000000..43d3858
---- /dev/null
-+++ b/cli/ls_queryfmt.h
-@@ -0,0 +1,47 @@
-+#ifndef POCLIDEK_LS_QUERYFMT_H
-+#define POCLIDEK_LS_QUERYFMT_H
-+
-+#include "cmd.h"
-+#include "pkg.h"
-+
-+struct lsqf_ent;
-+
-+struct lsqf_ent_array {
-+ struct lsqf_ent **ents;
-+ unsigned int items;
-+};
-+
-+struct lsqf_ent {
-+ enum {
-+ LSQF_ENT_TYPE_TAG = 1,
-+ LSQF_ENT_TYPE_STRING,
-+ LSQF_ENT_TYPE_ARRAY
-+ } type;
-+
-+ union {
-+ struct {
-+ int id;
-+
-+ int iterate;
-+ int countArray;
-+ int pad;
-+ int outfmtfnid;
-+ } tag;
-+
-+ char *string;
-+
-+ struct lsqf_ent_array *array;
-+ };
-+};
-+
-+
-+
-+struct lsqf_ent_array *lsqf_parse(char *fmt);
-+char *lsqf_to_string(const struct lsqf_ent_array *array, const struct pkg *pkg);
-+
-+struct lsqf_ent_array *lsqf_ent_array_new(void);
-+void lsqf_ent_array_free(struct lsqf_ent_array *array);
-+
-+void lsqf_show_querytags(struct cmdctx *cmdctx);
-+
-+#endif /* POCLIDEK_LS_QUERYFMT_H */
-diff --git a/cli/ls.c b/cli/ls.c
-index 0fe548c..e956e40 100644
---- a/cli/ls.c
-+++ b/cli/ls.c
-@@ -24,6 +24,7 @@
- #include "pkgu.h"
- #include "cli.h"
- #include "log.h"
-+#include "ls_queryfmt.h"
-
- static int ls(struct cmdctx *cmdctx);
- static
-@@ -51,6 +52,8 @@
- #define OPT_LS_NAMES_ONLY (1 << 11)
- #define OPT_LS_SOURCERPM (1 << 12)
-
-+#define OPT_LS_QUERYFMT (1 << 13)
-+#define OPT_LS_QUERYTAGS (1 << 14)
-
- #define OPT_LS_ERR (1 << 16);
-
-@@ -69,7 +72,9 @@
- { NULL, 'G', 0, 0, N_("Print package groups"), 1},
- { NULL, 'O', 0, 0, N_("Print package summaries"), 1},
- { "source-rpm", 's', 0, 0,N_("Print package source rpm"), 1},
--// { NULL, 'i', 0, OPTION_ALIAS, 0, 1 },
-+ { 0, 0, 0, 0, N_("Query format options:"), 2},
-+ { "qf", OPT_LS_QUERYFMT, "QUERYFMT", 0, N_("Use the following query format"), 2},
-+ { "querytags", OPT_LS_QUERYTAGS, 0, 0, N_("Show supported tags"), 2},
- { 0, 0, 0, 0, 0, 0 },
- };
-
-@@ -152,7 +157,25 @@
- case 'n':
- cmdctx->_flags |= OPT_LS_NAMES_ONLY;
- break;
--
-+
-+ case OPT_LS_QUERYFMT:
-+ cmdctx->_flags |= OPT_LS_QUERYFMT;
-+
-+ if (arg) {
-+ struct lsqf_ent_array *array = NULL;
-+
-+ if ((array = lsqf_parse(arg)) == NULL)
-+ return EINVAL;
-+
-+ cmdctx->_data = array;
-+ }
-+
-+ break;
-+
-+ case OPT_LS_QUERYTAGS:
-+ lsqf_show_querytags(cmdctx);
-+ return EINVAL;
-+
- default:
- return ARGP_ERR_UNKNOWN;
- }
-@@ -368,6 +391,10 @@
-
-
- l_end:
-+ if (cmdctx->_flags & OPT_LS_QUERYFMT) {
-+ lsqf_ent_array_free(cmdctx->_data);
-+ cmdctx->_data = NULL;
-+ }
-
- if (ls_ents)
- n_array_free(ls_ents);
-@@ -524,6 +524,16 @@
- else if (flags & OPT_LS_SOURCERPM) {
- const char *srcrpm = pkg_srcfilename_s(pkg);
- cmdctx_printf(cmdctx, fmt_pkg, pkg_name, srcrpm ? srcrpm : "(unset)");
-+
-+ } else if (flags & OPT_LS_QUERYFMT) {
-+ char *queryfmt = NULL;
-+
-+ if ((queryfmt = lsqf_to_string(cmdctx->_data, pkg))) {
-+ cmdctx_printf(cmdctx, "%s", queryfmt);
-+
-+ n_free(queryfmt);
-+ }
-+
- } else if ((flags & OPT_LS_LONG) == 0) {
- cmdctx_printf(cmdctx, "%s\n", pkg_name);
-
projects / packages / poldek.git / commitdiff