packages: poldek/poldek-git.patch, poldek/poldek.spec - rel 9; updated pl t...
cactus
cactus at pld-linux.org
Sun Apr 1 21:35:00 CEST 2012
Author: cactus Date: Sun Apr 1 19:35:00 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 9; updated pl translations, typos
---- Files affected:
packages/poldek:
poldek-git.patch (1.8 -> 1.9) , poldek.spec (1.445 -> 1.446)
---- Diffs:
================================================================
Index: packages/poldek/poldek-git.patch
diff -u packages/poldek/poldek-git.patch:1.8 packages/poldek/poldek-git.patch:1.9
--- packages/poldek/poldek-git.patch:1.8 Wed Mar 28 01:36:35 2012
+++ packages/poldek/poldek-git.patch Sun Apr 1 21:34:55 2012
@@ -175,3 +175,5928 @@
pkguinf_free(pkgu);
}
+diff --git a/conf.c b/conf.c
+index 890a306..2133966 100644
+--- a/conf.c
++++ b/conf.c
+@@ -1026,7 +1026,10 @@ static tn_hash *do_ldconf(tn_hash *af_htconf,
+ goto l_end;
+ }
+
+- n_hash_insert(af_htconf, af->path, NULL);
++ if (n_hash_exists(af_htconf, af->path))
++ logn(LOGERR, "%s: included twice", af->path);
++ else
++ n_hash_insert(af_htconf, af->path, NULL);
+
+ while (n_stream_gets(af->vf->vf_tnstream, buf, sizeof(buf) - 1)) {
+ char *name, *value, *line;
+diff --git a/doc/poldek.conf.xml b/doc/poldek.conf.xml
+index 17347e5..aae8091 100644
+--- a/doc/poldek.conf.xml
++++ b/doc/poldek.conf.xml
+@@ -728,7 +728,7 @@ cmd = vfjuggle %d %Pn
+ proto = http,ftp,https
+ cmd = wget -N --dot-style=binary -P %d %Pn
+
+-[fetcher]
++[ fetcher ]
+ name = aria
+ proto = http,ftp,https
+ cmd = aria2c --log-level=info --summary-interval=0 --truncate-console-readout=true -c -k1M -j5 -s5 -x5 -Z -P -d %d %Pn
+diff --git a/install3/ictx.h b/install3/ictx.h
+index aa259fb..cc1cab5 100644
+--- a/install3/ictx.h
++++ b/install3/ictx.h
+@@ -125,6 +125,7 @@ int i3_unmark_package(struct i3ctx *ictx, struct pkg *pkg);
+ int i3_is_other_version_marked(struct i3ctx *ictx, struct pkg *pkg,
+ struct capreq *req);
+
++/* marks with PKGMARK_MARK all pkgs with same name prefix */
+ int i3_mark_namegroup(struct i3ctx *ictx,
+ struct pkg *pkg, tn_array *pkgs);
+
+diff --git a/pkgdir/pndir/update.c b/pkgdir/pndir/update.c
+index c26fe9f..9cc4be1 100644
+--- a/pkgdir/pndir/update.c
++++ b/pkgdir/pndir/update.c
+@@ -361,9 +361,10 @@ int pndir_m_update(struct pkgdir *pkgdir, enum pkgdir_uprc *uprc)
+
+ msgn(2, "pndir_m_update idxpatches/idxsize: %ld/%ld bytes\n", mdpatchsize, mdsize);
+
+- if (mdpatchsize > mdsize) {
++ if (mdpatchsize * 9 / 10 > mdsize) {
+ vfile_close(vf);
+- msgn(1, _("Index patches size too bug\nRetreving index ...\n"));
++ msgn(1, _("Index patches size too big\n"));
++ msgn(1, _("Retrieving whole index ...\n"));
+ rc = update_whole_idx(pkgdir->src);
+ if (rc)
+ *uprc = PKGDIR_UPRC_UPTODATE;
+diff --git a/pkgfetch.c b/pkgfetch.c
+index 9adc155..70e40e3 100644
+--- a/pkgfetch.c
++++ b/pkgfetch.c
+@@ -252,7 +252,7 @@ int packages_fetch(struct pm_ctx *pmctx,
+ nerr++;
+
+ else {
+- int j;
++ unsigned int j;
+
+ for (j=0; j < n_array_size(urls); j++) {
+ char localpath[PATH_MAX];
+diff --git a/po/de.po b/po/de.po
+index b032bf5..c0ce6ca 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -6,7 +6,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: poldek 0.17\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-03-04 00:17+0200\n"
++"POT-Creation-Date: 2012-04-01 19:50+0200\n"
+ "PO-Revision-Date: 2002-04-14 13:05+0100\n"
+ "Last-Translator: Andreas Piesk <a.piesk at gmx.net>\n"
+ "Language-Team: Polish <pl at li.org>\n"
+@@ -15,67 +15,75 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=n==0 ? 0 : n==1 ? 1 : 2\n"
+
+-#: arg_packages.c:123
++#: arg_packages.c:124
+ #, c-format
+ msgid "%s:%d: syntax error"
+ msgstr "%s:%d: Syntaxfehler"
+
+-#: arg_packages.c:125
++#: arg_packages.c:126
+ #, fuzzy
+ msgid "syntax error in package specification"
+ msgstr "Syntaxfehler in Paketdefinition"
+
+-#: arg_packages.c:393
++#: arg_packages.c:394
+ #, fuzzy, c-format
+ msgid "Removed %d duplicates from given packages"
+ msgstr "%d doppelte Pakete aus der Liste der angegebenen Pakete entfernt"
+
+-#: arg_packages.c:431
++#: arg_packages.c:432
+ #, fuzzy, c-format
+ msgid "%s: %d package(s) found:"
+ msgstr "mark: %s: Pæket nicht gefunden"
+
+-#: arg_packages.c:501 arg_packages.c:530 arg_packages.c:556 uninstall.c:592
++#: arg_packages.c:502 arg_packages.c:531 arg_packages.c:557 uninstall.c:593
+ #, c-format
+ msgid "%s: no such package"
+ msgstr "%s: dieses Paket gibt es nicht"
+
+-#: arg_packages.c:507 cli/dent.c:666
++#: arg_packages.c:508 cli/dent.c:675
+ #, fuzzy, c-format
+ msgid "%s: ambiguous name"
+ msgstr "%s: mehrdeutiger Name"
+
+-#: arg_packages.c:632
++#: arg_packages.c:633
+ #, fuzzy, c-format
+ msgid "%s: choosen %s among %d packages"
+ msgstr "%s: '%s' fehlt in einigen Paketen"
+
+-#: ask.c:79 ask.c:83
++#: ask.c:80 ask.c:84
+ #, fuzzy
+ msgid "Proceed?"
+ msgstr "Fortfahren? [Y/n]"
+
+-#: ask.c:106
++#: ask.c:115
+ #, c-format
+ msgid "%s: required \"%s\" is provided by the following packages:"
+ msgstr ""
+
+-#: ask.c:109
++#: ask.c:118
+ #, c-format
+ msgid "Required \"%s\" is provided by the following packages:"
+ msgstr ""
+
+-#: ask.c:128
++#: ask.c:131
++msgid "-/backspace/pgup) page up"
++msgstr ""
++
++#: ask.c:143
++msgid "+/space/tab/pgdown) page down"
++msgstr ""
++
++#: ask.c:151
+ #, fuzzy, c-format
+-msgid "Which one do you want to install ('Q' to abort)? [%c]"
++msgid "Which one do you want to install ('Q' to abort)? [%s]"
+ msgstr "Welches willst du installieren? [a]"
+
+-#: ask.c:166
++#: ask.c:198
+ #, fuzzy, c-format
+ msgid "Package %s suggests installation of:"
+ msgstr "%s: Installation fehlgeschlagen:"
+
+-#: ask.c:168
++#: ask.c:200
+ #, fuzzy
+ msgid "Try to install it?"
+ msgid_plural "Try to install them?"
+@@ -83,124 +91,124 @@ msgstr[0] "_, %d noch zu entfernen"
+ msgstr[1] "_, %d noch zu entfernen"
+ msgstr[2] "_, %d noch zu entfernen"
+
+-#: ask.c:180
++#: ask.c:212
+ #, c-format
+ msgid "(y - all, n - nothing, s - select some of)? [%s]"
+ msgstr ""
+
+-#: ask.c:203
++#: ask.c:235
+ #, fuzzy, c-format
+ msgid "Try to install %s?"
+ msgstr "_, %d noch zu entfernen"
+
+-#: capreq.c:343
++#: capreq.c:344
+ #, c-format
+ msgid "%s: invalid rpmlib capreq"
+ msgstr "%s: ungültige rpmlib capreq"
+
+-#: cli/alias.c:40
++#: cli/alias.c:41
+ #, fuzzy
+ msgid "Print defined command aliases"
+ msgstr " definierte Pseudonyme:\n"
+
+-#: cli/alias.c:100
++#: cli/alias.c:101
+ #, fuzzy, c-format
+ msgid "%s: alias could not shadow a command"
+ msgstr "%s: dieses Kommando gibt es nicht"
+
+-#: cli/alias.c:105
++#: cli/alias.c:106
+ #, c-format
+ msgid "%s (%s) overwrites %s"
+ msgstr ""
+
+-#: cli/alias.c:159
++#: cli/alias.c:160
+ #, fuzzy, c-format
+ msgid "%s: could not determine aliased command"
+ msgstr "%s: dieses Kommando gibt es nicht"
+
+-#: cli/alias.c:162
++#: cli/alias.c:163
+ #, c-format
+ msgid "%s => aliased %s"
+ msgstr ""
+
+-#: cli/cd.c:31
++#: cli/cd.c:32
+ msgid "[PATH]"
+ msgstr ""
+
+-#: cli/cd.c:31
++#: cli/cd.c:32
+ msgid "Change current package directory"
+ msgstr ""
+
+-#: cli/cd.c:38
++#: cli/cd.c:39
+ msgid "Print name of current directory"
+ msgstr ""
+
+-#: cli/cli.c:211
++#: cli/cli.c:212
+ msgid " Defined aliases:\n"
+ msgstr " definierte Pseudonyme:\n"
+
+-#: cli/cli.c:230 cli/main.c:127
++#: cli/cli.c:231 cli/main.c:128
+ msgid "Be verbose."
+ msgstr "Sei ausführlich"
+
+-#: cli/cli.c:231
++#: cli/cli.c:232
+ msgid "Be quiet"
+ msgstr ""
+
+-#: cli/cli.c:232
++#: cli/cli.c:233
+ msgid "Help"
+ msgstr ""
+
+-#: cli/cli.c:419
++#: cli/cli.c:420
+ #, c-format
+ msgid "ambiguous command %s"
+ msgstr "mehrdeutiger Befehl '%s'"
+
+-#: cli/cmd_chain.c:194
++#: cli/cmd_chain.c:195
+ #, c-format
+ msgid "%s: no such command"
+ msgstr "%s: dieses Kommando gibt es nicht"
+
+-#: cli/cmd_chain.c:211
++#: cli/cmd_chain.c:212
+ #, fuzzy, c-format
+ msgid "%s: ambiguous command"
+ msgstr "mehrdeutiger Befehl '%s'"
+
+-#: cli/cmd_chain.c:303
++#: cli/cmd_chain.c:304
+ #, fuzzy, c-format
+ msgid "%s: alias needs an arguments"
+ msgstr "die Option benötigt ein Argument -- %s"
+
+-#: cli/cmd_chain.c:309
++#: cli/cmd_chain.c:310
+ #, c-format
+ msgid "%s: apply arguments failed (not enough arguments?)"
+ msgstr ""
+
+-#: cli/cmd_chain.c:351 cli/install.c:519 cli/uninstall.c:198
++#: cli/cmd_chain.c:352 cli/install.c:529 cli/uninstall.c:199
+ #, fuzzy, c-format
+ msgid "%s: parse error"
+ msgstr "%s: Fehler bei der Analyse der URL"
+
+-#: cli/cmd_chain.c:435
++#: cli/cmd_chain.c:436
+ #, fuzzy, c-format
+ msgid "%s: not a right pipe-able command"
+ msgstr "%s: dieses Kommando gibt es nicht"
+
+-#: cli/cmd_chain.c:446
++#: cli/cmd_chain.c:447
+ #, c-format
+ msgid "%s: where is the pipe going?"
+ msgstr ""
+
+-#: cli/cmd_chain.c:454
++#: cli/cmd_chain.c:455
+ #, c-format
+ msgid "%s: not a left pipe-able command"
+ msgstr ""
+
+-#: cli/dbcache.c:191
++#: cli/dbcache.c:192
+ msgid "Load installed packages failed"
+ msgstr "Lesen der Liste der installierten Pakete fehlgeschlagen"
+
+-#: cli/dbcache.c:195 pkgdir/pkgdir.c:665
++#: cli/dbcache.c:196 pkgdir/pkgdir.c:665
+ #, c-format
+ msgid "%d package loaded"
+ msgid_plural "%d packages loaded"
+@@ -208,75 +216,75 @@ msgstr[0] "%d Pakete gelesen"
+ msgstr[1] "%d Paket gelesen"
+ msgstr[2] "%d Pakete gelesen"
+
+-#: cli/dent.c:660
++#: cli/dent.c:669
+ #, fuzzy, c-format
+ msgid "%s: no such package or directory"
+ msgstr "%s: Verzeichnis existiert nicht"
+
+-#: cli/desc.c:71
++#: cli/desc.c:72
+ #, fuzzy
+ msgid "Show all fields described below"
+ msgstr "Zeige alle unten aufgeführten Felder"
+
+-#: cli/desc.c:74
++#: cli/desc.c:75
+ msgid "Show capabilities, requirements, conflicts and obsolences"
+ msgstr "Zeige Fahigkeiten, Vorraussetzungen, Konflikte und Veraltetes"
+
+-#: cli/desc.c:77
++#: cli/desc.c:78
+ msgid "Show package's capablities"
+ msgstr "Zeige die Fähigkeiten des Paketes"
+
+-#: cli/desc.c:80
++#: cli/desc.c:81
+ msgid "Show requirements"
+ msgstr "Zeige Vorraussetzungen"
+
+-#: cli/desc.c:83
++#: cli/desc.c:84
+ msgid "Show required packages"
+ msgstr "Zeige benötigte Pakete"
+
+-#: cli/desc.c:86
++#: cli/desc.c:87
+ msgid "Show packages which requires given package"
+ msgstr "Zeige Pakete, die das angegebene Paket benötigen"
+
+-#: cli/desc.c:89
++#: cli/desc.c:90
+ msgid "Show conflicts and obsolences"
+ msgstr "Zeige Konflikte und Veraltetes"
+
+-#: cli/desc.c:91
++#: cli/desc.c:92
+ msgid "Show description (the default)"
+ msgstr "Zeige Beschreibung (der Standard)"
+
+-#: cli/desc.c:94
++#: cli/desc.c:95
+ msgid "Show package files (doubled gives long listing format)"
+ msgstr "Zeige Paketdateien (doppelt angeben für detailliertes Format)"
+
+-#: cli/desc.c:97
++#: cli/desc.c:98
+ #, fuzzy
+ msgid "Show package changelog"
+ msgstr "Zeige Paketdateien"
+
+-#: cli/desc.c:104 cli/get.c:47 cli/install.c:206 cli/uninstall.c:71
++#: cli/desc.c:105 cli/get.c:48 cli/install.c:212 cli/uninstall.c:72
+ msgid "PACKAGE..."
+ msgstr "PAKET..."
+
+-#: cli/desc.c:104
++#: cli/desc.c:105
+ msgid "Display packages info"
+ msgstr "Zeige Paketinformationen"
+
+-#: cli/desc.c:635
++#: cli/desc.c:636
+ msgid "mode"
+ msgstr "Modus"
+
+-#: cli/desc.c:635 cli/ls.c:425 cli/ls.c:439 cli/ls.c:442
++#: cli/desc.c:636 cli/ls.c:466 cli/ls.c:480 cli/ls.c:483
+ msgid "size"
+ msgstr "Größe"
+
+-#: cli/desc.c:635
++#: cli/desc.c:636
+ #, fuzzy
+ msgid "name"
+ msgstr "Name"
+
+-#: cli/desc.c:998
++#: cli/desc.c:999
+ #, fuzzy, c-format
+ msgid ""
+ "%s: full description unavailable (index without packages info loaded?)\n"
+@@ -296,29 +304,29 @@ msgstr ""
+ msgid "%s: external command not found"
+ msgstr "%s: Vorraussetzung '%s' nicht gefunden"
+
+-#: cli/get.c:41
++#: cli/get.c:42
+ msgid "Download to directory DIR instead to current one"
+ msgstr "Speichere im Verzeichnis DIR anstelle im aktuellen Verzeichnis"
+
+-#: cli/get.c:47
++#: cli/get.c:48
+ msgid "Download packages"
+ msgstr "Übertrage Pakete"
+
+-#: cli/get.c:62 cli/install.c:496 misc.c:296
++#: cli/get.c:63 cli/install.c:506 misc.c:297
+ #, c-format
+ msgid "%s: no such directory"
+ msgstr "%s: Verzeichnis existiert nicht"
+
+-#: cli/help.c:28
++#: cli/help.c:29
+ msgid "Display this help"
+ msgstr "Zeige diese Hilfe an"
+
+-#: cli/help.c:56
++#: cli/help.c:57
+ #, c-format
+ msgid "[OPTION...] %s"
+ msgstr "[OPTION...] %s"
+
+-#: cli/help.c:61
++#: cli/help.c:62
+ #, c-format
+ msgid ""
+ "\n"
+@@ -327,47 +335,47 @@ msgstr ""
+ "\n"
+ "Gib BEFEHL -? für eine detaillierte Hilfe ein.\n"
+
+-#: cli/install.c:74
++#: cli/install.c:77
+ msgid "Install, not upgrade packages"
+ msgstr "Pakete werden nur installiert, nicht aktualisiert"
+
+-#: cli/install.c:75
++#: cli/install.c:78
+ #, fuzzy
+ msgid "Reinstall"
+ msgstr "installiert"
+
+-#: cli/install.c:76 cli/install.c:155
++#: cli/install.c:79 cli/install.c:161
+ msgid "Downgrade"
+ msgstr ""
+
+-#: cli/install.c:78
++#: cli/install.c:81
+ #, fuzzy
+ msgid "Install packages ignoring broken dependencies, conflicts, etc"
+ msgstr "Installiere Pakete ohne Rücksicht auf die Abhängigkeiten"
+
+-#: cli/install.c:79
++#: cli/install.c:82
+ msgid "Don't install, but tell if it would work or not"
+ msgstr "Simuliere die Installation"
+
+-#: cli/install.c:81
++#: cli/install.c:84
+ msgid "Upgrade packages, but only if an earlier version currently exists"
+ msgstr "Aktualisiere nur bereits installierte Pakete"
+
+-#: cli/install.c:83
++#: cli/install.c:86
+ #, fuzzy
+ msgid "Don't install packages required by selected ones"
+ msgstr ""
+ "Pakete, die von den ausgewählten Paketen benötigt werden, werden nicht "
+ "automatisch installiert"
+
+-#: cli/install.c:87
++#: cli/install.c:90
+ #, fuzzy
+ msgid "Install packages required by selected ones"
+ msgstr ""
+ "Pakete, die von den ausgewählten Paketen benötigt werden, werden nicht "
+ "automatisch installiert"
+
+-#: cli/install.c:90 cli/install.c:95
++#: cli/install.c:93 cli/install.c:98
+ msgid ""
+ "Automatically upgrade packages which dependencies are broken by unistalled "
+ "ones"
+@@ -375,29 +383,29 @@ msgstr ""
+ "Aktualisiere automatisch alle Pakete, deren Abhängigkeiten durch entfernte "
+ "Pakete verletzt wurden"
+
+-#: cli/install.c:99
++#: cli/install.c:102
+ msgid ""
+ "Download packages to DIR (poldek's cache directory by default)instead of "
+ "install them"
+ msgstr ""
+
+-#: cli/install.c:103
++#: cli/install.c:106
+ msgid "Install packages with broken dependencies"
+ msgstr "Installiere Pakete ohne Rücksicht auf die Abhängigkeiten"
+
+-#: cli/install.c:105
++#: cli/install.c:108
+ msgid ""
+ "Treat requirements with EVR as satisfied by unversioned capabilities (old "
+ "RPM behaviour)"
+ msgstr ""
+
+-#: cli/install.c:109
++#: cli/install.c:112
+ msgid ""
+ "Promote non-existent requirement's epoch to package's one (rpm prior to "
+ "4.2.1 behaviour)"
+ msgstr ""
+
+-#: cli/install.c:114
++#: cli/install.c:117
+ #, fuzzy
+ msgid ""
+ "Print packages file names to FILE (stdout by default) instead of install them"
+@@ -405,506 +413,575 @@ msgstr ""
+ "Schreibe die Dateinamen aller zum Installieren markierten Pakete in die "
+ "Datei FILE (Standard ist die Standardausgabe)"
+
+-#: cli/install.c:118
++#: cli/install.c:121
+ msgid ""
+ "Print packages names to FILE (stdout by default) instead of install them"
+ msgstr ""
+
+-#: cli/install.c:120
++#: cli/install.c:123
+ msgid "Modify only the database"
+ msgstr ""
+ "Installation wird nur in der Datenbank durchgeführt. Es werden keine Dateien "
+ "kopiert oder Skripte ausgeführt."
+
+-#: cli/install.c:123
++#: cli/install.c:126
+ msgid "Same as --nodeps but applied to PM (rpm) only"
+ msgstr ""
+
+-#: cli/install.c:128
++#: cli/install.c:131
+ msgid "Same as --force but applied to PM (rpm) only)"
+ msgstr ""
+
+-#: cli/install.c:132
++#: cli/install.c:135
+ msgid "pass option OPTION to PM binary"
+ msgstr ""
+
+-#: cli/install.c:137 cli/install.c:179
++#: cli/install.c:140 cli/install.c:185
+ #, fuzzy
+ msgid "Do not hold any packages. Disables --hold settings."
+ msgstr "Übertrage Pakete"
+
+-#: cli/install.c:141
++#: cli/install.c:144
+ #, fuzzy
+ msgid "Do not download packages"
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/packages/poldek/poldek-git.patch?r1=1.8&r2=1.9
http://cvs.pld-linux.org/packages/poldek/poldek.spec?r1=1.445&r2=1.446
More information about the pld-cvs-commit
mailing list