[pacman-dev] [PATCH] pacman: print version information in debug output

Allan McRae allan at archlinux.org
Thu Jun 7 00:35:16 EDT 2012


Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/po/ca.po    |   45 ++++++++++++++++++++++++++++++++++-----------
 scripts/po/cs.po    |   42 +++++++++++++++++++++++++++++++-----------
 scripts/po/da.po    |   45 ++++++++++++++++++++++++++++++++++-----------
 scripts/po/de.po    |   45 ++++++++++++++++++++++++++++++++++-----------
 scripts/po/el.po    |   45 ++++++++++++++++++++++++++++++++++-----------
 scripts/po/es.po    |   45 ++++++++++++++++++++++++++++++++++-----------
 scripts/po/fi.po    |   45 ++++++++++++++++++++++++++++++++++-----------
 scripts/po/fr.po    |   45 ++++++++++++++++++++++++++++++++++-----------
 src/pacman/pacman.c |    2 ++
 9 files changed, 271 insertions(+), 88 deletions(-)

diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 79e219a..f179d3e 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
 "PO-Revision-Date: 2012-02-06 13:22+0000\n"
 "Last-Translator: Hector Mtz-Seara <hseara at gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -271,6 +271,9 @@ msgstr "%s no pot estar buit."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s no pot començar amb un guionet."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s no pot contenir dos punts, guions o espais en blanc."
 
@@ -826,18 +829,21 @@ msgstr "Dashabilitant claus revocades del clauer..."
 msgid "Disabling key %s..."
 msgstr "Deshabilitant clau %s..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+#, fuzzy
+msgid "A specified keyfile could not be added to the keyring."
 msgstr ""
 "No s'ha pogut incorporar un arxiu de claus especificat  al anell de claus "
 "gpg."
 
-msgid "A specified key could not be removed from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be removed from the keyring."
 msgstr "No ha pogut esborrar una clau especificada del anell de claus gpg."
 
 msgid "The key identified by %s could not be edited."
 msgstr "No s'ha pogut editar la clau identificada per %s ."
 
-msgid "A specified key could not be exported from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be exported from the keyring."
 msgstr "No s'ha pogut exportar una clau especificada del anell de claus gpg."
 
 msgid "The fingerprint of a specified key could not be determined."
@@ -957,7 +963,8 @@ msgstr "S'està rotant la base de dades en l'emplaçament..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Ha finalitzat. S'ha optimitzat la base de dades del pacman."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+#, fuzzy
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr "Ús: pkgdelta [q] <package1><package2>\\n"
 
 msgid ""
@@ -970,6 +977,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Exemple:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Opcions:\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       minimitza sortida\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -982,6 +1005,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Fitxer de paquet invàlid '%'."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "Els noms dels paquets no coincideixen: '%s' i '%s'"
 
@@ -997,6 +1023,9 @@ msgstr "Generant delta de la versió %s a la versió %s"
 msgid "Delta could not be created."
 msgstr "No s'ha pogut generar delta."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr "Delta generada: '%s'"
 
@@ -1017,9 +1046,6 @@ msgstr ""
 "arxiu paquet.\\nMultiples paquets poden ser afegits poden especificant-los "
 "en la línia de comandes.\\n"
 
-msgid "Options:\\n"
-msgstr "Opcions:\\n"
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr ""
 "  -d, --delta       genera i afegeix delta per l'actualització del packet\\n"
@@ -1045,9 +1071,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "No hi ha res a veure en aquest punt, si us plau continua.\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       minimitza sortida\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr ""
 "  -s, --sign        signa la base de dades amb GnuPG després de "
diff --git a/scripts/po/cs.po b/scripts/po/cs.po
index 5bf0447..9b71bb8 100644
--- a/scripts/po/cs.po
+++ b/scripts/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
 "PO-Revision-Date: 2012-02-02 06:07+0000\n"
 "Last-Translator: Dan McGee <dpmcgee at gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -270,6 +270,9 @@ msgstr "%s nemůže být prázdné."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s nemůže začínat pomlčkou."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s nesmí obsahovat dvojtečky, pomlčky nebo mezery."
 
@@ -778,16 +781,16 @@ msgstr "Rušení odvolaných klíčů v klíčence..."
 msgid "Disabling key %s..."
 msgstr "Rušení klíče %s..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+msgid "A specified keyfile could not be added to the keyring."
 msgstr ""
 
-msgid "A specified key could not be removed from the gpg keychain."
+msgid "A specified key could not be removed from the keyring."
 msgstr ""
 
 msgid "The key identified by %s could not be edited."
 msgstr ""
 
-msgid "A specified key could not be exported from the gpg keychain."
+msgid "A specified key could not be exported from the keyring."
 msgstr ""
 
 msgid "The fingerprint of a specified key could not be determined."
@@ -901,7 +904,8 @@ msgstr "Vyměňují se databáze..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Dokončeno. Databáze pacmana byla optimalizována."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+#, fuzzy
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr "Použití: pkgdelta [-q] <balíček1><balíček2>\\n"
 
 msgid ""
@@ -914,6 +918,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Příklad:    pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Volby:\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet    omezí výpisy\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -926,6 +946,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Neplatný soubor balíčku '%s'."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "Jména balíčků nesouhlasí: '%s' a '%s'"
 
@@ -941,6 +964,9 @@ msgstr "Generuje se delta z verze %s na verzi %s"
 msgid "Delta could not be created."
 msgstr "Delta rozdíl nemohl být vytvořen."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr "Vygenerován delta rozdíl: '%s'"
 
@@ -958,9 +984,6 @@ msgid ""
 "\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
-msgid "Options:\\n"
-msgstr "Volby:\\n"
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr "  -d, --delta    vytvoří a přidá rozdíly (delta) pro update balíčků\\n"
 
@@ -980,9 +1003,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet    omezí výpisy\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr "  -s, --sign    po update podepíše databázi pomocí GnuPG\\n"
 
diff --git a/scripts/po/da.po b/scripts/po/da.po
index a654b1b..96cfa2f 100644
--- a/scripts/po/da.po
+++ b/scripts/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
 "PO-Revision-Date: 2012-03-31 16:48+0000\n"
 "Last-Translator: jakobw <jakob.wadsager at gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -267,6 +267,9 @@ msgstr "%s må ikke være tom."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s må ikke starte med en bindestreg."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s må ikke indeholde koloner, bindestreger eller mellemrum."
 
@@ -799,16 +802,19 @@ msgstr "Deaktiverer tilbagekaldte nøgler i nøglering..."
 msgid "Disabling key %s..."
 msgstr "Deaktiverer nøgle %s..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+#, fuzzy
+msgid "A specified keyfile could not be added to the keyring."
 msgstr "En angivet nøglefil kunne ikke tilføjes til gpg-nøgleringen."
 
-msgid "A specified key could not be removed from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be removed from the keyring."
 msgstr "En angivet nøgle kunne ikke fjernes fra gpg-nøgleringen."
 
 msgid "The key identified by %s could not be edited."
 msgstr "Nøglen identificeret ved %s kunne ikke redigeres."
 
-msgid "A specified key could not be exported from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be exported from the keyring."
 msgstr "En angivet nøgle kunne ikke blive eksporteret fra gpg-nøgleringen."
 
 msgid "The fingerprint of a specified key could not be determined."
@@ -923,7 +929,8 @@ msgstr "Roterer database på plads..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Færdig. Din pacman-database er blevet optimeret."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+#, fuzzy
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr "Brug: pkgdelta [-q] <pakke1> <pakke2>\\n"
 
 msgid ""
@@ -936,6 +943,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Eksempel:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Valgmuligheder:\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       minimer uddata\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -948,6 +971,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Ugyldig pakkefil '%s'."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "Pakkenavnene er ikke ens: '%s' og '%s'"
 
@@ -963,6 +989,9 @@ msgstr "Genererer delta fra version %s til version %s"
 msgid "Delta could not be created."
 msgstr "Delta kunne ikke oprettes."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr "Genereret delta : '%s'"
 
@@ -982,9 +1011,6 @@ msgstr ""
 "repo-add opdaterer en pakkedatabase ved at læse en pakkefil. \\nFlere pakker "
 "kan tilføjes ved at angive disse på kommandolinien.\\n"
 
-msgid "Options:\\n"
-msgstr "Valgmuligheder:\\n"
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr "  -d, --delta       generer og tilføj delta for pakkeopdatering\\n"
 
@@ -1007,9 +1033,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "Fortsæt venligst, der er ikke noget at se her.\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       minimer uddata\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr "  -s, --sign        signer database med GnuPG efter opdatering\\n"
 
diff --git a/scripts/po/de.po b/scripts/po/de.po
index d1bd9ae..fc2015c 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
 "PO-Revision-Date: 2012-03-29 10:22+0000\n"
 "Last-Translator: Matthias Gorissen <matthias at archlinux.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -276,6 +276,9 @@ msgstr "%s darf nicht leer sein."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s darf nicht mit einem Bindestrich beginnen."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s darf keine Doppelpunkte, Bindestriche oder Leerzeichen enthalten."
 
@@ -858,12 +861,14 @@ msgstr "Mache widerrufene Schlüssel im Schlüsselbund unbrauchbar ..."
 msgid "Disabling key %s..."
 msgstr "Mache  Schlüssel %s unbrauchbar ..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+#, fuzzy
+msgid "A specified keyfile could not be added to the keyring."
 msgstr ""
 "Eine spezifizierte Schlüsseldatei konnte nicht zum GPG-Schlüsselbund "
 "hinzugefügt werden."
 
-msgid "A specified key could not be removed from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be removed from the keyring."
 msgstr ""
 "Ein spezifizierter Schlüssel konnte nicht vom GPG-Schlüsselbund entfernt "
 "werden."
@@ -871,7 +876,8 @@ msgstr ""
 msgid "The key identified by %s could not be edited."
 msgstr "Der von %s identifizierte Schlüssel konnte nicht bearbeitet werden."
 
-msgid "A specified key could not be exported from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be exported from the keyring."
 msgstr ""
 "Ein bestimmter Schlüssel konnte nicht vom GPG-Schlüsselbund exportiert "
 "werden."
@@ -996,7 +1002,8 @@ msgstr "Verschiebe neue Datenbank an ihren Ort..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Fertig. Ihre Pacman-Datenbank wurde optimiert."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+#, fuzzy
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr "Verwendung: pkgdelta [-q] <Paket1> <Paket2>\\n"
 
 msgid ""
@@ -1010,6 +1017,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Beispiel:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Optionen:\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       minimiere Ausgaben\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -1022,6 +1045,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Ungültige Paket-Datei '%s'."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "Die Paketnamen stimmen nicht überein: '%s' und '%s'"
 
@@ -1037,6 +1063,9 @@ msgstr "Erstelle Delta von Version %s zu Version %s"
 msgid "Delta could not be created."
 msgstr "Delta konnte nicht erstellt werden."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr "Erstellte Delta: '%s'"
 
@@ -1058,9 +1087,6 @@ msgstr ""
 "ausliest.\\nWenn mehrere Pakete hinzugefügt werden sollen, kann dies auf der "
 "Kommando-Zeile spezifiziert werden.\\n"
 
-msgid "Options:\\n"
-msgstr "Optionen:\\n"
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr ""
 "  -d, --delta       erzeuge und füge Delta-Datei für Paket-Update hinzu"
@@ -1085,9 +1111,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "Bitte weiter gehen. Hier gibt es nichts zu sehen.\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       minimiere Ausgaben\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr "  -s, --sign       signiere Datenbank mit GnuPG nach dem Update\\n"
 
diff --git a/scripts/po/el.po b/scripts/po/el.po
index 5a6dc88..b6ac674 100644
--- a/scripts/po/el.po
+++ b/scripts/po/el.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
 "PO-Revision-Date: 2012-02-02 08:19+0000\n"
 "Last-Translator: Christos Nouskas <nous at archlinux.us>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -267,6 +267,9 @@ msgstr "Το %s δεν επιτρέπεται να είναι κενό."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "Το %s δεν επιτρέπεται να ξεκινά με παύλα."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "Δεν επιτρέπεται η χρήση ερωτηματικού, παύλας ή διαστήματος στο %s."
 
@@ -798,16 +801,19 @@ msgstr "Απενεργοποίηση ανακληθέντων κλειδιών 
 msgid "Disabling key %s..."
 msgstr "Απενεργοποίηση κλειδιού %s..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+#, fuzzy
+msgid "A specified keyfile could not be added to the keyring."
 msgstr "Αδυναμία προσθήκης αρχείου κλειδιών στην κλειδοθήκη gpg."
 
-msgid "A specified key could not be removed from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be removed from the keyring."
 msgstr "Αδυναμία διαγραφής κλειδιού από την κλειδοθήκη gpg."
 
 msgid "The key identified by %s could not be edited."
 msgstr "Αδυναμία επεξεργασίας κλειδιού %s."
 
-msgid "A specified key could not be exported from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be exported from the keyring."
 msgstr "Αδυναμία εξαγωγής κλειδιού από την κλειδοθήκη gpg."
 
 msgid "The fingerprint of a specified key could not be determined."
@@ -923,7 +929,8 @@ msgstr "Μεταστροφή βάσης..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Τέλος. Η βάση πακέτων του pacman βελτιστοποιήθηκε."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+#, fuzzy
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr "Χρήση: pkgdelta [-q] <πακέτο1> <πακέτο2>\\n"
 
 msgid ""
@@ -936,6 +943,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Παράδειγμα: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Επιλογές:\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       περιστολή πληροφορίας\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -949,6 +972,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Άκυρο όνομα πακέτου '%s'."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "Τα ονόματα των πακέτων δεν ταιριάζουν: '%s' και '%s'"
 
@@ -964,6 +990,9 @@ msgstr "Δημιουργία delta από έκδοση %s σε %s"
 msgid "Delta could not be created."
 msgstr "Αδυναμία δημιουργίας delta."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr "Δημιουργία delta: '%s'"
 
@@ -983,9 +1012,6 @@ msgstr ""
 "Το repo-add ενημερώνει μια βάση διαβάζοντας ένα αρχείο πακέτου.\\nΜπορούν να "
 "καθορισθούν στην γραμμή εντολών πολλαπλά πακέτα προς προσθήκη.\\n"
 
-msgid "Options:\\n"
-msgstr "Επιλογές:\\n"
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr ""
 "  -d, --delta       παραγωγή και προσθήκη delta για αναβάθμιση πακέτου\\n"
@@ -1008,9 +1034,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "Συνέχισε παρακάτω, δεν υπάρχει τίποτε να δεις εδώ.\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       περιστολή πληροφορίας\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr "  -s, --sign        υπογραφή βάσης με GnuPG μετά την ενημέρωση\\n"
 
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 0e47f4a..c43bc24 100644
--- a/scripts/po/es.po
+++ b/scripts/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
 "PO-Revision-Date: 2012-04-01 16:26+0000\n"
 "Last-Translator: Angel Velasquez <angvp at archlinux.org>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
@@ -270,6 +270,9 @@ msgstr "No está permitido que %s esté vacío."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "No está permitido que %s comience con un guion."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s no puede tener dos puntos, guiones o espacios en blanco."
 
@@ -833,17 +836,20 @@ msgstr "Desactivación de las llaves revocadas en llavero ..."
 msgid "Disabling key %s..."
 msgstr "Deshabilitando llave %s..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+#, fuzzy
+msgid "A specified keyfile could not be added to the keyring."
 msgstr "La llave especificada no puede ser añadida a la cadena de llaves gpg."
 
-msgid "A specified key could not be removed from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be removed from the keyring."
 msgstr ""
 "La llave especificada no puede ser removida de la cadena de llaves gpg."
 
 msgid "The key identified by %s could not be edited."
 msgstr "La llave identificada por %s no puede ser editada."
 
-msgid "A specified key could not be exported from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be exported from the keyring."
 msgstr ""
 "La llave especificada no puede ser exportada de la cadena de llaves gpg."
 
@@ -964,7 +970,8 @@ msgstr "Rotando el sitio de la base de datos..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Finalizado. Su base de datos de Pacman ha sido optimizada."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+#, fuzzy
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr "Uso: pkgdelta [-q] <paquete1> <paquete2>\\n"
 
 msgid ""
@@ -977,6 +984,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Ejemplo:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Opciones:\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       reducir salida\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -989,6 +1012,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Archivo de paquete no válido '%s'."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "Los nombres de los paquetes no coinciden: '%s' y '%s'"
 
@@ -1004,6 +1030,9 @@ msgstr "Generando delta de versión %s a la versión %s"
 msgid "Delta could not be created."
 msgstr "No se pudo crear delta."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr "Delta generado: '%s'"
 
@@ -1024,9 +1053,6 @@ msgstr ""
 "\\nPueden ser agregados multiples paquetes especificandolo en la linea de "
 "comandos.\\n"
 
-msgid "Options:\\n"
-msgstr "Opciones:\\n"
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr ""
 "  -d, --delta       genera y añade un diferencia para la actualización del"
@@ -1053,9 +1079,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "Por favor siga, no hay nada que ver aquí.\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       reducir salida\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr ""
 "  -s, --sign        firmar la base de datos con GnuPG tras la actualización"
diff --git a/scripts/po/fi.po b/scripts/po/fi.po
index bdc671c..76743b4 100644
--- a/scripts/po/fi.po
+++ b/scripts/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
 "PO-Revision-Date: 2012-02-10 22:06+0000\n"
 "Last-Translator: Larso <larso at gmx.com>\n"
 "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -267,6 +267,9 @@ msgstr "%s ei saa olla tyhjä."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s ei saa alkaa tavuviivalla."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s ei saa sisältää tavuviivoja, kaksoispisteitä eikä tyhjiä välejä."
 
@@ -810,16 +813,19 @@ msgstr "Poistetaan avainnipun mitätöidyt avaimet käytöstä..."
 msgid "Disabling key %s..."
 msgstr "Poistetaan avain %s käytöstä..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+#, fuzzy
+msgid "A specified keyfile could not be added to the keyring."
 msgstr "Määritettyä avaintiedostoa ei voitu lisätä gpg-avainketjuun."
 
-msgid "A specified key could not be removed from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be removed from the keyring."
 msgstr "Määritettyä avainta ei voitu poistaa gpg-avainketjusta."
 
 msgid "The key identified by %s could not be edited."
 msgstr "Avainta tunnisteella %s ei voitu muokata."
 
-msgid "A specified key could not be exported from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be exported from the keyring."
 msgstr "Määritettyä avainta ei voitu viedä gpg-avainketjusta."
 
 msgid "The fingerprint of a specified key could not be determined."
@@ -934,7 +940,8 @@ msgstr "Pyöritellään tietokantaa paikalleen..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Valmis. Pakettitietokantasi on nyt optimoitu."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+#, fuzzy
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr "Käyttö: pkgdelta [-q] <paketti1> <paketti2>\\n"
 
 msgid ""
@@ -947,6 +954,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Esimerkki:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Valinnat:\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       minimoi viestien määrä\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -959,6 +982,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Pakettitiedosto '%s' ei ole kelvollinen."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "Pakettien nimet eivät täsmää: '%s' ja '%s'"
 
@@ -974,6 +1000,9 @@ msgstr "Luodaan deltaa versiosta %s versioon %s"
 msgid "Delta could not be created."
 msgstr "Deltaa ei voitu luoda."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr "Luotiin delta: '%s'"
 
@@ -994,9 +1023,6 @@ msgstr ""
 "repo-add päivittää pakettitietokannan lukemalla pakettitiedoston."
 "\\nKomentorivillä voi antaa useita päivitettäviä paketteja.\\n"
 
-msgid "Options:\\n"
-msgstr "Valinnat:\\n"
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr "  -d, --delta       luo ja lisää delta paketti\\n"
 
@@ -1018,9 +1044,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "Jatkakaa matkaanne, täällä ei ole mitään nähtävää.\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       minimoi viestien määrä\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr "  -s, --sign        allekirjoita tietokanta GnuGP:llä\\n"
 
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index daac032..a3dd57e 100644
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
 "PO-Revision-Date: 2012-02-07 03:54+0000\n"
 "Last-Translator: Dan McGee <dpmcgee at gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -276,6 +276,9 @@ msgstr "%s ne peut pas être vide."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s ne peut pas commencer par un tiret."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s ne peut pas contenir de deux-points, de tirets ou d'espaces."
 
@@ -869,18 +872,21 @@ msgstr "Désactivation des clefs révoquées du porte-clefs…"
 msgid "Disabling key %s..."
 msgstr "Désactivation de la clef %s…"
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+#, fuzzy
+msgid "A specified keyfile could not be added to the keyring."
 msgstr ""
 "Un fichier de clefs spécifié n'a pas pu être ajouté au porte-clefs GPG."
 
-msgid "A specified key could not be removed from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be removed from the keyring."
 msgstr ""
 "Un fichier de clefs spécifié n'a pas pu être supprimé du porte-clefs GPG."
 
 msgid "The key identified by %s could not be edited."
 msgstr "La clef identifiée par %s n'a pas pu être éditée."
 
-msgid "A specified key could not be exported from the gpg keychain."
+#, fuzzy
+msgid "A specified key could not be exported from the keyring."
 msgstr "Une clef spécifiée n'a pas pu être exporté du porte-clef GPG."
 
 msgid "The fingerprint of a specified key could not be determined."
@@ -1008,7 +1014,8 @@ msgstr "Mise en place de la base de données..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Fini. La base de données de pacman a été optimisée."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+#, fuzzy
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr "Utilisation : pkgdelta [-q] <package1> <package2>\\n"
 
 msgid ""
@@ -1021,6 +1028,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Exemple :  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Options :\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       minimise la sortie\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -1033,6 +1056,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr "Le paquet « %s » est invalide."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "Les nom du paquet n'est pas cohérent : « %s » et « %s »"
 
@@ -1048,6 +1074,9 @@ msgstr "Génération du delta de la version %s vers la version %s"
 msgid "Delta could not be created."
 msgstr "Impossible de créer le delta."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr "Delta généré : « %s »"
 
@@ -1070,9 +1099,6 @@ msgstr ""
 "« repo-add » va mêttre à jour un dépot à partir d'un paquet.\\nIl est "
 "possible de spécifier plusieurs paquets à ajouter.\\n"
 
-msgid "Options:\\n"
-msgstr "Options :\\n"
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr ""
 "  -d, --delta       génère et ajoute un delta pour la mise à jour des paquets"
@@ -1100,9 +1126,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "Veuillez partir, il n'y a rien à voir ici.\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       minimise la sortie\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr ""
 "  -s, --sign        signer la base de données avec GnuPG après la mise à jour"
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 73d5be9..6226ee1 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -857,6 +857,8 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	pm_printf(ALPM_LOG_DEBUG, "pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version());
+
 	/* parse the config file */
 	ret = parseconfig(config->configfile);
 	if(ret != 0) {
-- 
1.7.10.3



More information about the pacman-dev mailing list