summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2007-03-04 07:28:48 +0100
committerAaron Griffin <aaron@archlinux.org>2007-03-04 07:28:48 +0100
commita7d7c963579176dfefe424931a57e86bc8b51924 (patch)
treea808cbe75dd7fdc761e7667397efbc43a54437e7 /src
parent549ca632ef08bec2aead4d95f141e28746b35a1e (diff)
downloadpacman-a7d7c963579176dfefe424931a57e86bc8b51924.tar.gz
pacman-a7d7c963579176dfefe424931a57e86bc8b51924.tar.xz
* handle changes: callbacks should check handle first, as there's a few
occasions where some alpm stuff could be used without initializing the library (vercmp is one). TODO make these functions (handle accessors) better by returning "library not initialized" instead of failing. * Removed NoUpgrade lines from pacman.conf - we need to test this! * Re-corrected the lib targets for src/util/* * make dist seems to have updated the po files
Diffstat (limited to 'src')
-rw-r--r--src/pacman/po/de.po105
-rw-r--r--src/pacman/po/fr.po162
-rw-r--r--src/pacman/po/hu.po161
-rw-r--r--src/pacman/po/it.po151
-rw-r--r--src/pacman/po/pacman.pot145
-rw-r--r--src/pacman/po/pt_BR.po163
-rw-r--r--src/util/Makefile.am4
7 files changed, 434 insertions, 457 deletions
diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po
index 3200f1ec..b1d13e07 100644
--- a/src/pacman/po/de.po
+++ b/src/pacman/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-03 09:17+0100\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
"PO-Revision-Date: 2007-03-03 09:37+0100\n"
"Last-Translator: Pierre Schmitz <pierre@archlinux.de>\n"
"Language-Team: Deutsch <archlinux.de>\n"
@@ -38,10 +38,10 @@ msgstr "Lade Paketdaten ... "
msgid "failed to add target '%s' (%s)"
msgstr "Konnte Paket '%s' nicht hinzufügen (%s)"
-#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
-#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
-#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
-#: src/pacman/trans.c:142
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:71
+#: src/pacman/trans.c:78 src/pacman/trans.c:82 src/pacman/trans.c:92
+#: src/pacman/trans.c:106 src/pacman/trans.c:120 src/pacman/trans.c:132
+#: src/pacman/trans.c:143
msgid "done.\n"
msgstr "fertig.\n"
@@ -375,7 +375,8 @@ msgstr " -d, --nodeps Überspringt die Abhängigkeitsprüfung\n"
#: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140
#, c-format
msgid " -f, --force force install, overwrite conflicting files\n"
-msgstr " -f, --force Installation erzwingen, Dateikonflikte überschreiben\n"
+msgstr ""
+" -f, --force Installation erzwingen, Dateikonflikte überschreiben\n"
#: src/pacman/pacman.c:104
#, c-format
@@ -384,12 +385,15 @@ msgstr "Benutzung: %s {-R --remove} [Optionen] <Paket>\n"
#: src/pacman/pacman.c:106
#, c-format
-msgid " -c, --cascade remove packages and all packages that depend on them\n"
-msgstr " -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n"
+msgid ""
+" -c, --cascade remove packages and all packages that depend on them\n"
+msgstr ""
+" -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n"
#: src/pacman/pacman.c:108
#, c-format
-msgid " -k, --dbonly only remove database entry, do not remove files\n"
+msgid ""
+" -k, --dbonly only remove database entry, do not remove files\n"
msgstr " -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien\n"
#: src/pacman/pacman.c:109
@@ -399,7 +403,8 @@ msgstr " -n, --nosave Auch Konfigurationsdateien entfernen\n"
#: src/pacman/pacman.c:110
#, c-format
-msgid " -s, --recursive remove dependencies also (that won't break packages)\n"
+msgid ""
+" -s, --recursive remove dependencies also (that won't break packages)\n"
msgstr ""
" -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine "
"Pakete)\n"
@@ -481,7 +486,8 @@ msgstr ""
msgid ""
" -s, --search search locally-installed packages for matching "
"strings\n"
-msgstr " -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n"
+msgstr ""
+" -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n"
#: src/pacman/pacman.c:133
#, c-format
@@ -518,8 +524,10 @@ msgstr ""
#: src/pacman/pacman.c:144
#, c-format
-msgid " -s, --search search remote repositories for matching strings\n"
-msgstr " -s, --search Durchsuche entfernte Repositorien nach einem Wort\n"
+msgid ""
+" -s, --search search remote repositories for matching strings\n"
+msgstr ""
+" -s, --search Durchsuche entfernte Repositorien nach einem Wort\n"
#: src/pacman/pacman.c:145
#, c-format
@@ -537,7 +545,8 @@ msgstr ""
#: src/pacman/pacman.c:147
#, c-format
-msgid " -y, --refresh download fresh package databases from the server\n"
+msgid ""
+" -y, --refresh download fresh package databases from the server\n"
msgstr " -y, --refresh Lade frische Paketdatenbank vom Server\n"
#: src/pacman/pacman.c:148
@@ -561,20 +570,25 @@ msgstr " --noconfirm Niemals nach einer Bestätigung fragen\n"
#: src/pacman/pacman.c:152
#, c-format
-msgid " --ask <number> pre-specify answers for questions (see manpage)\n"
-msgstr " --ask <Nummer> Antworten für Fragen vorherbestimmen (Siehe manpage)\n"
+msgid ""
+" --ask <number> pre-specify answers for questions (see manpage)\n"
+msgstr ""
+" --ask <Nummer> Antworten für Fragen vorherbestimmen (Siehe manpage)\n"
#: src/pacman/pacman.c:153
#, c-format
-msgid " --noprogressbar do not show a progress bar when downloading files\n"
+msgid ""
+" --noprogressbar do not show a progress bar when downloading files\n"
msgstr ""
" --noprogressbar Keine Fortschrittsanzeige anzeigen, wenn Dateien\n"
" heruntergeladen werden\n"
#: src/pacman/pacman.c:154
#, c-format
-msgid " --noscriptlet do not execute the install scriptlet if there is any\n"
-msgstr " --noscriptlet Installationskript nicht ausführen, falls vorhanden\n"
+msgid ""
+" --noscriptlet do not execute the install scriptlet if there is any\n"
+msgstr ""
+" --noscriptlet Installationskript nicht ausführen, falls vorhanden\n"
#: src/pacman/pacman.c:155
#, c-format
@@ -915,124 +929,124 @@ msgstr ""
msgid "Proceed with installation? [Y/n] "
msgstr "Installation fortsetzen? [J/n] "
-#: src/pacman/trans.c:52
+#: src/pacman/trans.c:53
msgid "checking dependencies... "
msgstr "Prüfe Abhängigkeiten... "
-#: src/pacman/trans.c:56
+#: src/pacman/trans.c:57
msgid "checking for file conflicts... "
msgstr "Prüfe auf Dateikonflikte... "
-#: src/pacman/trans.c:60
+#: src/pacman/trans.c:61
msgid "cleaning up... "
msgstr "Räume auf... "
-#: src/pacman/trans.c:63
+#: src/pacman/trans.c:64
msgid "resolving dependencies... "
msgstr "Löse Abhängigkeiten auf... "
-#: src/pacman/trans.c:66
+#: src/pacman/trans.c:67
msgid "looking for inter-conflicts... "
msgstr "Suche nach Zwischen-Konflikten... "
-#: src/pacman/trans.c:86
+#: src/pacman/trans.c:87
#, c-format
msgid "installing %s... "
msgstr "Installiere %s... "
-#: src/pacman/trans.c:93
+#: src/pacman/trans.c:94
#, c-format
msgid "installed %s (%s)"
msgstr "%s (%s) installiert"
-#: src/pacman/trans.c:100
+#: src/pacman/trans.c:101
#, c-format
msgid "removing %s... "
msgstr "Entferne %s... "
-#: src/pacman/trans.c:107
+#: src/pacman/trans.c:108
#, c-format
msgid "removed %s (%s)"
msgstr "%s (%s) entfernt"
-#: src/pacman/trans.c:114
+#: src/pacman/trans.c:115
#, c-format
msgid "upgrading %s... "
msgstr "Aktualisiere %s... "
-#: src/pacman/trans.c:121
+#: src/pacman/trans.c:122
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr "%s (%s -> %s) aktualisiert"
-#: src/pacman/trans.c:128
+#: src/pacman/trans.c:129
msgid "checking package integrity... "
msgstr "Prüfe Paketintegrität... "
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:145
msgid "failed.\n"
msgstr "fehlgeschlagen.\n"
-#: src/pacman/trans.c:151
+#: src/pacman/trans.c:152
#, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ":: Empfange Pakete von %s...\n"
-#: src/pacman/trans.c:171
+#: src/pacman/trans.c:172
#, c-format
msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
msgstr ""
":: %s ist in IgnorePkg, wird aber von %s benötigt. Trotzdem installieren? [J/"
"n] "
-#: src/pacman/trans.c:176
+#: src/pacman/trans.c:177
#, c-format
msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
msgstr ":: %s ist in IgnorePkg. Trotzdem installieren? [J/n] "
-#: src/pacman/trans.c:189
+#: src/pacman/trans.c:190
#, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ":: %s ist als ein HoldPkg gekennzeichnet. Trotzdem entfernen? [J/n] "
-#: src/pacman/trans.c:202
+#: src/pacman/trans.c:203
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ":: %s mit %s/%s ersetzen? [J/n] "
-#: src/pacman/trans.c:217
+#: src/pacman/trans.c:218
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ":: %s steht im Konflikt mit %s. %s entfernen? [J/n] "
-#: src/pacman/trans.c:233
+#: src/pacman/trans.c:234
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ":: %s-%s: Lokale Version ist neuer. Trotzdem aktualisieren? [J/n] "
-#: src/pacman/trans.c:251
+#: src/pacman/trans.c:252
#, c-format
msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
msgstr ":: %s-%s: Lokale Version ist aktuell. Trotzdem aktualisieren? [J/n] "
-#: src/pacman/trans.c:269
+#: src/pacman/trans.c:270
#, c-format
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: Archiv %s ist beschädigt. Möchten Sie es löschen? [J/n] "
-#: src/pacman/trans.c:323
+#: src/pacman/trans.c:326
msgid "installing"
msgstr "Installiere"
-#: src/pacman/trans.c:326
+#: src/pacman/trans.c:329
msgid "upgrading"
msgstr "Aktualisiere"
-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:332
msgid "removing"
msgstr "entferne"
-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:335
msgid "checking for file conflicts"
msgstr "Prüfe auf Dateikonflikte"
@@ -1067,4 +1081,3 @@ msgstr ""
#, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr "Gesamtgröße der installierten Pakete : %.2f MB\n"
-
diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po
index 11b7d15b..96181915 100644
--- a/src/pacman/po/fr.po
+++ b/src/pacman/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pacman\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
"PO-Revision-Date: 2006-06-05 22:46+0100\n"
"Last-Translator: Enda <enda@netou.com>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"X-Poedit-Language: French\n"
"X-Poedit-Country: FRANCE\n"
-#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:482 src/pacman/sync.c:531
+#: src/pacman/add.c:69 src/pacman/remove.c:79 src/pacman/sync.c:482
+#: src/pacman/sync.c:531
#, fuzzy, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -36,10 +36,10 @@ msgstr "chargement des données du paquet.."
msgid "failed to add target '%s' (%s)"
msgstr "échec d'ajout de la cible '%s' (%s)\n"
-#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
-#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
-#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
-#: src/pacman/trans.c:142
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:71
+#: src/pacman/trans.c:78 src/pacman/trans.c:82 src/pacman/trans.c:92
+#: src/pacman/trans.c:106 src/pacman/trans.c:120 src/pacman/trans.c:132
+#: src/pacman/trans.c:143
msgid "done.\n"
msgstr "fait.\n"
@@ -48,27 +48,27 @@ msgstr "fait.\n"
msgid "failed to prepare transaction (%s)\n"
msgstr "échec de préparation de la transaction (%s)\n"
-#: src/pacman/add.c:97
+#: src/pacman/add.c:101
#, c-format
msgid ":: %s: requires %s"
msgstr ":: %s: requiert %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:645
+#: src/pacman/add.c:122 src/pacman/sync.c:645
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: conflit avec %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:709
+#: src/pacman/add.c:131 src/pacman/sync.c:709
#, fuzzy, c-format
-msgid "%s%s exists in both '%s' and '%s'\n"
+msgid "%s exists in both '%s' and '%s'\n"
msgstr "%s%s existe dans \"%s\" (cible) and \"%s\" (cible)"
-#: src/pacman/add.c:134 src/pacman/sync.c:716
+#: src/pacman/add.c:137 src/pacman/sync.c:715
#, fuzzy, c-format
-msgid "%s: %s%s exists in filesystem\n"
+msgid "%s: %s exists in filesystem\n"
msgstr "%s: %s%s existe dans le système de fichiers"
-#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729
+#: src/pacman/add.c:143 src/pacman/sync.c:721 src/pacman/sync.c:727
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -76,51 +76,27 @@ msgstr ""
"\n"
"des erreurs se sont produites, aucun paquet n'a été mis à jour.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:652
+#: src/pacman/add.c:153 src/pacman/sync.c:652
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ""
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702
+#: src/pacman/add.c:166 src/pacman/remove.c:138 src/pacman/sync.c:702
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "échec de validation de la transaction (%s)\n"
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524
-#: src/pacman/sync.c:745
+#: src/pacman/add.c:176 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/sync.c:743
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "échec de libération de la transaction (%s)\n"
-#: src/pacman/deptest.c:70
-msgid "memory allocation failure\n"
-msgstr "erreur d'allocation mémoire\n"
-
-#: src/pacman/deptest.c:81
-#, c-format
-msgid "add target %s\n"
-msgstr "ajout de la cible %s\n"
-
-#: src/pacman/deptest.c:84
-#, c-format
-msgid "could not add target (%s)\n"
-msgstr "n'a pas pu ajouter la cible (%s)\n"
-
-#: src/pacman/deptest.c:103
+#: src/pacman/deptest.c:64
#, c-format
msgid "requires: %s"
msgstr "requiert: %s"
-#: src/pacman/deptest.c:127
-#, c-format
-msgid "conflict: %s"
-msgstr "conflit: %s"
-
-#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
-#, c-format
-msgid "could not release transaction (%s)"
-msgstr "n'a pas pu libérer la transaction (%s)"
-
#: src/pacman/log.c:61
#, c-format
msgid "debug"
@@ -333,7 +309,7 @@ msgstr "MANQUANT\t\t%s\n"
msgid "(none)\n"
msgstr "Aucun\n"
-#: src/pacman/package.c:234
+#: src/pacman/package.c:243
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "Aucun changelog disponible pour '%s'.\n"
@@ -663,62 +639,62 @@ msgstr ""
msgid " the terms of the GNU General Public License\n"
msgstr " les termes de la GNU General Public License\n"
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:297
#, fuzzy, c-format
msgid "'%s' is not a valid debug level"
msgstr "%s nest pas une expression régulière valide.\n"
-#: src/pacman/pacman.c:313
+#: src/pacman/pacman.c:312
#, fuzzy, c-format
msgid "'%s' is not a valid cache directory\n"
msgstr "n'a pas pu acceder au répertoire de cache\n"
-#: src/pacman/pacman.c:339
+#: src/pacman/pacman.c:330
#, fuzzy, c-format
msgid "'%s' is not a valid db path\n"
msgstr "%s nest pas une expression régulière valide.\n"
-#: src/pacman/pacman.c:369
+#: src/pacman/pacman.c:360
#, fuzzy, c-format
msgid "'%s' is not a valid root path\n"
msgstr "%s nest pas une expression régulière valide.\n"
-#: src/pacman/pacman.c:396
+#: src/pacman/pacman.c:387
msgid "only one operation may be used at a time\n"
msgstr "une seule opération peut être effectuée à la fois\n"
-#: src/pacman/pacman.c:442
+#: src/pacman/pacman.c:433
msgid "warning: current locale is invalid; using default \"C\" locale"
msgstr ""
-#: src/pacman/pacman.c:461
+#: src/pacman/pacman.c:452
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "échec d'initialisation de la librairie alpm (%s)\n"
-#: src/pacman/pacman.c:494
+#: src/pacman/pacman.c:485
msgid "you cannot perform this operation unless you are root.\n"
msgstr "vous ne pouvez effectuer cette opération à moins d'être root.\n"
-#: src/pacman/pacman.c:510
+#: src/pacman/pacman.c:501
#, fuzzy, c-format
msgid "failed to parse config (%s)\n"
msgstr "échec de préparation de la transaction (%s)\n"
-#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:511 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Cibles:"
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:517
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr "n'a pas pu enregistrer la base de données 'locale' (%s)\n"
-#: src/pacman/pacman.c:533
+#: src/pacman/pacman.c:524
msgid "no targets specified (use -h for help)\n"
msgstr "aucune cible spécifiée (utiliser -h pour de l'aide)\n"
-#: src/pacman/pacman.c:546
+#: src/pacman/pacman.c:537
msgid "no operation specified (use -h for help)\n"
msgstr "aucune opération spécifiée (utiliser -h pour de l'aide)\n"
@@ -975,126 +951,133 @@ msgstr ""
msgid "Proceed with installation? [Y/n] "
msgstr "Procéder au téléchargement? [O/n] "
-#: src/pacman/trans.c:52
+#: src/pacman/trans.c:53
msgid "checking dependencies... "
msgstr "vérification des dépendances..."
-#: src/pacman/trans.c:56
+#: src/pacman/trans.c:57
msgid "checking for file conflicts... "
msgstr "vérification des conflits de fichiers..."
-#: src/pacman/trans.c:60
+#: src/pacman/trans.c:61
#, fuzzy
msgid "cleaning up... "
msgstr "désinstallation de %s... "
-#: src/pacman/trans.c:63
+#: src/pacman/trans.c:64
msgid "resolving dependencies... "
msgstr "résolution des dépendances..."
-#: src/pacman/trans.c:66
+#: src/pacman/trans.c:67
msgid "looking for inter-conflicts... "
msgstr "recherche inter-conflits... "
-#: src/pacman/trans.c:86
+#: src/pacman/trans.c:87
#, c-format
msgid "installing %s... "
msgstr "installation de %s ..."
-#: src/pacman/trans.c:93
+#: src/pacman/trans.c:94
#, c-format
msgid "installed %s (%s)"
msgstr "%s installé (%s)"
-#: src/pacman/trans.c:100
+#: src/pacman/trans.c:101
#, c-format
msgid "removing %s... "
msgstr "désinstallation de %s... "
-#: src/pacman/trans.c:107
+#: src/pacman/trans.c:108
#, c-format
msgid "removed %s (%s)"
msgstr "%s désinstallé (%s)"
-#: src/pacman/trans.c:114
+#: src/pacman/trans.c:115
#, c-format
msgid "upgrading %s... "
msgstr "mise à jour de %s... "
-#: src/pacman/trans.c:121
+#: src/pacman/trans.c:122
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr "%s mit à jour (%s -> %s)"
-#: src/pacman/trans.c:128
+#: src/pacman/trans.c:129
msgid "checking package integrity... "
msgstr "verification de l'intégrité des paquets"
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:145
msgid "failed.\n"
msgstr ""
-#: src/pacman/trans.c:151
+#: src/pacman/trans.c:152
#, fuzzy, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ""
"\n"
":: Récupération des paquets depuis %s...\n"
-#: src/pacman/trans.c:171
+#: src/pacman/trans.c:172
#, c-format
msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
msgstr ""
":: %s requiert %s, mais il est défini en IgnorePkg. Installer tout de même? "
"[Y/n] "
-#: src/pacman/trans.c:185
+#: src/pacman/trans.c:177
+#, fuzzy, c-format
+msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
+msgstr ""
+":: %s requiert %s, mais il est défini en IgnorePkg. Installer tout de même? "
+"[Y/n] "
+
+#: src/pacman/trans.c:190
#, fuzzy, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ":: %s est indiqué comme \"HoldPkg\". Supprimer tout de même? [Y/n] "
-#: src/pacman/trans.c:198
+#: src/pacman/trans.c:203
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ":: Remplacer %s avec %s/%s? [O/n] "
-#: src/pacman/trans.c:213
+#: src/pacman/trans.c:218
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ":: %s est en conflit avec with %s. Retirer %s? [O/n] "
-#: src/pacman/trans.c:229
+#: src/pacman/trans.c:234
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ""
":: %s-%s: la version locale est plus récente. Mettre à jour tout de même? [Y/"
"n] "
-#: src/pacman/trans.c:247
+#: src/pacman/trans.c:252
#, c-format
msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
msgstr ""
":: %s-%s: la version locale est à jour. Mettre à jour tout de même? [Y/n] "
-#: src/pacman/trans.c:265
+#: src/pacman/trans.c:270
#, c-format
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: L'archive %s est corrompue. Voulez vous l'effacer? [Y/n] "
-#: src/pacman/trans.c:319
+#: src/pacman/trans.c:326
msgid "installing"
msgstr "Installation"
-#: src/pacman/trans.c:322
+#: src/pacman/trans.c:329
msgid "upgrading"
msgstr "Mise à jour"
-#: src/pacman/trans.c:325
+#: src/pacman/trans.c:332
#, fuzzy
msgid "removing"
msgstr "désinstallation de %s... "
-#: src/pacman/trans.c:328
+#: src/pacman/trans.c:335
#, fuzzy
msgid "checking for file conflicts"
msgstr "vérification des conflits de fichiers..."
@@ -1136,6 +1119,21 @@ msgstr ""
"\n"
"Taille Totale du Paquet: %.1f MB\n"
+#~ msgid "memory allocation failure\n"
+#~ msgstr "erreur d'allocation mémoire\n"
+
+#~ msgid "add target %s\n"
+#~ msgstr "ajout de la cible %s\n"
+
+#~ msgid "could not add target (%s)\n"
+#~ msgstr "n'a pas pu ajouter la cible (%s)\n"
+
+#~ msgid "conflict: %s"
+#~ msgstr "conflit: %s"
+
+#~ msgid "could not release transaction (%s)"
+#~ msgstr "n'a pas pu libérer la transaction (%s)"
+
#, fuzzy
#~ msgid " done.\n"
#~ msgstr "fait.\n"
diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po
index 3d6f046a..70e4e4a7 100644
--- a/src/pacman/po/hu.po
+++ b/src/pacman/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
"PO-Revision-Date: 2006-09-03 13:52+0200\n"
"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:482 src/pacman/sync.c:531
+#: src/pacman/add.c:69 src/pacman/remove.c:79 src/pacman/sync.c:482
+#: src/pacman/sync.c:531
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -35,10 +35,10 @@ msgstr "csomag adatainak betöltése... "
msgid "failed to add target '%s' (%s)"
msgstr "nem sikerült a '%s' célt hozzáadni (%s)\n"
-#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
-#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
-#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
-#: src/pacman/trans.c:142
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:71
+#: src/pacman/trans.c:78 src/pacman/trans.c:82 src/pacman/trans.c:92
+#: src/pacman/trans.c:106 src/pacman/trans.c:120 src/pacman/trans.c:132
+#: src/pacman/trans.c:143
msgid "done.\n"
msgstr "kész.\n"
@@ -47,27 +47,27 @@ msgstr "kész.\n"
msgid "failed to prepare transaction (%s)\n"
msgstr "nem sikerült elõkészíteni a tranzakciót (%s)\n"
-#: src/pacman/add.c:97
+#: src/pacman/add.c:101
#, c-format
msgid ":: %s: requires %s"
msgstr ":: %s: igényli a következõt: %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:645
+#: src/pacman/add.c:122 src/pacman/sync.c:645
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: ütközik a következõvel: %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:709
+#: src/pacman/add.c:131 src/pacman/sync.c:709
#, fuzzy, c-format
-msgid "%s%s exists in both '%s' and '%s'\n"
+msgid "%s exists in both '%s' and '%s'\n"
msgstr "%s%s: létezik ebben: \"%s\" (cél) és ebben: \"%s\" (cél)"
-#: src/pacman/add.c:134 src/pacman/sync.c:716
+#: src/pacman/add.c:137 src/pacman/sync.c:715
#, fuzzy, c-format
-msgid "%s: %s%s exists in filesystem\n"
+msgid "%s: %s exists in filesystem\n"
msgstr "%s: a %s%s létezik a fájlrendszerben"
-#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729
+#: src/pacman/add.c:143 src/pacman/sync.c:721 src/pacman/sync.c:727
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -75,51 +75,27 @@ msgstr ""
"\n"
"hibák léptek fel, nem frissült csomag.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:652
+#: src/pacman/add.c:153 src/pacman/sync.c:652
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ":: %.1f MB szükséges, %.1f MB áll rendelkezésre"
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702
+#: src/pacman/add.c:166 src/pacman/remove.c:138 src/pacman/sync.c:702
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "nem sikerült végrehajtani a tranzakciót (%s)\n"
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524
-#: src/pacman/sync.c:745
+#: src/pacman/add.c:176 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/sync.c:743
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "nem sikerült lezárni a tranzakciót (%s)\n"
-#: src/pacman/deptest.c:70
-msgid "memory allocation failure\n"
-msgstr "memória allokálási hiba\n"
-
-#: src/pacman/deptest.c:81
-#, c-format
-msgid "add target %s\n"
-msgstr "cél hozzáadása: %s\n"
-
-#: src/pacman/deptest.c:84
-#, c-format
-msgid "could not add target (%s)\n"
-msgstr "nem sikerült hozzáadni a célt (%s)\n"
-
-#: src/pacman/deptest.c:103
+#: src/pacman/deptest.c:64
#, c-format
msgid "requires: %s"
msgstr "igényli a következõt: %s"
-#: src/pacman/deptest.c:127
-#, c-format
-msgid "conflict: %s"
-msgstr "ütközik a következõvel: %s"
-
-#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
-#, c-format
-msgid "could not release transaction (%s)"
-msgstr "nem sikerült a tranzakciót lezárni (%s)"
-
#: src/pacman/log.c:61
#, c-format
msgid "debug"
@@ -329,7 +305,7 @@ msgstr "HIÁNYZIK\t\t%s\n"
msgid "(none)\n"
msgstr "Nincs\n"
-#: src/pacman/package.c:234
+#: src/pacman/package.c:243
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "Nem áll rendelkezésre változási napló a '%s' csomaghoz.\n"
@@ -645,62 +621,62 @@ msgstr ""
msgid " the terms of the GNU General Public License\n"
msgstr " foglaltak alapján szabadon terjesztheti\n"
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:297
#, fuzzy, c-format
msgid "'%s' is not a valid debug level"
msgstr "%s: nem érvényes reguláris kifejezés.\n"
-#: src/pacman/pacman.c:313
+#: src/pacman/pacman.c:312
#, fuzzy, c-format
msgid "'%s' is not a valid cache directory\n"
msgstr "nem sikerült elérni a gyorsítótár könyvtárát\n"
-#: src/pacman/pacman.c:339
+#: src/pacman/pacman.c:330
#, fuzzy, c-format
msgid "'%s' is not a valid db path\n"
msgstr "%s: nem érvényes reguláris kifejezés.\n"
-#: src/pacman/pacman.c:369
+#: src/pacman/pacman.c:360
#, fuzzy, c-format
msgid "'%s' is not a valid root path\n"
msgstr "%s: nem érvényes reguláris kifejezés.\n"
-#: src/pacman/pacman.c:396
+#: src/pacman/pacman.c:387
msgid "only one operation may be used at a time\n"
msgstr "csak egy mûvelet hajtható végre egyszerre\n"
-#: src/pacman/pacman.c:442
+#: src/pacman/pacman.c:433
msgid "warning: current locale is invalid; using default \"C\" locale"
msgstr ""
-#: src/pacman/pacman.c:461
+#: src/pacman/pacman.c:452
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "nem sikerült inicializálni az alpm könyvtárat (%s)\n"
-#: src/pacman/pacman.c:494
+#: src/pacman/pacman.c:485
msgid "you cannot perform this operation unless you are root.\n"
msgstr "nem hajtható végre ez a mûvelet hacsak nem rendszergazda.\n"
-#: src/pacman/pacman.c:510
+#: src/pacman/pacman.c:501
#, c-format
msgid "failed to parse config (%s)\n"
msgstr "nem sikerült értelmezni a beállítási fájlt (%s)\n"
-#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:511 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Célok:"
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:517
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr "nem sikerült regisztrálni a 'local' adatbázist (%s)\n"
-#: src/pacman/pacman.c:533
+#: src/pacman/pacman.c:524
msgid "no targets specified (use -h for help)\n"
msgstr "nincs megadva egyetlen cél se (használja a '-h'-t segítségért)\n"
-#: src/pacman/pacman.c:546
+#: src/pacman/pacman.c:537
msgid "no operation specified (use -h for help)\n"
msgstr "nincs megadva egyetlen mûvelet se (használja a '-h'-t segítségért)\n"
@@ -955,122 +931,128 @@ msgstr ""
msgid "Proceed with installation? [Y/n] "
msgstr "Kezdõdhet a letöltés? [I/n] "
-#: src/pacman/trans.c:52
+#: src/pacman/trans.c:53
msgid "checking dependencies... "
msgstr "függõségek vizsgálata... "
-#: src/pacman/trans.c:56
+#: src/pacman/trans.c:57
msgid "checking for file conflicts... "
msgstr "fájlütközések vizsgálata... "
-#: src/pacman/trans.c:60
+#: src/pacman/trans.c:61
#, fuzzy
msgid "cleaning up... "
msgstr "%s eltávolítása... "
-#: src/pacman/trans.c:63
+#: src/pacman/trans.c:64
msgid "resolving dependencies... "
msgstr "függõségek feloldása... "
-#: src/pacman/trans.c:66
+#: src/pacman/trans.c:67
msgid "looking for inter-conflicts... "
msgstr "belsõ ütközések keresése... "
-#: src/pacman/trans.c:86
+#: src/pacman/trans.c:87
#, c-format
msgid "installing %s... "
msgstr "%s telepítése... "
-#: src/pacman/trans.c:93
+#: src/pacman/trans.c:94
#, c-format
msgid "installed %s (%s)"
msgstr "%s telepítve (%s)"
-#: src/pacman/trans.c:100
+#: src/pacman/trans.c:101
#, c-format
msgid "removing %s... "
msgstr "%s eltávolítása... "
-#: src/pacman/trans.c:107
+#: src/pacman/trans.c:108
#, c-format
msgid "removed %s (%s)"
msgstr "%s eltávolítva (%s)"
-#: src/pacman/trans.c:114
+#: src/pacman/trans.c:115
#, c-format
msgid "upgrading %s... "
msgstr "%s frissítése... "
-#: src/pacman/trans.c:121
+#: src/pacman/trans.c:122
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr "%s frissítve (%s -> %s)"
-#: src/pacman/trans.c:128
+#: src/pacman/trans.c:129
msgid "checking package integrity... "
msgstr "a csomagok integritásának ellenõrzése... "
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:145
#, fuzzy
msgid "failed.\n"
msgstr " sikertelen.\n"
-#: src/pacman/trans.c:151
+#: src/pacman/trans.c:152
#, fuzzy, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ""
"\n"
":: Csomagok letöltése a %s-bõl...\n"
-#: src/pacman/trans.c:171
+#: src/pacman/trans.c:172
#, c-format
msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
msgstr ""
":: a %s igényli a %s-t, de az az IgnorePkg része. Mégis telepíti? [I/n] "
-#: src/pacman/trans.c:185
+#: src/pacman/trans.c:177
+#, fuzzy, c-format
+msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
+msgstr ""
+":: a %s igényli a %s-t, de az az IgnorePkg része. Mégis telepíti? [I/n] "
+
+#: src/pacman/trans.c:190
#, fuzzy, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ":: a %s HoldPkgnak lett jelölve. Biztosan eltávolítja? [I/n] "
-#: src/pacman/trans.c:198
+#: src/pacman/trans.c:203
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ":: Lecseréli a %s-t erre: %s/%s? [I/n] "
-#: src/pacman/trans.c:213
+#: src/pacman/trans.c:218
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ":: a %s ütközik a következõvel: %s. Eltávolítja a %s-t? [I/n] "
-#: src/pacman/trans.c:229
+#: src/pacman/trans.c:234
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ":: %s-%s: a helyi verzió újabb. Mégis frissíti? [I/n] "
-#: src/pacman/trans.c:247
+#: src/pacman/trans.c:252
#, c-format
msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
msgstr ":: %s-%s: a helyi verzió naprakész. Mégis frissíti? [I/n] "
-#: src/pacman/trans.c:265
+#: src/pacman/trans.c:270
#, c-format
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: A %s sérült. Kívánja törölni? [I/n] "
-#: src/pacman/trans.c:319
+#: src/pacman/trans.c:326
msgid "installing"
msgstr "telepítés:"
-#: src/pacman/trans.c:322
+#: src/pacman/trans.c:329
msgid "upgrading"
msgstr "frissítés:"
-#: src/pacman/trans.c:325
+#: src/pacman/trans.c:332
msgid "removing"
msgstr "eltávolíás:"
-#: src/pacman/trans.c:328
+#: src/pacman/trans.c:335
#, fuzzy
msgid "checking for file conflicts"
msgstr "fájlütközések vizsgálata... "
@@ -1112,6 +1094,21 @@ msgstr ""
"\n"
"Teljes csomagméret: %.1f MB\n"
+#~ msgid "memory allocation failure\n"
+#~ msgstr "memória allokálási hiba\n"
+
+#~ msgid "add target %s\n"
+#~ msgstr "cél hozzáadása: %s\n"
+
+#~ msgid "could not add target (%s)\n"
+#~ msgstr "nem sikerült hozzáadni a célt (%s)\n"
+
+#~ msgid "conflict: %s"
+#~ msgstr "ütközik a következõvel: %s"
+
+#~ msgid "could not release transaction (%s)"
+#~ msgstr "nem sikerült a tranzakciót lezárni (%s)"
+
#~ msgid "] 100% LOCAL "
#~ msgstr "] 100% HELYI "
diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po
index 71a25b46..484f32e0 100644
--- a/src/pacman/po/it.po
+++ b/src/pacman/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.0\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-23 11:47+0100\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
"PO-Revision-Date: 2007-02-23 12:00+0100\n"
"Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
"Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:482 src/pacman/sync.c:531
+#: src/pacman/add.c:69 src/pacman/remove.c:79 src/pacman/sync.c:482
+#: src/pacman/sync.c:531
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -37,10 +37,10 @@ msgstr "caricamento dei dati in corso... "
msgid "failed to add target '%s' (%s)"
msgstr "impossibile aggiungere il pacchetto '%s' (%s)"
-#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
-#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
-#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
-#: src/pacman/trans.c:142
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:71
+#: src/pacman/trans.c:78 src/pacman/trans.c:82 src/pacman/trans.c:92
+#: src/pacman/trans.c:106 src/pacman/trans.c:120 src/pacman/trans.c:132
+#: src/pacman/trans.c:143
msgid "done.\n"
msgstr "fatto.\n"
@@ -49,27 +49,27 @@ msgstr "fatto.\n"
msgid "failed to prepare transaction (%s)\n"
msgstr "preparazione non riuscita (%s)\n"
-#: src/pacman/add.c:97
+#: src/pacman/add.c:101
#, c-format
msgid ":: %s: requires %s"
msgstr ":: %s: richiede %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:645
+#: src/pacman/add.c:122 src/pacman/sync.c:645
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: va in conflitto con %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:709
+#: src/pacman/add.c:131 src/pacman/sync.c:709
#, c-format
msgid "%s exists in both '%s' and '%s'\n"
msgstr "%s è già presente in '%s' e in '%s'\n"
-#: src/pacman/add.c:133 src/pacman/sync.c:715
+#: src/pacman/add.c:137 src/pacman/sync.c:715
#, c-format
msgid "%s: %s exists in filesystem\n"
msgstr "%s: %s è già presente nel filesystem\n"
-#: src/pacman/add.c:139 src/pacman/sync.c:721 src/pacman/sync.c:727
+#: src/pacman/add.c:143 src/pacman/sync.c:721 src/pacman/sync.c:727
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -77,51 +77,27 @@ msgstr ""
"\n"
"si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n"
-#: src/pacman/add.c:149 src/pacman/sync.c:652
+#: src/pacman/add.c:153 src/pacman/sync.c:652
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ":: %.1f MB richiesti, spazio a disposizione %.1f MB"
-#: src/pacman/add.c:162 src/pacman/remove.c:138 src/pacman/sync.c:702
+#: src/pacman/add.c:166 src/pacman/remove.c:138 src/pacman/sync.c:702
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "impossibile eseguire l'operazione richiesta (%s)\n"
-#: src/pacman/add.c:172 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/add.c:176 src/pacman/remove.c:148 src/pacman/sync.c:524
#: src/pacman/sync.c:743
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "impossibile annullare l'operazione richiesta (%s)\n"
-#: src/pacman/deptest.c:70
-msgid "memory allocation failure\n"
-msgstr "allocazione della memoria non riuscita\n"
-
-#: src/pacman/deptest.c:81
-#, c-format
-msgid "add target %s\n"
-msgstr "aggiungere il pacchetto %s\n"
-
-#: src/pacman/deptest.c:84
-#, c-format
-msgid "could not add target (%s)\n"
-msgstr "impossibile aggiungere il pacchetto (%s)\n"
-
-#: src/pacman/deptest.c:103
+#: src/pacman/deptest.c:64
#, c-format
msgid "requires: %s"
msgstr "richiede: %s"
-#: src/pacman/deptest.c:127
-#, c-format
-msgid "conflict: %s"
-msgstr "conflitto: %s"
-
-#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
-#, c-format
-msgid "could not release transaction (%s)"
-msgstr "impossibile annullare l'operazione richiesta (%s)"
-
#: src/pacman/log.c:61
#, c-format
msgid "debug"
@@ -324,7 +300,7 @@ msgstr "MANCANTE\t\t%s\n"
msgid "(none)\n"
msgstr "(nessuno)\n"
-#: src/pacman/package.c:234
+#: src/pacman/package.c:243
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "Nessun changelog disponibile per '%s'.\n"
@@ -648,62 +624,62 @@ msgstr ""
msgid " the terms of the GNU General Public License\n"
msgstr " the terms of the GNU General Public License\n"
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:297
#, c-format
msgid "'%s' is not a valid debug level"
msgstr "'%s' livello di debug non valido"
-#: src/pacman/pacman.c:313
+#: src/pacman/pacman.c:312
#, c-format
msgid "'%s' is not a valid cache directory\n"
msgstr "'%s' non è una directory di cache valida\n"
-#: src/pacman/pacman.c:339
+#: src/pacman/pacman.c:330
#, c-format
msgid "'%s' is not a valid db path\n"
msgstr "'%s' non è un path del database valido\n"
-#: src/pacman/pacman.c:369
+#: src/pacman/pacman.c:360
#, c-format
msgid "'%s' is not a valid root path\n"
msgstr "'%s' path di root non valido\n"
-#: src/pacman/pacman.c:396
+#: src/pacman/pacman.c:387
msgid "only one operation may be used at a time\n"
msgstr "è consentito eseguire solo un'operazione per volta\n"
-#: src/pacman/pacman.c:442
+#: src/pacman/pacman.c:433
msgid "warning: current locale is invalid; using default \"C\" locale"
msgstr "attenzione: locale non valido, verrà utilizzato il locale \"C\""
-#: src/pacman/pacman.c:461
+#: src/pacman/pacman.c:452
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "impossibile inizializzare la libreria alpm (%s)\n"
-#: src/pacman/pacman.c:494
+#: src/pacman/pacman.c:485
msgid "you cannot perform this operation unless you are root.\n"
msgstr "operazione possibile solo da root.\n"
-#: src/pacman/pacman.c:510
+#: src/pacman/pacman.c:501
#, c-format
msgid "failed to parse config (%s)\n"
msgstr "impossibile analizzare la configurazione (%s)\n"
-#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:511 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Pacchetti:"
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:517
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr "impossibile registrare il database 'locale' (%s)\n"
-#: src/pacman/pacman.c:533
+#: src/pacman/pacman.c:524
msgid "no targets specified (use -h for help)\n"
msgstr "nessun pacchetto specificato (usare -h per un aiuto)\n"
-#: src/pacman/pacman.c:546
+#: src/pacman/pacman.c:537
msgid "no operation specified (use -h for help)\n"
msgstr "nessuna operazione specificata (usare -h per un aiuto)\n"
@@ -952,124 +928,124 @@ msgstr ""
msgid "Proceed with installation? [Y/n] "
msgstr "Procedere con l'installazione? [Y/n] "
-#: src/pacman/trans.c:52
+#: src/pacman/trans.c:53
msgid "checking dependencies... "
msgstr "controllo delle dipendenze in corso... "
-#: src/pacman/trans.c:56
+#: src/pacman/trans.c:57
msgid "checking for file conflicts... "
msgstr "controllo dei conflitti in corso... "
-#: src/pacman/trans.c:60
+#: src/pacman/trans.c:61
msgid "cleaning up... "
msgstr "pulizia in corso... "
-#: src/pacman/trans.c:63
+#: src/pacman/trans.c:64
msgid "resolving dependencies... "
msgstr "risoluzione delle dipendenze in corso... "
-#: src/pacman/trans.c:66
+#: src/pacman/trans.c:67
msgid "looking for inter-conflicts... "
msgstr "ricerca dei conflitti in corso... "
-#: src/pacman/trans.c:86
+#: src/pacman/trans.c:87
#, c-format
msgid "installing %s... "
msgstr "installazione di %s in corso... "
-#: src/pacman/trans.c:93
+#: src/pacman/trans.c:94
#, c-format
msgid "installed %s (%s)"
msgstr "installato %s (%s)"
-#: src/pacman/trans.c:100
+#: src/pacman/trans.c:101
#, c-format
msgid "removing %s... "
msgstr "rimozione in corso di %s... "
-#: src/pacman/trans.c:107
+#: src/pacman/trans.c:108
#, c-format
msgid "removed %s (%s)"
msgstr "rimosso %s (%s)"
-#: src/pacman/trans.c:114
+#: src/pacman/trans.c:115
#, c-format
msgid "upgrading %s... "
msgstr "aggiornamento in corso di %s... "
-#: src/pacman/trans.c:121
+#: src/pacman/trans.c:122
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr "aggiornato %s (%s -> %s)"
-#: src/pacman/trans.c:128
+#: src/pacman/trans.c:129
msgid "checking package integrity... "
msgstr "controllo dell'integrità dei pacchetti in corso... "
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:145
msgid "failed.\n"
msgstr "non riuscito.\n"
-#: src/pacman/trans.c:151
+#: src/pacman/trans.c:152
#, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ":: Recupero dei pacchetti da %s...\n"
-#: src/pacman/trans.c:171
+#: src/pacman/trans.c:172
#, c-format
msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
msgstr ":: %s richiede %s, ma è in IgnorePkg. Installare ugualmente? [Y/n] "
-#: src/pacman/trans.c:176
+#: src/pacman/trans.c:177
#, c-format
msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
msgstr ":: %s è in IgnorePkg. Installare ugualmente? [Y/n] "
-#: src/pacman/trans.c:189
+#: src/pacman/trans.c:190
#, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ":: %s è in HoldPkg. Rimuovere ugualmente? [Y/n] "
-#: src/pacman/trans.c:202
+#: src/pacman/trans.c:203
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ":: Sostituire %s con %s/%s? [Y/n] "
-#: src/pacman/trans.c:217
+#: src/pacman/trans.c:218
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ":: %s va in conflitto con %s. Rimuovere %s? [Y/n] "
-#: src/pacman/trans.c:233
+#: src/pacman/trans.c:234
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ""
":: %s-%s: la versione installata è più recente. Aggiornare ugualmente? [Y/n] "
-#: src/pacman/trans.c:251
+#: src/pacman/trans.c:252
#, c-format
msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
msgstr ""
":: %s-%s: la versione installata è aggiornata. Aggiornare ugualmente? [Y/n] "
-#: src/pacman/trans.c:269
+#: src/pacman/trans.c:270
#, c-format
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: L'archivio %s è corrotto. Eliminarlo? [Y/n] "
-#: src/pacman/trans.c:323
+#: src/pacman/trans.c:326
msgid "installing"
msgstr "installazione in corso di "
-#: src/pacman/trans.c:326
+#: src/pacman/trans.c:329
msgid "upgrading"
msgstr "aggiornamento in corso di"
-#: src/pacman/trans.c:329
+#: src/pacman/trans.c:332
msgid "removing"
msgstr "rimozione in corso di"
-#: src/pacman/trans.c:332
+#: src/pacman/trans.c:335
msgid "checking for file conflicts"
msgstr "controllo dei conflitti in corso"
@@ -1104,3 +1080,18 @@ msgstr ""
#, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr "Dimensione totale dei pacchetti installati: %.2f MB\n"
+
+#~ msgid "memory allocation failure\n"
+#~ msgstr "allocazione della memoria non riuscita\n"
+
+#~ msgid "add target %s\n"
+#~ msgstr "aggiungere il pacchetto %s\n"
+
+#~ msgid "could not add target (%s)\n"
+#~ msgstr "impossibile aggiungere il pacchetto (%s)\n"
+
+#~ msgid "conflict: %s"
+#~ msgstr "conflitto: %s"
+
+#~ msgid "could not release transaction (%s)"
+#~ msgstr "impossibile annullare l'operazione richiesta (%s)"
diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot
index 6cfe4af6..ec3effa3 100644
--- a/src/pacman/po/pacman.pot
+++ b/src/pacman/po/pacman.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:482 src/pacman/sync.c:531
+#: src/pacman/add.c:69 src/pacman/remove.c:79 src/pacman/sync.c:482
+#: src/pacman/sync.c:531
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -33,10 +33,10 @@ msgstr ""
msgid "failed to add target '%s' (%s)"
msgstr ""
-#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
-#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
-#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
-#: src/pacman/trans.c:142
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:71
+#: src/pacman/trans.c:78 src/pacman/trans.c:82 src/pacman/trans.c:92
+#: src/pacman/trans.c:106 src/pacman/trans.c:120 src/pacman/trans.c:132
+#: src/pacman/trans.c:143
msgid "done.\n"
msgstr ""
@@ -45,77 +45,53 @@ msgstr ""
msgid "failed to prepare transaction (%s)\n"
msgstr ""
-#: src/pacman/add.c:97
+#: src/pacman/add.c:101
#, c-format
msgid ":: %s: requires %s"
msgstr ""
-#: src/pacman/add.c:118 src/pacman/sync.c:645
+#: src/pacman/add.c:122 src/pacman/sync.c:645
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ""
-#: src/pacman/add.c:127 src/pacman/sync.c:709
+#: src/pacman/add.c:131 src/pacman/sync.c:709
#, c-format
-msgid "%s%s exists in both '%s' and '%s'\n"
+msgid "%s exists in both '%s' and '%s'\n"
msgstr ""
-#: src/pacman/add.c:134 src/pacman/sync.c:716
+#: src/pacman/add.c:137 src/pacman/sync.c:715
#, c-format
-msgid "%s: %s%s exists in filesystem\n"
+msgid "%s: %s exists in filesystem\n"
msgstr ""
-#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729
+#: src/pacman/add.c:143 src/pacman/sync.c:721 src/pacman/sync.c:727
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
msgstr ""
-#: src/pacman/add.c:151 src/pacman/sync.c:652
+#: src/pacman/add.c:153 src/pacman/sync.c:652
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ""
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702
+#: src/pacman/add.c:166 src/pacman/remove.c:138 src/pacman/sync.c:702
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr ""
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524
-#: src/pacman/sync.c:745
+#: src/pacman/add.c:176 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/sync.c:743
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr ""
-#: src/pacman/deptest.c:70
-msgid "memory allocation failure\n"
-msgstr ""
-
-#: src/pacman/deptest.c:81
-#, c-format
-msgid "add target %s\n"
-msgstr ""
-
-#: src/pacman/deptest.c:84
-#, c-format
-msgid "could not add target (%s)\n"
-msgstr ""
-
-#: src/pacman/deptest.c:103
+#: src/pacman/deptest.c:64
#, c-format
msgid "requires: %s"
msgstr ""
-#: src/pacman/deptest.c:127
-#, c-format
-msgid "conflict: %s"
-msgstr ""
-
-#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
-#, c-format
-msgid "could not release transaction (%s)"
-msgstr ""
-
#: src/pacman/log.c:61
#, c-format
msgid "debug"
@@ -318,7 +294,7 @@ msgstr ""
msgid "(none)\n"
msgstr ""
-#: src/pacman/package.c:234
+#: src/pacman/package.c:243
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr ""
@@ -611,62 +587,62 @@ msgstr ""
msgid " the terms of the GNU General Public License\n"
msgstr ""
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:297
#, c-format
msgid "'%s' is not a valid debug level"
msgstr ""
-#: src/pacman/pacman.c:313
+#: src/pacman/pacman.c:312
#, c-format
msgid "'%s' is not a valid cache directory\n"
msgstr ""
-#: src/pacman/pacman.c:339
+#: src/pacman/pacman.c:330
#, c-format
msgid "'%s' is not a valid db path\n"
msgstr ""
-#: src/pacman/pacman.c:369
+#: src/pacman/pacman.c:360
#, c-format
msgid "'%s' is not a valid root path\n"
msgstr ""
-#: src/pacman/pacman.c:396
+#: src/pacman/pacman.c:387
msgid "only one operation may be used at a time\n"
msgstr ""
-#: src/pacman/pacman.c:442
+#: src/pacman/pacman.c:433
msgid "warning: current locale is invalid; using default \"C\" locale"
msgstr ""
-#: src/pacman/pacman.c:461
+#: src/pacman/pacman.c:452
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:494
+#: src/pacman/pacman.c:485
msgid "you cannot perform this operation unless you are root.\n"
msgstr ""
-#: src/pacman/pacman.c:510
+#: src/pacman/pacman.c:501
#, c-format
msgid "failed to parse config (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:511 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr ""
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:517
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:533
+#: src/pacman/pacman.c:524
msgid "no targets specified (use -h for help)\n"
msgstr ""
-#: src/pacman/pacman.c:546
+#: src/pacman/pacman.c:537
msgid "no operation specified (use -h for help)\n"
msgstr ""
@@ -907,117 +883,122 @@ msgstr ""
msgid "Proceed with installation? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:52
+#: src/pacman/trans.c:53
msgid "checking dependencies... "
msgstr ""
-#: src/pacman/trans.c:56
+#: src/pacman/trans.c:57
msgid "checking for file conflicts... "
msgstr ""
-#: src/pacman/trans.c:60
+#: src/pacman/trans.c:61
msgid "cleaning up... "
msgstr ""
-#: src/pacman/trans.c:63
+#: src/pacman/trans.c:64
msgid "resolving dependencies... "
msgstr ""
-#: src/pacman/trans.c:66
+#: src/pacman/trans.c:67
msgid "looking for inter-conflicts... "
msgstr ""
-#: src/pacman/trans.c:86
+#: src/pacman/trans.c:87
#, c-format
msgid "installing %s... "
msgstr ""
-#: src/pacman/trans.c:93
+#: src/pacman/trans.c:94
#, c-format
msgid "installed %s (%s)"
msgstr ""
-#: src/pacman/trans.c:100
+#: src/pacman/trans.c:101
#, c-format
msgid "removing %s... "
msgstr ""
-#: src/pacman/trans.c:107
+#: src/pacman/trans.c:108
#, c-format
msgid "removed %s (%s)"
msgstr ""
-#: src/pacman/trans.c:114
+#: src/pacman/trans.c:115
#, c-format
msgid "upgrading %s... "
msgstr ""
-#: src/pacman/trans.c:121
+#: src/pacman/trans.c:122
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr ""
-#: src/pacman/trans.c:128
+#: src/pacman/trans.c:129
msgid "checking package integrity... "
msgstr ""
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:145
msgid "failed.\n"
msgstr ""
-#: src/pacman/trans.c:151
+#: src/pacman/trans.c:152
#, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ""
-#: src/pacman/trans.c:171
+#: src/pacman/trans.c:172
#, c-format
msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:185
+#: src/pacman/trans.c:177
+#, c-format
+msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
+msgstr ""
+
+#: src/pacman/trans.c:190
#, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:198
+#: src/pacman/trans.c:203
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:213
+#: src/pacman/trans.c:218
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:229
+#: src/pacman/trans.c:234
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:247
+#: src/pacman/trans.c:252
#, c-format
msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:265
+#: src/pacman/trans.c:270
#, c-format
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:319
+#: src/pacman/trans.c:326
msgid "installing"
msgstr ""
-#: src/pacman/trans.c:322
+#: src/pacman/trans.c:329
msgid "upgrading"
msgstr ""
-#: src/pacman/trans.c:325
+#: src/pacman/trans.c:332
msgid "removing"
msgstr ""
-#: src/pacman/trans.c:328
+#: src/pacman/trans.c:335
msgid "checking for file conflicts"
msgstr ""
diff --git a/src/pacman/po/pt_BR.po b/src/pacman/po/pt_BR.po
index 3a9eaef7..6a19bed4 100644
--- a/src/pacman/po/pt_BR.po
+++ b/src/pacman/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
"PO-Revision-Date: 2007-02-15 08:55-0200\n"
"Last-Translator: Lincoln de Sousa <lincoln@archlinux-br.org>\n"
"Language-Team: Português do Brasil <pt@li.org>\n"
@@ -21,8 +21,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:482 src/pacman/sync.c:531
+#: src/pacman/add.c:69 src/pacman/remove.c:79 src/pacman/sync.c:482
+#: src/pacman/sync.c:531
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -40,10 +40,10 @@ msgstr "carregando informações do pacote... "
msgid "failed to add target '%s' (%s)"
msgstr "falha com o parametro'%s' (%s)"
-#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
-#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
-#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
-#: src/pacman/trans.c:142
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:71
+#: src/pacman/trans.c:78 src/pacman/trans.c:82 src/pacman/trans.c:92
+#: src/pacman/trans.c:106 src/pacman/trans.c:120 src/pacman/trans.c:132
+#: src/pacman/trans.c:143
msgid "done.\n"
msgstr "concluído.\n"
@@ -52,27 +52,27 @@ msgstr "concluído.\n"
msgid "failed to prepare transaction (%s)\n"
msgstr "falha ao preparar transação (%s)\n"
-#: src/pacman/add.c:97
+#: src/pacman/add.c:101
#, c-format
msgid ":: %s: requires %s"
msgstr ":: %s: requer %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:645
+#: src/pacman/add.c:122 src/pacman/sync.c:645
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: conflita com %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:709
+#: src/pacman/add.c:131 src/pacman/sync.c:709
#, fuzzy, c-format
-msgid "%s%s exists in both '%s' and '%s'\n"
+msgid "%s exists in both '%s' and '%s'\n"
msgstr "%s%s existe em \"%s\" (pacote) e em \"%s\" (pacote)\n"
-#: src/pacman/add.c:134 src/pacman/sync.c:716
-#, c-format
-msgid "%s: %s%s exists in filesystem\n"
+#: src/pacman/add.c:137 src/pacman/sync.c:715
+#, fuzzy, c-format
+msgid "%s: %s exists in filesystem\n"
msgstr "%s: %s%s existe no sistema de arquivos\n"
-#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729
+#: src/pacman/add.c:143 src/pacman/sync.c:721 src/pacman/sync.c:727
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -80,51 +80,27 @@ msgstr ""
"\n"
"ocorreram alguns erros, portanto, nenhum pacote foi atualizado.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:652
+#: src/pacman/add.c:153 src/pacman/sync.c:652
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ":: %.1f MB requerido, possui %.1f MB"
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702
+#: src/pacman/add.c:166 src/pacman/remove.c:138 src/pacman/sync.c:702
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "falha ao terminar a transação (%s)\n"
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524
-#: src/pacman/sync.c:745
+#: src/pacman/add.c:176 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/sync.c:743
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "falha ao liberar a transação (%s)\n"
-#: src/pacman/deptest.c:70
-msgid "memory allocation failure\n"
-msgstr "falha de alocação de memória\n"
-
-#: src/pacman/deptest.c:81
-#, c-format
-msgid "add target %s\n"
-msgstr "adicionar pacote %s\n"
-
-#: src/pacman/deptest.c:84
-#, c-format
-msgid "could not add target (%s)\n"
-msgstr "não foi possível adicionar o pacote (%s)\n"
-
-#: src/pacman/deptest.c:103
+#: src/pacman/deptest.c:64
#, c-format
msgid "requires: %s"
msgstr "requer: %s"
-#: src/pacman/deptest.c:127
-#, c-format
-msgid "conflict: %s"
-msgstr "conflita: %s"
-
-#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
-#, c-format
-msgid "could not release transaction (%s)"
-msgstr "não foi possível liberar a transação (%s)"
-
#: src/pacman/log.c:61
#, c-format
msgid "debug"
@@ -327,7 +303,7 @@ msgstr "NÃO ENCONTRADO\t\t%s\n"
msgid "(none)\n"
msgstr "Nenhum\n"
-#: src/pacman/package.c:234
+#: src/pacman/package.c:243
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "changelog não disponível para '%s'.\n"
@@ -661,62 +637,62 @@ msgid " the terms of the GNU General Public License\n"
msgstr ""
" os termos da Licença GPL - General Public License\n"
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:297
#, c-format
msgid "'%s' is not a valid debug level"
msgstr "'%s' não é um nível de depuração válido"
-#: src/pacman/pacman.c:313
+#: src/pacman/pacman.c:312
#, c-format
msgid "'%s' is not a valid cache directory\n"
msgstr "'%s' não é um diretório de cache válido\n"
-#: src/pacman/pacman.c:339
+#: src/pacman/pacman.c:330
#, c-format
msgid "'%s' is not a valid db path\n"
msgstr "'%s' não é um caminho de base de dados válido\n"
-#: src/pacman/pacman.c:369
+#: src/pacman/pacman.c:360
#, c-format
msgid "'%s' is not a valid root path\n"
msgstr "'%s' não é uma caminho válido\n"
-#: src/pacman/pacman.c:396
+#: src/pacman/pacman.c:387
msgid "only one operation may be used at a time\n"
msgstr "só uma operação pode ser usada de cada vez\n"
-#: src/pacman/pacman.c:442
+#: src/pacman/pacman.c:433
msgid "warning: current locale is invalid; using default \"C\" locale"
msgstr ""
-#: src/pacman/pacman.c:461
+#: src/pacman/pacman.c:452
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "falha ao iniciar biblioteca alpm (%s)\n"
-#: src/pacman/pacman.c:494
+#: src/pacman/pacman.c:485
msgid "you cannot perform this operation unless you are root.\n"
msgstr "você não pode realizar esta operação a menos que você seja root\n"
-#: src/pacman/pacman.c:510
+#: src/pacman/pacman.c:501
#, c-format
msgid "failed to parse config (%s)\n"
msgstr "falha ao interpretar configuração (%s)\n"
-#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:511 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Pacotes:"
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:517
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr "não foi possível registar a base de dados local (%s)\n"
-#: src/pacman/pacman.c:533
+#: src/pacman/pacman.c:524
msgid "no targets specified (use -h for help)\n"
msgstr "nenhum arquivo definido (use -h para obter ajuda)\n"
-#: src/pacman/pacman.c:546
+#: src/pacman/pacman.c:537
msgid "no operation specified (use -h for help)\n"
msgstr "nenhuma operação definida (use -h para obter ajuda)\n"
@@ -968,121 +944,127 @@ msgstr ""
msgid "Proceed with installation? [Y/n] "
msgstr "Continuar a instalação? [S/n] "
-#: src/pacman/trans.c:52
+#: src/pacman/trans.c:53
msgid "checking dependencies... "
msgstr "verificando dependências... "
-#: src/pacman/trans.c:56
+#: src/pacman/trans.c:57
msgid "checking for file conflicts... "
msgstr "verificando conflitos de arquivos... "
-#: src/pacman/trans.c:60
+#: src/pacman/trans.c:61
msgid "cleaning up... "
msgstr "limpando..."
-#: src/pacman/trans.c:63
+#: src/pacman/trans.c:64
msgid "resolving dependencies... "
msgstr "resolvendo dependências... "
-#: src/pacman/trans.c:66
+#: src/pacman/trans.c:67
msgid "looking for inter-conflicts... "
msgstr "procurando por conflitos internos... "
-#: src/pacman/trans.c:86
+#: src/pacman/trans.c:87
#, c-format
msgid "installing %s... "
msgstr "instalando %s... "
-#: src/pacman/trans.c:93
+#: src/pacman/trans.c:94
#, c-format
msgid "installed %s (%s)"
msgstr "%s instalado (%s)"
-#: src/pacman/trans.c:100
+#: src/pacman/trans.c:101
#, c-format
msgid "removing %s... "
msgstr "removendo %s... "
-#: src/pacman/trans.c:107
+#: src/pacman/trans.c:108
#, c-format
msgid "removed %s (%s)"
msgstr "%s removido (%s)"
-#: src/pacman/trans.c:114
+#: src/pacman/trans.c:115
#, c-format
msgid "upgrading %s... "
msgstr "atualizando %s... "
-#: src/pacman/trans.c:121
+#: src/pacman/trans.c:122
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr "%s atualizado (%s -> %s)"
-#: src/pacman/trans.c:128
+#: src/pacman/trans.c:129
msgid "checking package integrity... "
msgstr "verificando a integridade do pacote... "
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:145
msgid "failed.\n"
msgstr "falhou.\n"
-#: src/pacman/trans.c:151
+#: src/pacman/trans.c:152
#, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ":: Obtendo pacotes do %s...\n"
-#: src/pacman/trans.c:171
+#: src/pacman/trans.c:172
#, c-format
msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
msgstr ""
":: %s requer %s, mas ele está em IgnorePkg. Instalar assim mesmo? [S/n] "
-#: src/pacman/trans.c:185
+#: src/pacman/trans.c:177
+#, fuzzy, c-format
+msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
+msgstr ""
+":: %s requer %s, mas ele está em IgnorePkg. Instalar assim mesmo? [S/n] "
+
+#: src/pacman/trans.c:190
#, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ":: %s é designado como um HoldPkg Remover assim mesmo? [S/n] "
-#: src/pacman/trans.c:198
+#: src/pacman/trans.c:203
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ":: Substituir %s com %s/%s? [S/n] "
-#: src/pacman/trans.c:213
+#: src/pacman/trans.c:218
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ":: %s conflita com %s. Remover %s? [S/n] "
-#: src/pacman/trans.c:229
+#: src/pacman/trans.c:234
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ""
":: %s-%s: a versão local é mais recente. Deseja atualizar mesmo assim? [S/n] "
-#: src/pacman/trans.c:247
+#: src/pacman/trans.c:252
#, c-format
msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
msgstr ""
":: %s-%s: a versão local está atualizada. Deseja atualizar mesmo assim? [S/"
"n] "
-#: src/pacman/trans.c:265
+#: src/pacman/trans.c:270
#, c-format
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: Arquivo %s está corrompido. Você gostaria de apagá-lo? [S/n] "
-#: src/pacman/trans.c:319
+#: src/pacman/trans.c:326
msgid "installing"
msgstr "instalando"
-#: src/pacman/trans.c:322
+#: src/pacman/trans.c:329
msgid "upgrading"
msgstr "atualizando"
-#: src/pacman/trans.c:325
+#: src/pacman/trans.c:332
msgid "removing"
msgstr "removendo"
-#: src/pacman/trans.c:328
+#: src/pacman/trans.c:335
msgid "checking for file conflicts"
msgstr "verificando conflitos de arquivo"
@@ -1117,3 +1099,18 @@ msgstr ""
#, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr "Tamanho total da instalação: %.2f MB\n"
+
+#~ msgid "memory allocation failure\n"
+#~ msgstr "falha de alocação de memória\n"
+
+#~ msgid "add target %s\n"
+#~ msgstr "adicionar pacote %s\n"
+
+#~ msgid "could not add target (%s)\n"
+#~ msgstr "não foi possível adicionar o pacote (%s)\n"
+
+#~ msgid "conflict: %s"
+#~ msgstr "conflita: %s"
+
+#~ msgid "could not release transaction (%s)"
+#~ msgstr "não foi possível liberar a transação (%s)"
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e79e726d..407eb055 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = vercmp testpkg
INCLUDES = -I$(top_srcdir)/lib/libalpm
vercmp_SOURCES = vercmp.c
-vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
+vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm.la
testpkg_SOURCES = testpkg.c
-testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
+testpkg_LDADD = $(top_builddir)/lib/libalpm/libalpm.la