Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2007-02-13 08:15:38 +0000
committerAaron Griffin <aaron@archlinux.org>2007-02-13 08:15:38 +0000
commit103dbb9fd14fde35e116819808e6d4c9b534eaa2 (patch)
tree05e1b6c6f4db530894c6e19694a846975ed6587f
parent3da9fb537a0711ee12f66421703e5529ea5fca6a (diff)
* Refactored conflict checking within packages. Profiling from Dan showed an
unbelievable amount of strcmp() calls (25 million) due to the list searching. This has been reimplemented with a set-intersection scheme, due to the fact that file lists are always ordered. - NEEDS TESTING * Minor clean up, "globalized" the str_cmp helper to match the alpm comparison signature, so we can use it elsewhere.
-rw-r--r--lib/libalpm/alpm_list.h6
-rw-r--r--lib/libalpm/conflict.c72
-rw-r--r--lib/libalpm/package.c4
-rw-r--r--lib/libalpm/po/de.po475
-rw-r--r--lib/libalpm/po/fr.po477
-rw-r--r--lib/libalpm/po/hu.po482
-rw-r--r--lib/libalpm/po/it.po460
-rw-r--r--lib/libalpm/po/pt_BR.po460
-rw-r--r--lib/libalpm/remove.c10
-rw-r--r--lib/libalpm/sync.c2
-rw-r--r--lib/libalpm/util.c8
-rw-r--r--lib/libalpm/util.h2
-rw-r--r--src/pacman/po/de.po427
-rw-r--r--src/pacman/po/fr.po416
-rw-r--r--src/pacman/po/hu.po428
-rw-r--r--src/pacman/po/it.po345
-rw-r--r--src/pacman/po/pt_BR.po345
17 files changed, 2345 insertions, 2074 deletions
diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h
index 5798558b..be78245c 100644
--- a/lib/libalpm/alpm_list.h
+++ b/lib/libalpm/alpm_list.h
@@ -46,8 +46,8 @@ void alpm_list_free_inner(alpm_list_t *list, alpm_list_fn_free fn);
/* item mutators */
alpm_list_t *alpm_list_add(alpm_list_t *list, void *data);
alpm_list_t *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn);
-alpm_list_t* alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn);
-alpm_list_t* alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn);
+alpm_list_t *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn);
+alpm_list_t *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn);
alpm_list_t *alpm_list_remove(alpm_list_t *haystack, void *needle, alpm_list_fn_cmp fn, void **data);
alpm_list_t *alpm_list_remove_node(alpm_list_t *node);
alpm_list_t *alpm_list_remove_dupes(alpm_list_t *list);
@@ -56,7 +56,7 @@ alpm_list_t *alpm_list_reverse(alpm_list_t *list);
/* item accessors */
alpm_list_t *alpm_list_first(alpm_list_t *list);
-alpm_list_t* alpm_list_nth(alpm_list_t *list, int n);
+alpm_list_t *alpm_list_nth(alpm_list_t *list, int n);
alpm_list_t *alpm_list_next(alpm_list_t *list);
alpm_list_t *alpm_list_last(alpm_list_t *list);
void *alpm_list_getdata(const alpm_list_t *entry);
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index 33ab6a43..ffc9dc68 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -209,9 +209,37 @@ alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages)
}
/* Returns a alpm_list_t* of file conflicts.
- *
- * adds list of files to skip to alpm_list_t** skip_list.
+ * Hooray for set-intersects!
+ * Pre-condition: both lists are sorted!
*/
+static alpm_list_t *chk_fileconflicts(alpm_list_t *filesA, alpm_list_t *filesB)
+{
+ alpm_list_t *ret = NULL;
+ alpm_list_t *pA = filesA, *pB = filesB;
+
+ while(pA && pB) {
+ const char *strA = pA->data;
+ const char *strB = pB->data;
+ if(strA[strlen(strA)-1] == '/') {
+ pA = pA->next;
+ } else if(strB[strlen(strB)-1] == '/') {
+ pB = pB->next;
+ } else if(strcmp(strA, strB) == -1) {
+ pA = pA->next;
+ } else if(strcmp(strB, strA) == -1) {
+ pB = pB->next;
+ } else {
+ ret = alpm_list_add(ret, strdup(strA));
+ pA = pA->next;
+ pB = pB->next;
+ }
+ }
+ for(alpm_list_t *i = ret; i; i = i->next) {
+ _alpm_log(PM_LOG_DEBUG, "found conflict = %s", i->data);
+ }
+ return(ret);
+}
+
alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, alpm_list_t **skip_list)
{
alpm_list_t *i, *j, *k;
@@ -232,31 +260,23 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, a
pmpkg_t *p1 = (pmpkg_t*)i->data;
percent = (double)(alpm_list_count(targets) - alpm_list_count(i) + 1) / alpm_list_count(targets);
PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), alpm_list_count(targets), (alpm_list_count(targets) - alpm_list_count(i) +1));
- for(j = i; j; j = j->next) {
+ for(j = i->next; j; j = j->next) {
pmpkg_t *p2 = (pmpkg_t*)j->data;
- if(strcmp(p1->name, p2->name)) {
- for(k = p1->files; k; k = k->next) {
- filestr = k->data;
- if(filestr[strlen(filestr)-1] == '/') {
- /* has a trailing '/', so it's a directory -- skip it. */
- continue;
- }
- if(strcmp(filestr, ".INSTALL") == 0) {
+ alpm_list_t *conffiles = chk_fileconflicts(p1->files, p2->files);
+
+ if(conffiles) {
+ for(k = conffiles; k; k = k->next) {
+ pmconflict_t *conflict = malloc(sizeof(pmconflict_t));
+ if(conflict == NULL) {
+ _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"),
+ sizeof(pmconflict_t));
continue;
}
- if(alpm_list_find_str(p2->files, filestr)) {
- pmconflict_t *conflict = malloc(sizeof(pmconflict_t));
- if(conflict == NULL) {
- _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"),
- sizeof(pmconflict_t));
- continue;
- }
- conflict->type = PM_CONFLICT_TYPE_TARGET;
- STRNCPY(conflict->target, p1->name, PKG_NAME_LEN);
- STRNCPY(conflict->file, filestr, CONFLICT_FILE_LEN);
- STRNCPY(conflict->ctarget, p2->name, PKG_NAME_LEN);
- conflicts = alpm_list_add(conflicts, conflict);
- }
+ conflict->type = PM_CONFLICT_TYPE_TARGET;
+ STRNCPY(conflict->target, p1->name, PKG_NAME_LEN);
+ STRNCPY(conflict->file, k->data, CONFLICT_FILE_LEN);
+ STRNCPY(conflict->ctarget, p2->name, PKG_NAME_LEN);
+ conflicts = alpm_list_add(conflicts, conflict);
}
}
}
@@ -320,7 +340,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, a
}
/* If it used to exist in there, but doesn't anymore */
if(dbpkg2 && !alpm_list_find_str(p1->files, filestr)
- && alpm_list_find_str(dbpkg2->files, filestr)) {
+ && alpm_list_find_str(dbpkg2->files, filestr)) {
ok = 1;
/* Add to the "skip list" of files that we shouldn't remove during an upgrade.
*
@@ -348,7 +368,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, a
pmconflict_t *conflict = malloc(sizeof(pmconflict_t));
if(conflict == NULL) {
_alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"),
- sizeof(pmconflict_t));
+ sizeof(pmconflict_t));
continue;
}
conflict->type = PM_CONFLICT_TYPE_FILE;
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index fa9f0f6b..fb7e5ee8 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -421,6 +421,10 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
alpm_list_free(all_files);
}
+ /* this is IMPORTANT - "checking for conflicts" requires a sorted list, so we
+ * ensure that here */
+ info->files = alpm_list_msort(info->files, alpm_list_count(info->files), _alpm_str_cmp);
+
/* internal */
info->origin = PKG_FROM_FILE;
info->data = strdup(pkgfile);
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 14459b59..07bc56ba 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -7,7 +7,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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:35-0500\n"
"PO-Revision-Date: 2006-05-06 14:31+0200\n"
"Last-Translator: Marcus Habermehl <bmh1980@frugalware.org>\n"
"MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr "Lese Metadaten von '%s'"
msgid "looking for unsatisfied dependencies"
msgstr "Suche nach ungelösten Abhängigkeiten"
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:475
msgid "looking for conflicts"
msgstr "Suche nach Konflikten"
@@ -60,223 +60,223 @@ msgstr "Räume auf"
msgid "looking for file conflicts"
msgstr "Suche nach Dateikonflikten"
-#: lib/libalpm/add.c:391
+#: lib/libalpm/add.c:394
#, c-format
msgid "upgrading package %s-%s"
msgstr "Aktualisiere Paket %s-%s"
-#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
+#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
#, c-format
msgid "loading FILES info for '%s'"
msgstr "Lade FILES Informationen für '%s'"
-#: lib/libalpm/add.c:423
+#: lib/libalpm/add.c:426
#, c-format
msgid "removing old package first (%s-%s)"
msgstr "Entferne zuerst altes Paket (%s-%s)"
-#: lib/libalpm/add.c:453
+#: lib/libalpm/add.c:456
#, c-format
msgid "adding package %s-%s"
msgstr "Füge Paket %s-%s hinzu"
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:467
#, c-format
msgid "adding new package %s-%s"
msgstr "Füge neues Paket %s-%s hinzu"
-#: lib/libalpm/add.c:468
+#: lib/libalpm/add.c:471
msgid "extracting files"
msgstr "Entpacke Dateien"
-#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:487 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr "Kann aktuelles Arbeitsverzeichnis nicht ermitteln"
-#: lib/libalpm/add.c:529
+#: lib/libalpm/add.c:545
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr "Hinweis: %s ist in NoExtract -- Wird nicht entpackt"
-#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
+#: lib/libalpm/add.c:581 lib/libalpm/add.c:734
#, c-format
msgid "could not extract %s (%s)"
msgstr "Kann %s nicht entpacken (%s)"
-#: lib/libalpm/add.c:608
+#: lib/libalpm/add.c:624
#, c-format
msgid "checking md5 hashes for %s"
msgstr "Prüfe MD5 Hashes für %s"
-#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
+#: lib/libalpm/add.c:625 lib/libalpm/add.c:632
#, c-format
msgid "current: %s"
msgstr "Aktuell: %s"
-#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
+#: lib/libalpm/add.c:626 lib/libalpm/add.c:633
#, c-format
msgid "new: %s"
msgstr "Neu: %s"
-#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
+#: lib/libalpm/add.c:628 lib/libalpm/add.c:635
#, c-format
msgid "original: %s"
msgstr "Original: %s"
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:631
#, c-format
msgid "checking sha1 hashes for %s"
msgstr "Prüfe SHA1 Hashes für %s"
-#: lib/libalpm/add.c:633
+#: lib/libalpm/add.c:649
#, c-format
msgid "could not rename %s (%s)"
msgstr "Konnte %s nicht umbenennen (%s)"
-#: lib/libalpm/add.c:634
+#: lib/libalpm/add.c:650
#, c-format
msgid "error: could not rename %s (%s)"
msgstr "Fehler: Konnte %s nicht umbenennen (%s)"
-#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:698
#, c-format
msgid "could not copy %s to %s (%s)"
msgstr "Konnte %s nicht nach %s kopieren (%s)"
-#: lib/libalpm/add.c:639
+#: lib/libalpm/add.c:655
#, c-format
msgid "error: could not copy %s to %s (%s)"
msgstr "Fehler: Konnte %s nicht nach %s kopieren (%s)"
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:659
#, c-format
msgid "%s saved as %s.pacorig"
msgstr "%s gesichert als %s.pacorig"
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:660
#, c-format
msgid "warning: %s saved as %s"
msgstr "Warnung: %s gesichert als %s"
-#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
+#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679
msgid "action: installing new file"
msgstr "Aktion: Installiere neue Datei"
-#: lib/libalpm/add.c:661
+#: lib/libalpm/add.c:677
msgid "action: leaving existing file in place"
msgstr "Aktion: Lasse existierende Datei an ihrem Platz"
-#: lib/libalpm/add.c:667
+#: lib/libalpm/add.c:683
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
"Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew"
-#: lib/libalpm/add.c:671
+#: lib/libalpm/add.c:687
#, c-format
msgid "could not install %s as %s: %s"
msgstr "Konnte %s nicht als %s installieren: %s"
-#: lib/libalpm/add.c:672
+#: lib/libalpm/add.c:688
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr "Fehler: Konnte %s nicht als %s installieren: %s"
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:690
#, c-format
msgid "%s installed as %s"
msgstr "%s installiert als %s"
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:691
#, c-format
msgid "warning: %s installed as %s"
msgstr "Warnung: %s installiert als %s"
-#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:696 lib/libalpm/add.c:716
#, c-format
msgid "extracting %s"
msgstr "Entpacke %s"
-#: lib/libalpm/add.c:702
+#: lib/libalpm/add.c:718
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr "%s ist in NoUpgrade -- Überspringe"
-#: lib/libalpm/add.c:704
+#: lib/libalpm/add.c:720
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr "Entpacke %s als %s.pacnew"
-#: lib/libalpm/add.c:705
+#: lib/libalpm/add.c:721
#, c-format
msgid "warning: extracting %s%s as %s"
msgstr "Warnung: Entpacke %s%s als %s"
-#: lib/libalpm/add.c:719
+#: lib/libalpm/add.c:735
#, c-format
msgid "error: could not extract %s (%s)"
msgstr "Fehler: Konnte %s nicht entpacken (%s)"
-#: lib/libalpm/add.c:729
+#: lib/libalpm/add.c:745
msgid "appending backup entry"
msgstr "Hänge Sicherungseintrag an"
-#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
+#: lib/libalpm/add.c:776 lib/libalpm/add.c:778
#, c-format
msgid "errors occurred while %s %s"
msgstr "Fehler traten auf, während %s %s"
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "upgrading"
msgstr "der Aktualisierung von"
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "installing"
msgstr "der Installation von"
-#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
+#: lib/libalpm/add.c:800 lib/libalpm/add.c:856
#, c-format
msgid "adding '%s' in requiredby field for '%s'"
msgstr "Füge '%s' zum requiredby Feld für '%s' hinzu"
-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
+#: lib/libalpm/add.c:811 lib/libalpm/remove.c:334
msgid "updating database"
msgstr "Aktualisiere Datenbank"
-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:812
#, c-format
msgid "adding database entry '%s'"
msgstr "Füge Datenbankeintrag '%s' hinzu"
-#: lib/libalpm/add.c:798
+#: lib/libalpm/add.c:814
#, c-format
msgid "could not update database entry %s-%s"
msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren"
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:816
#, c-format
msgid "error updating database for %s-%s!"
msgstr "Fehler beim aktualisieren der Datenbank für %s-%s!"
-#: lib/libalpm/add.c:804
+#: lib/libalpm/add.c:820
#, c-format
msgid "could not add entry '%s' in cache"
msgstr "Konnte Eintrag '%s' nicht zum Cache hinzufügen"
-#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
+#: lib/libalpm/add.c:826 lib/libalpm/remove.c:344
msgid "updating dependency packages 'requiredby' fields"
msgstr "Aktualisiere 'requiredby' Felder abhängiger Pakete"
-#: lib/libalpm/add.c:832
+#: lib/libalpm/add.c:848
#, c-format
msgid "could not find dependency '%s'"
msgstr "Konnte Abhängigkeit '%s' nicht finden"
-#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
+#: lib/libalpm/add.c:859 lib/libalpm/remove.c:386
#, c-format
msgid "could not update 'requiredby' database entry %s-%s"
msgstr "Konnte 'requiredby' Eintrag %s-%s nicht aktualisieren"
-#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:885 lib/libalpm/remove.c:399 lib/libalpm/sync.c:1045
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr "Führe \"ldconfig -r %s\" aus"
@@ -362,185 +362,170 @@ msgstr "Konnte MD5 Prüfsumme für Paket %s-%s nicht ermitteln\n"
msgid "md5sums do not match for package %s-%s"
msgstr "MD5 Summen für Paket %s-%s stimmen nicht überein\n"
-#: lib/libalpm/alpm.c:791
+#: lib/libalpm/alpm.c:790
#, c-format
msgid "could not remove lock file %s"
msgstr "Konnte Sperrdatei %s nicht entfernen"
-#: lib/libalpm/alpm.c:792
+#: lib/libalpm/alpm.c:791
#, c-format
msgid "warning: could not remove lock file %s"
msgstr "Warnung: Konnte Sperrdatei %s nicht entfernen"
-#: lib/libalpm/alpm.c:929
+#: lib/libalpm/alpm.c:926
#, fuzzy, c-format
msgid "config: new section '%s'"
msgstr "Konnte %s nicht entpacken: %s\n"
-#: lib/libalpm/alpm.c:958
+#: lib/libalpm/alpm.c:955
msgid "config: nopassiveftp"
msgstr ""
-#: lib/libalpm/alpm.c:961
+#: lib/libalpm/alpm.c:958
msgid "config: usesyslog"
msgstr ""
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:961
msgid "config: chomp"
msgstr ""
-#: lib/libalpm/alpm.c:967
+#: lib/libalpm/alpm.c:964
msgid "config: usecolor"
msgstr ""
-#: lib/libalpm/alpm.c:976
+#: lib/libalpm/alpm.c:973
#, fuzzy, c-format
msgid "config: including %s"
msgstr "Kann Logdatei '%s' nicht öffnen"
-#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#: lib/libalpm/alpm.c:983 lib/libalpm/alpm.c:988
#, fuzzy, c-format
msgid "config: noupgrade: %s"
msgstr "Konnte %s nicht entpacken: %s\n"
-#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#: lib/libalpm/alpm.c:996 lib/libalpm/alpm.c:1001
#, fuzzy, c-format
msgid "config: noextract: %s"
msgstr "Konnte %s nicht entpacken: %s\n"
-#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#: lib/libalpm/alpm.c:1009 lib/libalpm/alpm.c:1014
#, fuzzy, c-format
msgid "config: ignorepkg: %s"
msgstr "Konnte %s nicht entpacken: %s\n"
-#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#: lib/libalpm/alpm.c:1022 lib/libalpm/alpm.c:1027
#, fuzzy, c-format
msgid "config: holdpkg: %s"
msgstr "Kann Logdatei '%s' nicht öffnen"
-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1034
#, fuzzy, c-format
msgid "config: dbpath: %s"
msgstr "Konnte %s nicht entpacken: %s\n"
-#: lib/libalpm/alpm.c:1044
+#: lib/libalpm/alpm.c:1041
#, fuzzy, c-format
msgid "config: cachedir: %s"
msgstr "Konnte %s nicht entpacken: %s\n"
-#: lib/libalpm/alpm.c:1047
+#: lib/libalpm/alpm.c:1044
#, fuzzy, c-format
msgid "config: logfile: %s"
msgstr "Kann Logdatei '%s' nicht öffnen"
-#: lib/libalpm/alpm.c:1050
+#: lib/libalpm/alpm.c:1047
#, fuzzy, c-format
msgid "config: xfercommand: %s"
msgstr "Konnte %s nicht entpacken: %s\n"
-#: lib/libalpm/alpm.c:1055
+#: lib/libalpm/alpm.c:1052
#, c-format
msgid "config: upgradedelay: %d"
msgstr ""
-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
msgid "checking for package replacements"
msgstr "Prüfe auf Paketersetzungen"
-#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1100 lib/libalpm/sync.c:138
#, c-format
msgid "checking replacement '%s' for package '%s'"
msgstr "Prüfe Ersetzung '%s' für Paket '%s'"
-#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1102 lib/libalpm/sync.c:140
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:174
#, c-format
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#: lib/libalpm/alpm.c:1157 lib/libalpm/sync.c:211
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr "'%s' nicht in sync DB gefunden -- Überspringe"
-#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1171 lib/libalpm/sync.c:225 lib/libalpm/sync.c:501
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr "'%s' ist bereits zum Entfernen ausgewählt -- Überspringe"
-#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
-#, fuzzy, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr "%s-%s: Lokale Version ist neuer"
-
-#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
-
-#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
-#, fuzzy, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
-msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
-
-#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#: lib/libalpm/alpm.c:1177 lib/libalpm/sync.c:232
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr "%s-%s ausgewählt für Aktualisierung (%s => %s)"
-#: lib/libalpm/be_files.c:59
+#: lib/libalpm/be_files.c:58
#, fuzzy, c-format
msgid "unpacking database '%s'"
msgstr "Öffne Datenbank '%s'"
-#: lib/libalpm/be_files.c:183
+#: lib/libalpm/be_files.c:182
#, c-format
msgid "invalid name for dabatase entry '%s'"
msgstr "Falscher Name für Datenbankeintrag '%s'"
-#: lib/libalpm/be_files.c:211
+#: lib/libalpm/be_files.c:210
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:216
+#: lib/libalpm/be_files.c:215
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:224
+#: lib/libalpm/be_files.c:223
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:232
+#: lib/libalpm/be_files.c:231
#, fuzzy, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr "Konnte %s nicht in der Datenbank finden"
-#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
-#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
-#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
-#: lib/libalpm/package.c:185
+#: lib/libalpm/be_files.c:239 lib/libalpm/be_files.c:383
+#: lib/libalpm/be_files.c:406 lib/libalpm/be_files.c:494
+#: lib/libalpm/be_files.c:580 lib/libalpm/be_files.c:607
+#: lib/libalpm/package.c:194
#, fuzzy, c-format
msgid "could not open file %s: %s"
msgstr "Konnte Datei %s nicht öffnen"
-#: lib/libalpm/be_files.c:492
+#: lib/libalpm/be_files.c:491
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:578
+#: lib/libalpm/be_files.c:577
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:605
+#: lib/libalpm/be_files.c:604
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -607,8 +592,8 @@ msgstr ""
#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:718
#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
#, c-format
msgid "malloc failure: could not allocate %d bytes"
@@ -763,13 +748,13 @@ msgid "insufficient privileges"
msgstr "Ungenügende Rechte"
#: lib/libalpm/error.c:40
-msgid "wrong or NULL argument passed"
-msgstr "Falsches oder NULL Argument übergeben"
-
-#: lib/libalpm/error.c:42
msgid "could not find or read file"
msgstr "Konnte Datei nicht finden oder lesen"
+#: lib/libalpm/error.c:42
+msgid "wrong or NULL argument passed"
+msgstr "Falsches oder NULL Argument übergeben"
+
#: lib/libalpm/error.c:45
msgid "library not initialized"
msgstr "Bibliothek nicht initialisiert"
@@ -810,137 +795,152 @@ msgstr "Konnte Datenbank nicht aktualisieren"
msgid "could not remove database entry"
msgstr "Konnte Datenbankeintrag nicht entfernen"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:67
+msgid "invalid url for server"
+msgstr ""
+
+#: lib/libalpm/error.c:74
msgid "could not set parameter"
msgstr "Konnte Parameter nicht setzen"
-#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
-msgid "transaction not initialized"
+#: lib/libalpm/error.c:77
+msgid "transaction already initialized"
msgstr ""
-#: lib/libalpm/error.c:76
-msgid "transaction already initialized"
+#: lib/libalpm/error.c:79 lib/libalpm/error.c:83
+msgid "transaction not initialized"
msgstr ""
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:81
msgid "duplicate target"
msgstr "Doppelte Pakete"
-#: lib/libalpm/error.c:82
+#: lib/libalpm/error.c:85
msgid "transaction not prepared"
msgstr ""
-#: lib/libalpm/error.c:84
+#: lib/libalpm/error.c:87
msgid "transaction aborted"
msgstr ""
-#: lib/libalpm/error.c:86
+#: lib/libalpm/error.c:89
msgid "operation not compatible with the transaction type"
msgstr ""
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:984
+msgid "could not commit transaction"
+msgstr ""
+
+#: lib/libalpm/error.c:93
+#, fuzzy
+msgid "could not download all files"
+msgstr "Konnte Datei nicht finden oder lesen"
+
+#: lib/libalpm/error.c:96
msgid "could not find or read package"
msgstr "Konnte Paket nicht finden oder lesen"
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "invalid or corrupted package"
msgstr "Ungültiges oder beschädigtes Paket"
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "cannot open package file"
msgstr "Kann Paketdatei nicht öffnen"
-#: lib/libalpm/error.c:95
+#: lib/libalpm/error.c:102
msgid "cannot load package data"
msgstr "Kann Paketdaten nicht laden"
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "package already installed"
msgstr "Paket ist bereits installiert"
-#: lib/libalpm/error.c:99
+#: lib/libalpm/error.c:106
msgid "package not installed or lesser version"
msgstr "Paket ist nicht installiert oder kleinere Version"
-#: lib/libalpm/error.c:101
+#: lib/libalpm/error.c:108
+#, fuzzy
+msgid "cannot remove all files for package"
+msgstr "Kann Datei %s nicht entfernen"
+
+#: lib/libalpm/error.c:110
msgid "package name is not valid"
msgstr "Paketname ist nicht gültig"
-#: lib/libalpm/error.c:103
+#: lib/libalpm/error.c:112
msgid "corrupted package"
msgstr "Beschädigtes Paket"
-#: lib/libalpm/error.c:105
+#: lib/libalpm/error.c:114
msgid "no such repository"
msgstr ""
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:117
msgid "group not found"
msgstr "Gruppe nicht gefunden"
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:120
msgid "could not satisfy dependencies"
msgstr "Kann Abhängigkeiten nicht erfüllen"
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:122
msgid "conflicting dependencies"
msgstr "In Konflikt stehende Abhängigkeiten"
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:124
msgid "conflicting files"
msgstr "In Konflikt stehende Dateien"
-#: lib/libalpm/error.c:118
-msgid "user aborted"
+#: lib/libalpm/error.c:127
+#, fuzzy
+msgid "user aborted the operation"
msgstr "Benutzerabbruch"
-#: lib/libalpm/error.c:120
-msgid "libarchive error"
-msgstr "libarchive Fehler"
-
-#: lib/libalpm/error.c:122
+#: lib/libalpm/error.c:129
msgid "internal error"
msgstr "Interner Fehler"
-#: lib/libalpm/error.c:124
-msgid "not enough space"
+#: lib/libalpm/error.c:131
+msgid "libarchive error"
+msgstr "libarchive Fehler"
+
+#: lib/libalpm/error.c:133
+msgid "not enough space on disk"
msgstr ""
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:136
msgid "not confirmed"
msgstr ""
-#: lib/libalpm/error.c:129
-msgid "bad section name"
+#: lib/libalpm/error.c:139
+msgid "bad configuration section name"
msgstr ""
-#: lib/libalpm/error.c:131
-msgid "'local' is reserved and cannot be used as a package tree"
+#: lib/libalpm/error.c:141
+msgid "'local' is reserved and cannot be used as a repository name"
msgstr ""
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:143
#, fuzzy
-msgid "syntax error"
-msgstr "Interner Fehler"
+msgid "syntax error in config file"
+msgstr "%s: Falscher Syntax in Beschreibungsdatei, Zeile %d"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:145
msgid "all directives must belong to a section"
msgstr ""
-#: lib/libalpm/error.c:137
+#: lib/libalpm/error.c:147
msgid "invalid regular expression"
msgstr ""
-#: lib/libalpm/error.c:139
+#: lib/libalpm/error.c:150
#, fuzzy
msgid "connection to remote host failed"
msgstr "Kann Datei %s nicht entfernen"
-#: lib/libalpm/error.c:141
-msgid "forking process failed"
-msgstr ""
-
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:153
msgid "unexpected error"
msgstr "Unerwarteter Fehler"
@@ -949,41 +949,66 @@ msgstr "Unerwarteter Fehler"
msgid "%s can't be opened\n"
msgstr "%s kann nicht geöffnet werden\n"
-#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
+#: lib/libalpm/package.c:146
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr "Fehlende Paketversion in %s"
+
+#: lib/libalpm/package.c:150
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr "%s-%s: Lokale Version ist neuer"
+
+#: lib/libalpm/package.c:155
+#, c-format
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
+
+#: lib/libalpm/package.c:160
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
+
+#: lib/libalpm/package.c:165
+#, c-format
+msgid "compare versions for %s: %s vs %s, result=%d"
+msgstr ""
+
+#: lib/libalpm/package.c:208 lib/libalpm/package.c:263
#, c-format
msgid "%s: syntax error in description file line %d"
msgstr "%s: Falscher Syntax in Beschreibungsdatei, Zeile %d"
-#: lib/libalpm/package.c:331
+#: lib/libalpm/package.c:337
msgid "could not parse the package description file"
msgstr "Konnte Paketbeschreibungsdatei nicht analysieren"
-#: lib/libalpm/package.c:335
+#: lib/libalpm/package.c:341
#, c-format
msgid "missing package name in %s"
msgstr "Fehlender Paketname in %s"
-#: lib/libalpm/package.c:339
+#: lib/libalpm/package.c:345
#, c-format
msgid "missing package version in %s"
msgstr "Fehlende Paketversion in %s"
-#: lib/libalpm/package.c:374
+#: lib/libalpm/package.c:380
#, c-format
msgid "could not remove tempfile %s"
msgstr "Konnte tempfile %s nicht entfernen"
-#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#: lib/libalpm/package.c:393 lib/libalpm/package.c:400
#, fuzzy, c-format
msgid "error while reading package: %s"
msgstr "Aktualisiere Paket %s-%s"
-#: lib/libalpm/package.c:400
+#: lib/libalpm/package.c:406
#, fuzzy
msgid "missing package metadata"
msgstr "Fehlender Paketname in %s"
-#: lib/libalpm/package.c:407
+#: lib/libalpm/package.c:413
#, fuzzy, c-format
msgid "missing package filelist in %s, generating one"
msgstr "Fehlende Paketinfodatei in %s"
@@ -1012,71 +1037,81 @@ msgstr "Konnte %s nicht in Datenbank finden -- Überspringe"
msgid "finding removable dependencies"
msgstr "Finde entfernbare Abhängigkeiten"
-#: lib/libalpm/remove.c:193
+#: lib/libalpm/remove.c:186
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s"
+msgstr "Kann Datei %s nicht entfernen"
+
+#: lib/libalpm/remove.c:226
#, c-format
msgid "file %s does not exist"
msgstr "Datei %s existiert nicht"
-#: lib/libalpm/remove.c:199
+#: lib/libalpm/remove.c:232
#, c-format
msgid "keeping directory %s"
msgstr "Behalte Verzeichnis %s"
-#: lib/libalpm/remove.c:201
+#: lib/libalpm/remove.c:234
#, c-format
msgid "removing directory %s"
msgstr "Entferne Verzeichnis %s"
-#: lib/libalpm/remove.c:215
+#: lib/libalpm/remove.c:248
#, c-format
msgid "skipping removal of %s as it has moved to another package"
msgstr ""
-#: lib/libalpm/remove.c:227
+#: lib/libalpm/remove.c:260
#, c-format
msgid "%s saved as %s"
msgstr "%s gespeichert als %s"
-#: lib/libalpm/remove.c:231
+#: lib/libalpm/remove.c:264
#, c-format
msgid "unlinking %s"
msgstr ""
-#: lib/libalpm/remove.c:237
+#: lib/libalpm/remove.c:271
#, fuzzy, c-format
msgid "cannot remove file %s: %s"
msgstr "Kann Datei %s nicht entfernen"
-#: lib/libalpm/remove.c:265
+#: lib/libalpm/remove.c:299
#, c-format
msgid "removing package %s-%s"
msgstr "Entferne Paket %s-%s"
-#: lib/libalpm/remove.c:276
+#: lib/libalpm/remove.c:311
+#, c-format
+msgid "not removing package '%s', can't remove all files"
+msgstr ""
+
+#: lib/libalpm/remove.c:317
msgid "removing files"
msgstr "Entferne Dateien"
-#: lib/libalpm/remove.c:294
+#: lib/libalpm/remove.c:335
#, c-format
msgid "removing database entry '%s'"
msgstr "Entferne Datenbankeintrag '%s'"
-#: lib/libalpm/remove.c:296
+#: lib/libalpm/remove.c:337
#, c-format
msgid "could not remove database entry %s-%s"
msgstr "Konnte Datenbankeintrag %s-%s nicht entfernen"
-#: lib/libalpm/remove.c:299
+#: lib/libalpm/remove.c:340
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr "Konnte Eintrag '%s' nicht aus dem Cache entfernen"
-#: lib/libalpm/remove.c:333
+#: lib/libalpm/remove.c:374
#, fuzzy, c-format
msgid "could not find dependency '%s' for removal"
msgstr "Konnte Abhängigkeit '%s' nicht finden"
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/remove.c:384
#, c-format
msgid "updating 'requiredby' field for package '%s'"
msgstr "Aktualisiere 'requiredby' Feld für Paket '%s'"
@@ -1085,196 +1120,192 @@ msgstr "Aktualisiere 'requiredby' Feld für Paket '%s'"
msgid "checking for package upgrades"
msgstr "Prüfe auf Paketaktualisierungen"
-#: lib/libalpm/sync.c:278
+#: lib/libalpm/sync.c:277
#, fuzzy, c-format
msgid "searching for target in repo '%s'"
msgstr "Lade Paket '%s'"
-#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
+#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
#, c-format
msgid "target '%s' not found -- looking for provisions"
msgstr ""
-#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
+#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
#, c-format
msgid "found '%s' as a provision for '%s'"
msgstr ""
-#: lib/libalpm/sync.c:299
+#: lib/libalpm/sync.c:298
#, fuzzy, c-format
msgid "repository '%s' not found"
msgstr "Gruppe nicht gefunden"
-#: lib/libalpm/sync.c:333
+#: lib/libalpm/sync.c:332
#, c-format
msgid "%s-%s is up to date -- skipping"
msgstr "%s-%s ist aktuell -- Überspringe"
-#: lib/libalpm/sync.c:353
+#: lib/libalpm/sync.c:352
#, c-format
msgid "adding target '%s' to the transaction set"
msgstr ""
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:400
#, fuzzy
msgid "resolving target's dependencies"
msgstr "Sortiere nach Abhängigkeiten"
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:420
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr ""
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:455
msgid "looking for unresolvable dependencies"
msgstr "Suche nach ungelösten Abhängigkeiten"
-#: lib/libalpm/sync.c:487
+#: lib/libalpm/sync.c:486
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr "Paket '%s' steht im Konflikt mit '%s'"
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:508
#, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr ""
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:519
#, c-format
msgid "package '%s' provides its own conflict"
msgstr "Paket '%s' liefert seinen eigenen Konflikt"
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
#, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr ""
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
#, c-format
msgid "removing '%s' from target list"
msgstr "Entferne '%s' von Paketliste"
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:568
#, c-format
msgid "resolving package '%s' conflict"
msgstr ""
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:591
#, c-format
msgid "electing '%s' for removal"
msgstr "Wähle '%s' zum Entfernen aus"
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
msgid "unresolvable package conflicts detected"
msgstr "Nicht lösbare Paketkonflikte gefunden"
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:670
msgid "checking dependencies of packages designated for removal"
msgstr ""
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:684
msgid "something has gone horribly wrong"
msgstr ""
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:703
#, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr ""
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:799
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:810
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:811
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:816
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:817
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:824
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:853 lib/libalpm/sync.c:865
#, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr "Kann MD5 oder SHA1 Prüfsumme für Paket %s nicht ermitteln\n"
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:884
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr "Archive %s war beschädigt (falsche MD5 oder SHA1 Prüfsumme)\n"
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:886
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr "Archiv %s ist beschädigt (falsche MD5 oder SHA1 Prüfsumme)\n"
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:907
msgid "could not create removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:913
msgid "could not initialize the removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:933
msgid "removing conflicting and to-be-replaced packages"
msgstr "Entferne im Konflikt stehende und zu ersetzende Pakete"
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:935
msgid "could not prepare removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:941
msgid "could not commit removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:948
msgid "installing packages"
msgstr "Installiere Pakete"
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:951
msgid "could not create transaction"
msgstr ""
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:956
msgid "could not initialize transaction"
msgstr ""
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:979
msgid "could not prepare transaction"
msgstr ""
-#: lib/libalpm/sync.c:985
-msgid "could not commit transaction"
-msgstr ""
-
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:991
#, fuzzy
msgid "updating database for replaced packages' dependencies"
msgstr "Aktualisiere Datenbank für ersetzte Paketabhängigkeiten"
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1020
#, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr "Konnte requiredby für Datenbankeintrag %s-%s nicht aktualisieren"
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1029
#, c-format
msgid "could not update new database entry %s-%s"
msgstr "Konnte neuen Datenbankeintrag %s-%s nicht aktualisieren"
@@ -1363,6 +1394,10 @@ msgstr ""
msgid "depcmp: %s-%s %s %s => %s"
msgstr ""
+#, fuzzy
+#~ msgid "syntax error"
+#~ msgstr "Interner Fehler"
+
#~ msgid "unpacking %s"
#~ msgstr "Entpacke %s"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index ed5abe8b..56d0e5f9 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -7,7 +7,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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:35-0500\n"
"PO-Revision-Date: 2006-06-05 22:47+0100\n"
"Last-Translator: Enda <enda@netou.com>\n"
"MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgstr "lecture des m�tas-donn�es '%s'"
msgid "looking for unsatisfied dependencies"
msgstr "recherche des d�pendances non satisfaites"
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:475
msgid "looking for conflicts"
msgstr "recherche des conflits"
@@ -61,226 +61,226 @@ msgstr "nettoyage"
msgid "looking for file conflicts"
msgstr "recherche de conflits entre fichiers"
-#: lib/libalpm/add.c:391
+#: lib/libalpm/add.c:394
#, c-format
msgid "upgrading package %s-%s"
msgstr "mise a jour du paquet %s-%s"
-#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
+#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
#, c-format
msgid "loading FILES info for '%s'"
msgstr "chargement des informations de fichiers pour '%s'"
-#: lib/libalpm/add.c:423
+#: lib/libalpm/add.c:426
#, c-format
msgid "removing old package first (%s-%s)"
msgstr "retirer l'ancien paquet pr�alablement (%s-%s)"
-#: lib/libalpm/add.c:453
+#: lib/libalpm/add.c:456
#, c-format
msgid "adding package %s-%s"
msgstr "ajout du paquet %s-%s"
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:467
#, c-format
msgid "adding new package %s-%s"
msgstr "ajout du nouveau paquet %s-%s"
-#: lib/libalpm/add.c:468
+#: lib/libalpm/add.c:471
msgid "extracting files"
msgstr "extraction des fichiers"
-#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:487 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr "impossible de d�terminer le r�pertoire courant"
-#: lib/libalpm/add.c:529
+#: lib/libalpm/add.c:545
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
-#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
+#: lib/libalpm/add.c:581 lib/libalpm/add.c:734
#, c-format
msgid "could not extract %s (%s)"
msgstr "n'a pas pu extraire %s (%s)"
-#: lib/libalpm/add.c:608
+#: lib/libalpm/add.c:624
#, c-format
msgid "checking md5 hashes for %s"
msgstr "v�rification de la 'signature' md5 pour %s"
-#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
+#: lib/libalpm/add.c:625 lib/libalpm/add.c:632
#, c-format
msgid "current: %s"
msgstr "courant: %s"
-#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
+#: lib/libalpm/add.c:626 lib/libalpm/add.c:633
#, c-format
msgid "new: %s"
msgstr "nouveau: %s"
-#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
+#: lib/libalpm/add.c:628 lib/libalpm/add.c:635
#, c-format
msgid "original: %s"
msgstr "original: %s"
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:631
#, c-format
msgid "checking sha1 hashes for %s"
msgstr "v�rification de la 'signature' sha1 pour %s"
-#: lib/libalpm/add.c:633
+#: lib/libalpm/add.c:649
#, c-format
msgid "could not rename %s (%s)"
msgstr "n'a pas pu renommer %s (%s)"
-#: lib/libalpm/add.c:634
+#: lib/libalpm/add.c:650
#, c-format
msgid "error: could not rename %s (%s)"
msgstr "erreur: n'a pas pu renommer %s (%s)"
-#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:698
#, c-format
msgid "could not copy %s to %s (%s)"
msgstr "n'a pas pu copier %s vers %s (%s)"
-#: lib/libalpm/add.c:639
+#: lib/libalpm/add.c:655
#, c-format
msgid "error: could not copy %s to %s (%s)"
msgstr "erreur: n'a pas pu copier %s vers %s (%s)"
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:659
#, c-format
msgid "%s saved as %s.pacorig"
msgstr "%s sauve en tant que %s.pacorig"
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:660
#, c-format
msgid "warning: %s saved as %s"
msgstr "avertissement: %s sauve en tant que %s"
-#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
+#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679
msgid "action: installing new file"
msgstr "action: installation de nouveau fichier"
-#: lib/libalpm/add.c:661
+#: lib/libalpm/add.c:677
msgid "action: leaving existing file in place"
msgstr "action: quitte en pr�servant les fichiers existant"
-#: lib/libalpm/add.c:667
+#: lib/libalpm/add.c:683
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
"action: conserver le fichier actuel et installer le nouveau avec "
"l'extension .pacnew"
-#: lib/libalpm/add.c:671
+#: lib/libalpm/add.c:687
#, c-format
msgid "could not install %s as %s: %s"
msgstr "n'a pas pu installer %s en tant que %s: %s"
-#: lib/libalpm/add.c:672
+#: lib/libalpm/add.c:688
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr "erreur: n'a pas pu installer %s en tant que %s: %s"
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:690
#, c-format
msgid "%s installed as %s"
msgstr "%s install� en tant que %s"
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:691
#, c-format
msgid "warning: %s installed as %s"
msgstr "avertissement: %s install� en tant que %s"
-#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:696 lib/libalpm/add.c:716
#, c-format
msgid "extracting %s"
msgstr "extrait %s"
-#: lib/libalpm/add.c:702
+#: lib/libalpm/add.c:718
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr "%s est marqu� NoUpgrade -- ignore"
-#: lib/libalpm/add.c:704
+#: lib/libalpm/add.c:720
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr "extrait %s en tant que %s.pacnew"
-#: lib/libalpm/add.c:705
+#: lib/libalpm/add.c:721
#, c-format
msgid "warning: extracting %s%s as %s"
msgstr "avertissement: extrait %s%s en tant que %s"
-#: lib/libalpm/add.c:719
+#: lib/libalpm/add.c:735
#, c-format
msgid "error: could not extract %s (%s)"
msgstr "erreur: n'a pas pu extraire %s (%s)"
-#: lib/libalpm/add.c:729
+#: lib/libalpm/add.c:745
msgid "appending backup entry"
msgstr "ajoute une entre pour la sauvegarde"
-#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
+#: lib/libalpm/add.c:776 lib/libalpm/add.c:778
#, c-format
msgid "errors occurred while %s %s"
msgstr "des erreurs sont survenue pendant %s %s"
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "upgrading"
msgstr "mise � jour"
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "installing"
msgstr "installation"
-#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
+#: lib/libalpm/add.c:800 lib/libalpm/add.c:856
#, c-format
msgid "adding '%s' in requiredby field for '%s'"
msgstr "ajoute '%s' dans le champ 'requit par' pour '%s'"
-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
+#: lib/libalpm/add.c:811 lib/libalpm/remove.c:334
msgid "updating database"
msgstr "met � jour la base de donn�es"
-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:812
#, c-format
msgid "adding database entry '%s'"
msgstr "ajoute l'entr�e de base de donn�es '%s'"
-#: lib/libalpm/add.c:798
+#: lib/libalpm/add.c:814
#, c-format
msgid "could not update database entry %s-%s"
msgstr "n'a pas pu mettre a jour l'entr�e de base de donn�es %s-%s"
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:816
#, c-format
msgid "error updating database for %s-%s!"
msgstr "erreur lors de la mise a jour de la base de donn�es pour %s-%s!"
-#: lib/libalpm/add.c:804
+#: lib/libalpm/add.c:820
#, c-format
msgid "could not add entry '%s' in cache"
msgstr "n'a pas pu ajouter l'entr�e '%s' dans le cache"
-#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
+#: lib/libalpm/add.c:826 lib/libalpm/remove.c:344
msgid "updating dependency packages 'requiredby' fields"
msgstr "mise a jour des champs 'requit par' des d�pendances"
-#: lib/libalpm/add.c:832
+#: lib/libalpm/add.c:848
#, c-format
msgid "could not find dependency '%s'"
msgstr "n'a pas pu trouver la d�pendance '%s'"
-#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
+#: lib/libalpm/add.c:859 lib/libalpm/remove.c:386
#, c-format
msgid "could not update 'requiredby' database entry %s-%s"
msgstr ""
"n'a pas pu mettre � jour le champ 'requit par' de l'entr�e de base de "
"donn�es %s-%s"
-#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:885 lib/libalpm/remove.c:399 lib/libalpm/sync.c:1045
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr "execute \"ldconfig -r %s\""
@@ -366,185 +366,170 @@ msgstr "n'a pas pu obtenir la 'signature' md5 pour le paquet %s-%s\n"
msgid "md5sums do not match for package %s-%s"
msgstr "les 'signatures' md5 ne correspondent pas pour le paquet %s-%s\n"
-#: lib/libalpm/alpm.c:791
+#: lib/libalpm/alpm.c:790
#, c-format
msgid "could not remove lock file %s"
msgstr "n'a pas pu effacer le fichier de verrou %s"
-#: lib/libalpm/alpm.c:792
+#: lib/libalpm/alpm.c:791
#, c-format
msgid "warning: could not remove lock file %s"
msgstr "avertissement: n'a pas pu effacer le fichier de verrou %s"
-#: lib/libalpm/alpm.c:929
+#: lib/libalpm/alpm.c:926
#, fuzzy, c-format
msgid "config: new section '%s'"
msgstr "n'a pas pu extraire %s: %s\n"
-#: lib/libalpm/alpm.c:958
+#: lib/libalpm/alpm.c:955
msgid "config: nopassiveftp"
msgstr ""
-#: lib/libalpm/alpm.c:961
+#: lib/libalpm/alpm.c:958
msgid "config: usesyslog"
msgstr ""
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:961
msgid "config: chomp"
msgstr ""
-#: lib/libalpm/alpm.c:967
+#: lib/libalpm/alpm.c:964
msgid "config: usecolor"
msgstr ""
-#: lib/libalpm/alpm.c:976
+#: lib/libalpm/alpm.c:973
#, fuzzy, c-format
msgid "config: including %s"
msgstr "ne peut ouvrir le fichier de log %s"
-#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#: lib/libalpm/alpm.c:983 lib/libalpm/alpm.c:988
#, fuzzy, c-format
msgid "config: noupgrade: %s"
msgstr "n'a pas pu extraire %s: %s\n"
-#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#: lib/libalpm/alpm.c:996 lib/libalpm/alpm.c:1001
#, fuzzy, c-format
msgid "config: noextract: %s"
msgstr "n'a pas pu extraire %s: %s\n"
-#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#: lib/libalpm/alpm.c:1009 lib/libalpm/alpm.c:1014
#, fuzzy, c-format
msgid "config: ignorepkg: %s"
msgstr "n'a pas pu extraire %s: %s\n"
-#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#: lib/libalpm/alpm.c:1022 lib/libalpm/alpm.c:1027
#, fuzzy, c-format
msgid "config: holdpkg: %s"
msgstr "ne peut ouvrir le fichier de log %s"
-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1034
#, fuzzy, c-format
msgid "config: dbpath: %s"
msgstr "n'a pas pu extraire %s: %s\n"
-#: lib/libalpm/alpm.c:1044
+#: lib/libalpm/alpm.c:1041
#, fuzzy, c-format
msgid "config: cachedir: %s"
msgstr "n'a pas pu extraire %s: %s\n"
-#: lib/libalpm/alpm.c:1047
+#: lib/libalpm/alpm.c:1044
#, fuzzy, c-format
msgid "config: logfile: %s"
msgstr "ne peut ouvrir le fichier de log %s"
-#: lib/libalpm/alpm.c:1050
+#: lib/libalpm/alpm.c:1047
#, fuzzy, c-format
msgid "config: xfercommand: %s"
msgstr "n'a pas pu extraire %s: %s\n"
-#: lib/libalpm/alpm.c:1055
+#: lib/libalpm/alpm.c:1052
#, c-format
msgid "config: upgradedelay: %d"
msgstr ""
-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
msgid "checking for package replacements"
msgstr "v�rification des remplacements pour le paquet"
-#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1100 lib/libalpm/sync.c:138
#, c-format
msgid "checking replacement '%s' for package '%s'"
msgstr "analyse du remplacement '%s' pour le paquet '%s'"
-#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1102 lib/libalpm/sync.c:140
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
msgstr "%s-%s: ignore la mise a jour du paquet (� remplacer par %s-%s)"
-#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:174
#, c-format
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr "%s-%s s�lectionn� pour mise � jour (� remplacer par %s-%s)"
-#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#: lib/libalpm/alpm.c:1157 lib/libalpm/sync.c:211
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr "'%s' non trouv� dans la liste de synchronisation -- ignor�"
-#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1171 lib/libalpm/sync.c:225 lib/libalpm/sync.c:501
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr "'%s' est d�j� s�lectionn� pour retrait -- ignor�"
-#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
-#, fuzzy, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr "%s-%s: la version locale est plus r�cente"
-
-#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: ignore la mise � jour du paquet (%s)"
-
-#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
-#, fuzzy, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
-msgstr "%s-%s: repousse la mise � jour du paquet (%s)\n"
-
-#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#: lib/libalpm/alpm.c:1177 lib/libalpm/sync.c:232
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr "%s-%s s�lectionn� pour mise � jour (%s => %s)"
-#: lib/libalpm/be_files.c:59
+#: lib/libalpm/be_files.c:58
#, fuzzy, c-format
msgid "unpacking database '%s'"
msgstr "ouvre la base de donn�es '%s'"
-#: lib/libalpm/be_files.c:183
+#: lib/libalpm/be_files.c:182
#, c-format
msgid "invalid name for dabatase entry '%s'"
msgstr "nom invalide pour l'entr�e de base de donn�es '%s'"
-#: lib/libalpm/be_files.c:211
+#: lib/libalpm/be_files.c:210
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:216
+#: lib/libalpm/be_files.c:215
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:224
+#: lib/libalpm/be_files.c:223
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:232
+#: lib/libalpm/be_files.c:231
#, fuzzy, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr "ne peut trouver %s dans la base de donn�es"
-#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
-#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
-#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
-#: lib/libalpm/package.c:185
+#: lib/libalpm/be_files.c:239 lib/libalpm/be_files.c:383
+#: lib/libalpm/be_files.c:406 lib/libalpm/be_files.c:494
+#: lib/libalpm/be_files.c:580 lib/libalpm/be_files.c:607
+#: lib/libalpm/package.c:194
#, fuzzy, c-format
msgid "could not open file %s: %s"
msgstr "ne peut ouvrir le fichier %s"
-#: lib/libalpm/be_files.c:492
+#: lib/libalpm/be_files.c:491
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:578
+#: lib/libalpm/be_files.c:577
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:605
+#: lib/libalpm/be_files.c:604
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -611,8 +596,8 @@ msgstr "comparaison base de donn�e / cibles: trouve %s en conflit avec %s"
#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:718
#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
#, c-format
msgid "malloc failure: could not allocate %d bytes"
@@ -765,13 +750,13 @@ msgid "insufficient privileges"
msgstr "autorisation insuffisante"
#: lib/libalpm/error.c:40
-msgid "wrong or NULL argument passed"
-msgstr "mauvais argument ou NULL pass�"
-
-#: lib/libalpm/error.c:42
msgid "could not find or read file"
msgstr "ne peut trouver ou lire le fichier"
+#: lib/libalpm/error.c:42
+msgid "wrong or NULL argument passed"
+msgstr "mauvais argument ou NULL pass�"
+
#: lib/libalpm/error.c:45
msgid "library not initialized"
msgstr "librairie non initialis�e"
@@ -812,137 +797,152 @@ msgstr "n'a pas pu mettre a jour la base de donn�es"
msgid "could not remove database entry"
msgstr "n'a pas pu retirer l'entr�e de base de donn�es"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:67
+msgid "invalid url for server"
+msgstr ""
+
+#: lib/libalpm/error.c:74
msgid "could not set parameter"
msgstr "n'a pas pu d�finir le param�tre"
-#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
-msgid "transaction not initialized"
-msgstr "transaction non initialis�e"
-
-#: lib/libalpm/error.c:76
+#: lib/libalpm/error.c:77
msgid "transaction already initialized"
msgstr "transaction d�j� initialis�e"
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:79 lib/libalpm/error.c:83
+msgid "transaction not initialized"
+msgstr "transaction non initialis�e"
+
+#: lib/libalpm/error.c:81
msgid "duplicate target"
msgstr "cible r�p�t�e"
-#: lib/libalpm/error.c:82
+#: lib/libalpm/error.c:85
msgid "transaction not prepared"
msgstr "transaction non pr�par�e"
-#: lib/libalpm/error.c:84
+#: lib/libalpm/error.c:87
msgid "transaction aborted"
msgstr "transaction annul�e"
-#: lib/libalpm/error.c:86
+#: lib/libalpm/error.c:89
msgid "operation not compatible with the transaction type"
msgstr "op�ration incompatible avec le type de transaction"
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:984
+msgid "could not commit transaction"
+msgstr "n'a pas pu appliquer la transaction"
+
+#: lib/libalpm/error.c:93
+#, fuzzy
+msgid "could not download all files"
+msgstr "ne peut trouver ou lire le fichier"
+
+#: lib/libalpm/error.c:96
msgid "could not find or read package"
msgstr "ne peut trouver ou lire le paquet"
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "invalid or corrupted package"
msgstr "paquet invalide ou corrompu"
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "cannot open package file"
msgstr "ne peut ouvrir le fichier de paquet"
-#: lib/libalpm/error.c:95
+#: lib/libalpm/error.c:102
msgid "cannot load package data"
msgstr "ne peut charger les donn�es du paquet"
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "package already installed"
msgstr "paquet d�j� install�"
-#: lib/libalpm/error.c:99
+#: lib/libalpm/error.c:106
msgid "package not installed or lesser version"
msgstr "paquet non install� ou version plus ancienne"
-#: lib/libalpm/error.c:101
+#: lib/libalpm/error.c:108
+#, fuzzy
+msgid "cannot remove all files for package"
+msgstr "ne peut effacer le fichier %s"
+
+#: lib/libalpm/error.c:110
msgid "package name is not valid"
msgstr "nom de paquet invalide"
-#: lib/libalpm/error.c:103
+#: lib/libalpm/error.c:112
msgid "corrupted package"
msgstr "paquet corrompu"
-#: lib/libalpm/error.c:105
+#: lib/libalpm/error.c:114
msgid "no such repository"
msgstr ""
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:117
msgid "group not found"
msgstr "groupe non trouv�"
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:120
msgid "could not satisfy dependencies"
msgstr "n'a pas pu satisfaire les d�pendances"
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:122
msgid "conflicting dependencies"
msgstr "conflit de d�pendances"
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:124
msgid "conflicting files"
msgstr "conflit de fichier"
-#: lib/libalpm/error.c:118
-msgid "user aborted"
+#: lib/libalpm/error.c:127
+#, fuzzy
+msgid "user aborted the operation"
msgstr "annulation utilisateur"
-#: lib/libalpm/error.c:120
-msgid "libarchive error"
-msgstr "erreur de libarchive"
-
-#: lib/libalpm/error.c:122
+#: lib/libalpm/error.c:129
msgid "internal error"
msgstr "erreur interne"
-#: lib/libalpm/error.c:124
-msgid "not enough space"
+#: lib/libalpm/error.c:131
+msgid "libarchive error"
+msgstr "erreur de libarchive"
+
+#: lib/libalpm/error.c:133
+msgid "not enough space on disk"
msgstr ""
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:136
msgid "not confirmed"
msgstr ""
-#: lib/libalpm/error.c:129
-msgid "bad section name"
+#: lib/libalpm/error.c:139
+msgid "bad configuration section name"
msgstr ""
-#: lib/libalpm/error.c:131
-msgid "'local' is reserved and cannot be used as a package tree"
+#: lib/libalpm/error.c:141
+msgid "'local' is reserved and cannot be used as a repository name"
msgstr ""
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:143
#, fuzzy
-msgid "syntax error"
-msgstr "erreur interne"
+msgid "syntax error in config file"
+msgstr "%s: erreur de syntaxe dans le fichier de description � la ligne %d"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:145
msgid "all directives must belong to a section"
msgstr ""
-#: lib/libalpm/error.c:137
+#: lib/libalpm/error.c:147
msgid "invalid regular expression"
msgstr ""
-#: lib/libalpm/error.c:139
+#: lib/libalpm/error.c:150
#, fuzzy
msgid "connection to remote host failed"
msgstr "ne peut effacer le fichier %s"
-#: lib/libalpm/error.c:141
-msgid "forking process failed"
-msgstr ""
-
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:153
msgid "unexpected error"
msgstr "erreur non pr�vue"
@@ -951,41 +951,66 @@ msgstr "erreur non pr�vue"
msgid "%s can't be opened\n"
msgstr "%s ne peut etre ouvert\n"
-#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
+#: lib/libalpm/package.c:146
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr "version de paquet manquant dans %s"
+
+#: lib/libalpm/package.c:150
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr "%s-%s: la version locale est plus r�cente"
+
+#: lib/libalpm/package.c:155
+#, c-format
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr "%s-%s: ignore la mise � jour du paquet (%s)"
+
+#: lib/libalpm/package.c:160
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr "%s-%s: repousse la mise � jour du paquet (%s)\n"
+
+#: lib/libalpm/package.c:165
+#, c-format
+msgid "compare versions for %s: %s vs %s, result=%d"
+msgstr ""
+
+#: lib/libalpm/package.c:208 lib/libalpm/package.c:263
#, c-format
msgid "%s: syntax error in description file line %d"
msgstr "%s: erreur de syntaxe dans le fichier de description � la ligne %d"
-#: lib/libalpm/package.c:331
+#: lib/libalpm/package.c:337
msgid "could not parse the package description file"
msgstr "n'a pas pu analyser le fichier de description"
-#: lib/libalpm/package.c:335
+#: lib/libalpm/package.c:341
#, c-format
msgid "missing package name in %s"
msgstr "nom de paquet manquant dans %s"
-#: lib/libalpm/package.c:339
+#: lib/libalpm/package.c:345
#, c-format
msgid "missing package version in %s"
msgstr "version de paquet manquant dans %s"
-#: lib/libalpm/package.c:374
+#: lib/libalpm/package.c:380
#, c-format
msgid "could not remove tempfile %s"
msgstr "ne peut effacer le fichier temporaire %s"
-#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#: lib/libalpm/package.c:393 lib/libalpm/package.c:400
#, fuzzy, c-format
msgid "error while reading package: %s"
msgstr "mise a jour du paquet %s-%s"
-#: lib/libalpm/package.c:400
+#: lib/libalpm/package.c:406
#, fuzzy
msgid "missing package metadata"
msgstr "nom de paquet manquant dans %s"
-#: lib/libalpm/package.c:407
+#: lib/libalpm/package.c:413
#, fuzzy, c-format
msgid "missing package filelist in %s, generating one"
msgstr "fichier d'information manquant dans le paquet %s"
@@ -1014,71 +1039,81 @@ msgstr "ne peut trouver %s dans la base de donn�es -- ignor�"
msgid "finding removable dependencies"
msgstr "trouve les d�pendances dispensables"
-#: lib/libalpm/remove.c:193
+#: lib/libalpm/remove.c:186
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s"
+msgstr "ne peut effacer le fichier %s"
+
+#: lib/libalpm/remove.c:226
#, c-format
msgid "file %s does not exist"
msgstr "le fichier %s n'existe pas"
-#: lib/libalpm/remove.c:199
+#: lib/libalpm/remove.c:232
#, c-format
msgid "keeping directory %s"
msgstr "conserve le r�pertoire %s"
-#: lib/libalpm/remove.c:201
+#: lib/libalpm/remove.c:234
#, c-format
msgid "removing directory %s"
msgstr "efface le r�pertoire %s"
-#: lib/libalpm/remove.c:215
+#: lib/libalpm/remove.c:248
#, c-format
msgid "skipping removal of %s as it has moved to another package"
msgstr "ignore l'effacement de %s car il a �t� d�plac� dans un autre paquet"
-#: lib/libalpm/remove.c:227
+#: lib/libalpm/remove.c:260
#, c-format
msgid "%s saved as %s"
msgstr "%s sauve en tant que %s"
-#: lib/libalpm/remove.c:231
+#: lib/libalpm/remove.c:264
#, c-format
msgid "unlinking %s"
msgstr "suppression %s"
-#: lib/libalpm/remove.c:237
+#: lib/libalpm/remove.c:271
#, fuzzy, c-format
msgid "cannot remove file %s: %s"
msgstr "ne peut effacer le fichier %s"
-#: lib/libalpm/remove.c:265
+#: lib/libalpm/remove.c:299
#, c-format
msgid "removing package %s-%s"
msgstr "retrait du paquet %s-%s"
-#: lib/libalpm/remove.c:276
+#: lib/libalpm/remove.c:311
+#, fuzzy, c-format
+msgid "not removing package '%s', can't remove all files"
+msgstr "r�solution du conflit de paquet '%s'"
+
+#: lib/libalpm/remove.c:317
msgid "removing files"
msgstr "efface les fichiers"
-#: lib/libalpm/remove.c:294
+#: lib/libalpm/remove.c:335
#, c-format
msgid "removing database entry '%s'"
msgstr "ne peut effacer l'entr�e de base de de donn�es %s"
-#: lib/libalpm/remove.c:296
+#: lib/libalpm/remove.c:337
#, c-format
msgid "could not remove database entry %s-%s"
msgstr "ne peut retirer l'entr�e de base de donn�e %s-%s"
-#: lib/libalpm/remove.c:299
+#: lib/libalpm/remove.c:340
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr "ne peut retirer l'entr�e '%s' du cache"
-#: lib/libalpm/remove.c:333
+#: lib/libalpm/remove.c:374
#, fuzzy, c-format
msgid "could not find dependency '%s' for removal"
msgstr "n'a pas pu trouver la d�pendance '%s'"
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/remove.c:384
#, c-format
msgid "updating 'requiredby' field for package '%s'"
msgstr "mise � jour du champ 'requit par' pour le paquet '%s'"
@@ -1087,199 +1122,195 @@ msgstr "mise � jour du champ 'requit par' pour le paquet '%s'"
msgid "checking for package upgrades"
msgstr "v�rification des mises � jour de paquets"
-#: lib/libalpm/sync.c:278
+#: lib/libalpm/sync.c:277
#, fuzzy, c-format
msgid "searching for target in repo '%s'"
msgstr "charge la cible '%s'"
-#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
+#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
#, c-format
msgid "target '%s' not found -- looking for provisions"
msgstr "cible '%s' non trouv�e -- recherche des dispositions"
-#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
+#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
#, c-format
msgid "found '%s' as a provision for '%s'"
msgstr "trouv� '%s' comme disposition pour '%s'"
-#: lib/libalpm/sync.c:299
+#: lib/libalpm/sync.c:298
#, fuzzy, c-format
msgid "repository '%s' not found"
msgstr "groupe non trouv�"
-#: lib/libalpm/sync.c:333
+#: lib/libalpm/sync.c:332
#, c-format
msgid "%s-%s is up to date -- skipping"
msgstr "%s-%s est � jour -- ignor�"
-#: lib/libalpm/sync.c:353
+#: lib/libalpm/sync.c:352
#, c-format
msgid "adding target '%s' to the transaction set"
msgstr "ajout de la cible '%s' au jeu de transaction"
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:400
#, fuzzy
msgid "resolving target's dependencies"
msgstr "r�solution des d�pendances pour les cibles"
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:420
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr "ajout du paquet %s-%s � la liste de transactions"
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:455
msgid "looking for unresolvable dependencies"
msgstr "recherche de d�pendancea non soluble"
-#: lib/libalpm/sync.c:487
+#: lib/libalpm/sync.c:486
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr "le paquet '%s' est en conflit avec '%s'"
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:508
#, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr "'%s' non trouve dans le jeu de transaction -- ignor�"
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:519
#, c-format
msgid "package '%s' provides its own conflict"
msgstr "le paquet '%s' g�n�re son propre conflit"
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
#, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr "'%s' est dans la la liste de cibles -- conservation"
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
#, c-format
msgid "removing '%s' from target list"
msgstr "retire '%s' de la liste de cibles"
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:568
#, c-format
msgid "resolving package '%s' conflict"
msgstr "r�solution du conflit de paquet '%s'"
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:591
#, c-format
msgid "electing '%s' for removal"
msgstr "s�lection de '%s' pour retrait"
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
msgid "unresolvable package conflicts detected"
msgstr "conflit de paquets non soluble d�tect�"
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:670
msgid "checking dependencies of packages designated for removal"
msgstr "analyse des d�pendances pour les paquets marques � retirer"
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:684
msgid "something has gone horribly wrong"
msgstr "quelque chose s'est horriblement mal pass�"
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:703
#, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr "trouv� '%s' comme disposition pour '%s' -- conflit annul�"
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:799
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:810
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:811
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:816
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:817
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:824
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:853 lib/libalpm/sync.c:865
#, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr "ne peut obtenir la 'signature' md5 ou sha1 pour le paquet %s\n"
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:884
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr "l'archive %s �tait corrompue (mauvaise somme MD5 ou SHA1)\n"
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:886
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr "l'archive %s est corrompue (mauvaise somme MD5 ou SHA1)\n"
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:907
msgid "could not create removal transaction"
msgstr "n'a pas pu cr�er la transaction de retrait"
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:913
msgid "could not initialize the removal transaction"
msgstr "n'a pas pu initialiser la transaction de retrait"
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:933
msgid "removing conflicting and to-be-replaced packages"
msgstr "efface les paquets en conflit et ceux � remplacer"
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:935
msgid "could not prepare removal transaction"
msgstr "n'a pas pu pr�parer la transaction de retrait"
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:941
msgid "could not commit removal transaction"
msgstr "n'a pas pu appliquer la transaction de retrait"
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:948
msgid "installing packages"
msgstr "installe les paquets"
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:951
msgid "could not create transaction"
msgstr "n'a pas pu cr�er la transaction"
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:956
msgid "could not initialize transaction"
msgstr "n'a pas pu initialiser la transaction"
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:979
msgid "could not prepare transaction"
msgstr "n'a pas pu pr�parer la transaction"
-#: lib/libalpm/sync.c:985
-msgid "could not commit transaction"
-msgstr "n'a pas pu appliquer la transaction"
-
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:991
msgid "updating database for replaced packages' dependencies"
msgstr ""
"mise a jour de la base de donn�es concernant les d�pendances de paquets "
"remplaces"
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1020
#, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr ""
"n'a pas pu mettre a jour les pr�-requis pour l'entr�e de base de donn�es %s-%"
"s"
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1029
#, c-format
msgid "could not update new database entry %s-%s"
msgstr "n'a pu mettre a jour la nouvelle entr�e de base de donn�es %s-%s"
@@ -1368,6 +1399,10 @@ msgstr ""
msgid "depcmp: %s-%s %s %s => %s"
msgstr ""
+#, fuzzy
+#~ msgid "syntax error"
+#~ msgstr "erreur interne"
+
#~ msgid "unpacking %s"
#~ msgstr "d�compacte %s"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index 176e0df2..f4df4223 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -8,7 +8,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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:35-0500\n"
"PO-Revision-Date: 2006-09-03 13:49+0200\n"
"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
"MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgstr "'%s' metaadat olvas�sa"
msgid "looking for unsatisfied dependencies"
msgstr "el�gtelen f�gg�s�gek keres�se"
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:475
msgid "looking for conflicts"
msgstr "konfliktusok keres�se"
@@ -61,224 +61,224 @@ msgstr "tiszt�t�s"
msgid "looking for file conflicts"
msgstr "f�jl konfliktusok keres�se"
-#: lib/libalpm/add.c:391
+#: lib/libalpm/add.c:394
#, c-format
msgid "upgrading package %s-%s"
msgstr "csomag friss�t�se: %s-%s"
-#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
+#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
#, c-format
msgid "loading FILES info for '%s'"
msgstr "a FILE inf� bet�lt�se a '%s' sz�m�ra"
-#: lib/libalpm/add.c:423
+#: lib/libalpm/add.c:426
#, c-format
msgid "removing old package first (%s-%s)"
msgstr "els�k�nt a r�gi csomag elt�vol�t�sa (%s-%s)"
-#: lib/libalpm/add.c:453
+#: lib/libalpm/add.c:456
#, c-format
msgid "adding package %s-%s"
msgstr "csomag hozz�ad�sa %s-%s"
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:467
#, c-format
msgid "adding new package %s-%s"
msgstr "�j csomag hozz�ad�sa %s-%s"
-#: lib/libalpm/add.c:468
+#: lib/libalpm/add.c:471
msgid "extracting files"
msgstr "f�jlok kifejt�se"
-#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:487 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr "a jelenlegi munkak�nyvt�r nem kaphat� meg"
-#: lib/libalpm/add.c:529
+#: lib/libalpm/add.c:545
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr "figyelmeztet�s: %s a NoExtractben van -- kifejt�s kihagy�sa"
-#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
+#: lib/libalpm/add.c:581 lib/libalpm/add.c:734
#, c-format
msgid "could not extract %s (%s)"
msgstr "nem siker�lt kifejteni: %s (%s)"
-#: lib/libalpm/add.c:608
+#: lib/libalpm/add.c:624
#, c-format
msgid "checking md5 hashes for %s"
msgstr "md5 �sszegek vizsg�lata a %s sz�m�ra"
-#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
+#: lib/libalpm/add.c:625 lib/libalpm/add.c:632
#, c-format
msgid "current: %s"
msgstr "jelenlegi: %s"
-#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
+#: lib/libalpm/add.c:626 lib/libalpm/add.c:633
#, c-format
msgid "new: %s"
msgstr "�j: %s"
-#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
+#: lib/libalpm/add.c:628 lib/libalpm/add.c:635
#, c-format
msgid "original: %s"
msgstr "eredeti: %s"
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:631
#, c-format
msgid "checking sha1 hashes for %s"
msgstr "sha1 �sszegek vizsg�lata a %s sz�m�ra"
-#: lib/libalpm/add.c:633
+#: lib/libalpm/add.c:649
#, c-format
msgid "could not rename %s (%s)"
msgstr "nem siker�lt �tnevezni: %s (%s)"
-#: lib/libalpm/add.c:634
+#: lib/libalpm/add.c:650
#, c-format
msgid "error: could not rename %s (%s)"
msgstr "hiba: nem siker�lt �tnevezni: %s (%s)"
-#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:698
#, c-format
msgid "could not copy %s to %s (%s)"
msgstr "nem siker�lt m�solni: %s-t ide: %s (%s)"
-#: lib/libalpm/add.c:639
+#: lib/libalpm/add.c:655
#, c-format
msgid "error: could not copy %s to %s (%s)"
msgstr "hiba: nem siker�lt m�solni: %s-t ide: %s (%s)"
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:659
#, c-format
msgid "%s saved as %s.pacorig"
msgstr "a %s elmentve %s.pacorig n�ven"
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:660
#, c-format
msgid "warning: %s saved as %s"
msgstr "figyelmeztet�s: a %s elmentve %s n�ven"
-#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
+#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679
msgid "action: installing new file"
msgstr "folyamat: az �j f�jl telep�t�se"
-#: lib/libalpm/add.c:661
+#: lib/libalpm/add.c:677
msgid "action: leaving existing file in place"
msgstr "folyamat: a jelenlegi f�jl megtart�sa"
-#: lib/libalpm/add.c:667
+#: lib/libalpm/add.c:683
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
"folyamat: a jelenlegi f�jl megtart�sa �s az �j .pacnew v�gz�d�ssel val� "
"telep�t�se"
-#: lib/libalpm/add.c:671
+#: lib/libalpm/add.c:687
#, c-format
msgid "could not install %s as %s: %s"
msgstr "nem siker�lt telep�teni a %s-t %s-k�nt: %s"
-#: lib/libalpm/add.c:672
+#: lib/libalpm/add.c:688
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr "hiba: nem siker�lt telep�teni a %s-t %s-k�nt: %s"
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:690
#, c-format
msgid "%s installed as %s"
msgstr "a %s %s n�ven lett telep�tve"
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:691
#, c-format
msgid "warning: %s installed as %s"
msgstr "figyelmeztet�s: a %s n�ven %s lett telep�tve"
-#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:696 lib/libalpm/add.c:716
#, c-format
msgid "extracting %s"
msgstr "a %s kifejt�se"
-#: lib/libalpm/add.c:702
+#: lib/libalpm/add.c:718
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr "%s a NoUpgrade-ben van -- kihagy�s"
-#: lib/libalpm/add.c:704
+#: lib/libalpm/add.c:720
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr "%s kifejt�se %s.pacnew n�ven"
-#: lib/libalpm/add.c:705
+#: lib/libalpm/add.c:721
#, c-format
msgid "warning: extracting %s%s as %s"
msgstr "figyelmeztet�s: %s%s kifejt�se %s.pacnew n�ven"
-#: lib/libalpm/add.c:719
+#: lib/libalpm/add.c:735
#, c-format
msgid "error: could not extract %s (%s)"
msgstr "hiba: nem siker�lt kifejteni: %s (%s)"
-#: lib/libalpm/add.c:729
+#: lib/libalpm/add.c:745
msgid "appending backup entry"
msgstr "hozz�f�z�s a biztons�gi bejegyz�shez"
-#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
+#: lib/libalpm/add.c:776 lib/libalpm/add.c:778
#, c-format
msgid "errors occurred while %s %s"
msgstr "hiba %s k�zben: %s"
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "upgrading"
msgstr "friss�t�s"
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "installing"
msgstr "telep�t�s"
-#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
+#: lib/libalpm/add.c:800 lib/libalpm/add.c:856
#, c-format
msgid "adding '%s' in requiredby field for '%s'"
msgstr "a '%s' hozz�ad�sa \"f�gg t�le\" mez�k�nt a '%s' sz�m�ra"
-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
+#: lib/libalpm/add.c:811 lib/libalpm/remove.c:334
msgid "updating database"
msgstr "az adatb�zis friss�t�se"
-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:812
#, c-format
msgid "adding database entry '%s'"
msgstr "adatb�zis mez� hozz�ad�sa '%s'"
-#: lib/libalpm/add.c:798
+#: lib/libalpm/add.c:814
#, c-format
msgid "could not update database entry %s-%s"
msgstr "sikertelen a '%s-%s' adatb�zis-bejegyz�s friss�t�se"
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:816
#, c-format
msgid "error updating database for %s-%s!"
msgstr "hiba a %s-%s adatb�zis-friss�t�se sor�n"
-#: lib/libalpm/add.c:804
+#: lib/libalpm/add.c:820
#, c-format
msgid "could not add entry '%s' in cache"
msgstr "sikertelen a '%s' bejegyz�s hozz�ad�sa a gyors�t�t�rhoz"
-#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
+#: lib/libalpm/add.c:826 lib/libalpm/remove.c:344
msgid "updating dependency packages 'requiredby' fields"
msgstr "a f�gg� csomagok 'f�gg t�le' mez�j�nek friss�t�se"
-#: lib/libalpm/add.c:832
+#: lib/libalpm/add.c:848
#, c-format
msgid "could not find dependency '%s'"
msgstr "nem tal�lhat� a '%s' f�gg�s�g"
-#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
+#: lib/libalpm/add.c:859 lib/libalpm/remove.c:386
#, c-format
msgid "could not update 'requiredby' database entry %s-%s"
msgstr "sikertelen a %s-%s 'f�gg t�le' adatb�zis-bejegyz�s�nek friss�t�se"
-#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:885 lib/libalpm/remove.c:399 lib/libalpm/sync.c:1045
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr "az \"ldconfig -r %s\" futtat�sa"
@@ -368,189 +368,174 @@ msgstr "sikertelen az md5 ellen�rz� �sszeg el�r�se a %s-%s csomag sz�m�ra\n"
msgid "md5sums do not match for package %s-%s"
msgstr "%s-%s csomag md5 ellen�rz� �sszegei nem egyeznek meg\n"
-#: lib/libalpm/alpm.c:791
+#: lib/libalpm/alpm.c:790
#, c-format
msgid "could not remove lock file %s"
msgstr "nem siker�lt a z�rol� f�jl (%s) elt�vol�t�sa"
-#: lib/libalpm/alpm.c:792
+#: lib/libalpm/alpm.c:791
#, c-format
msgid "warning: could not remove lock file %s"
msgstr "figyelmeztet�s: nem siker�lt a z�rol� f�jl (%s) elt�vol�t�sa"
-#: lib/libalpm/alpm.c:929
+#: lib/libalpm/alpm.c:926
#, fuzzy, c-format
msgid "config: new section '%s'"
msgstr "be�ll�t�sok: �j szekci� '%s'\n"
-#: lib/libalpm/alpm.c:958
+#: lib/libalpm/alpm.c:955
#, fuzzy
msgid "config: nopassiveftp"
msgstr "be�ll�t�sok: nem fog friss�lni: %s\n"
-#: lib/libalpm/alpm.c:961
+#: lib/libalpm/alpm.c:958
#, fuzzy
msgid "config: usesyslog"
msgstr "be�ll�t�sok: syslog haszn�lata\n"
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:961
#, fuzzy
msgid "config: chomp"
msgstr "be�ll�t�sok: ez a csomag mindenk�pp meg lesz tartva: %s\n"
-#: lib/libalpm/alpm.c:967
+#: lib/libalpm/alpm.c:964
#, fuzzy
msgid "config: usecolor"
msgstr "be�ll�t�sok: syslog haszn�lata\n"
-#: lib/libalpm/alpm.c:976
+#: lib/libalpm/alpm.c:973
#, fuzzy, c-format
msgid "config: including %s"
msgstr "be�ll�t�sok: a %s beolvas�sa\n"
-#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#: lib/libalpm/alpm.c:983 lib/libalpm/alpm.c:988
#, fuzzy, c-format
msgid "config: noupgrade: %s"
msgstr "be�ll�t�sok: nem fog friss�lni: %s\n"
-#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#: lib/libalpm/alpm.c:996 lib/libalpm/alpm.c:1001
#, fuzzy, c-format
msgid "config: noextract: %s"
msgstr "nem siker�lt kifejteni: %s\n"
-#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#: lib/libalpm/alpm.c:1009 lib/libalpm/alpm.c:1014
#, fuzzy, c-format
msgid "config: ignorepkg: %s"
msgstr "be�ll�t�sok: a %s csomag figyelmen k�v�l hagy�sa\n"
-#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#: lib/libalpm/alpm.c:1022 lib/libalpm/alpm.c:1027
#, fuzzy, c-format
msgid "config: holdpkg: %s"
msgstr "be�ll�t�sok: ez a csomag mindenk�pp meg lesz tartva: %s\n"
-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1034
#, fuzzy, c-format
msgid "config: dbpath: %s"
msgstr "be�ll�t�sok: adatb�zis �tvonala: %s\n"
-#: lib/libalpm/alpm.c:1044
+#: lib/libalpm/alpm.c:1041
#, fuzzy, c-format
msgid "config: cachedir: %s"
msgstr "be�ll�t�sok: gyors�t�t�r k�nyvt�ra: %s\n"
-#: lib/libalpm/alpm.c:1047
+#: lib/libalpm/alpm.c:1044
#, fuzzy, c-format
msgid "config: logfile: %s"
msgstr "be�ll�t�sok: napl�f�jl: %s\n"
-#: lib/libalpm/alpm.c:1050
+#: lib/libalpm/alpm.c:1047
#, fuzzy, c-format
msgid "config: xfercommand: %s"
msgstr "be�ll�t�sok: gyors�t�t�r k�nyvt�ra: %s\n"
-#: lib/libalpm/alpm.c:1055
+#: lib/libalpm/alpm.c:1052
#, fuzzy, c-format
msgid "config: upgradedelay: %d"
msgstr "be�ll�t�sok: friss�t�s k�sleltet�se: %i\n"
-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
msgid "checking for package replacements"
msgstr "csomagcser�k ellen�rz�se"
-#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1100 lib/libalpm/sync.c:138
#, c-format
msgid "checking replacement '%s' for package '%s'"
msgstr "csere vizsg�lata: '%s' -> '%s'"
-#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1102 lib/libalpm/sync.c:140
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
msgstr "%s-%s: friss�t�s figyelmen k�v�l hagy�sa (a %s-%s fogja lecser�lni)"
-#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:174
#, c-format
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr "a %s-%s kiv�lasztva friss�t�sre (a %s-%s fogja lecser�lni)"
-#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#: lib/libalpm/alpm.c:1157 lib/libalpm/sync.c:211
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr "a '%s' nem tal�lhat� a t�voli adatb�zisban -- kihagy�s"
-#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1171 lib/libalpm/sync.c:225 lib/libalpm/sync.c:501
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr "a '%s' m�r kijel�lve elt�vol�t�sra -- kihagy�s"
-#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
-#, fuzzy, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr "%s-%s: a helyi verzi� �jabb"
-
-#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: a csomagfriss�t�s figyelmen k�v�l hagy�sa (%s)"
-
-#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
-#, fuzzy, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
-msgstr "%s-%s: a csomag friss�t�s�nek k�sleltet�se (%s)\n"
-
-#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#: lib/libalpm/alpm.c:1177 lib/libalpm/sync.c:232
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr "%s-%s kiv�lasztva friss�t�sre (%s => %s)"
-#: lib/libalpm/be_files.c:59
+#: lib/libalpm/be_files.c:58
#, fuzzy, c-format
msgid "unpacking database '%s'"
msgstr "adatb�zis megnyit�sa: '%s'"
-#: lib/libalpm/be_files.c:183
+#: lib/libalpm/be_files.c:182
#, c-format
msgid "invalid name for dabatase entry '%s'"
msgstr "�rv�nytelen n�v a '%s' adatb�zis-bejegyz�s sz�m�ra"
-#: lib/libalpm/be_files.c:211
+#: lib/libalpm/be_files.c:210
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:216
+#: lib/libalpm/be_files.c:215
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:224
+#: lib/libalpm/be_files.c:223
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:232
+#: lib/libalpm/be_files.c:231
#, fuzzy, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr "nem tal�lhat� a %s az adatb�zisban"
-#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
-#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
-#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
-#: lib/libalpm/package.c:185
+#: lib/libalpm/be_files.c:239 lib/libalpm/be_files.c:383
+#: lib/libalpm/be_files.c:406 lib/libalpm/be_files.c:494
+#: lib/libalpm/be_files.c:580 lib/libalpm/be_files.c:607
+#: lib/libalpm/package.c:194
#, fuzzy, c-format
msgid "could not open file %s: %s"
msgstr "nem siker�lt megnyitni a %s f�jlt"
-#: lib/libalpm/be_files.c:492
+#: lib/libalpm/be_files.c:491
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:578
+#: lib/libalpm/be_files.c:577
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:605
+#: lib/libalpm/be_files.c:604
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -617,8 +602,8 @@ msgstr "db vs targs: a %s �tk�zik a k�vetkez�vel: %s"
#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:718
#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
#, c-format
msgid "malloc failure: could not allocate %d bytes"
@@ -770,13 +755,13 @@ msgid "insufficient privileges"
msgstr "el�gtelen jogosults�gok"
#: lib/libalpm/error.c:40
-msgid "wrong or NULL argument passed"
-msgstr "rossz vagy NULL argumentum �rkezett"
-
-#: lib/libalpm/error.c:42
msgid "could not find or read file"
msgstr "nem tal�lhat� vagy nem olvashat� a f�jl"
+#: lib/libalpm/error.c:42
+msgid "wrong or NULL argument passed"
+msgstr "rossz vagy NULL argumentum �rkezett"
+
#: lib/libalpm/error.c:45
msgid "library not initialized"
msgstr "a k�nyvt�r nem inicializ�lt"
@@ -817,136 +802,156 @@ msgstr "nem siker�lt megnyitni az adatb�zist"
msgid "could not remove database entry"
msgstr "nem siker�lt elt�vol�tani az adatb�zis-bejegyz�st"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:67
+msgid "invalid url for server"
+msgstr ""
+
+#: lib/libalpm/error.c:74
msgid "could not set parameter"
msgstr "nem siker�lt be�ll�tani a param�tert"
-#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
-msgid "transaction not initialized"
-msgstr "a tranzakci� nem inicializ�lt"
-
-#: lib/libalpm/error.c:76
+#: lib/libalpm/error.c:77
msgid "transaction already initialized"
msgstr "a tranzakci� m�r inicializ�lt"
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:79 lib/libalpm/error.c:83
+msgid "transaction not initialized"
+msgstr "a tranzakci� nem inicializ�lt"
+
+#: lib/libalpm/error.c:81
msgid "duplicate target"
msgstr "k�t azonos c�lcsomag"
-#: lib/libalpm/error.c:82
+#: lib/libalpm/error.c:85
msgid "transaction not prepared"
msgstr "a tranzakci� nincs el�k�sz�tve"
-#: lib/libalpm/error.c:84
+#: lib/libalpm/error.c:87
msgid "transaction aborted"
msgstr "a tranzakci� f�lbeszak�tva"
-#: lib/libalpm/error.c:86
+#: lib/libalpm/error.c:89
msgid "operation not compatible with the transaction type"
msgstr "a m�velet nem egyeztethet� �ssze a jelenlegi tranzakci�t�pussal"
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:984
+#, fuzzy
+msgid "could not commit transaction"
+msgstr "nem siker�lt l�trehozni az adatb�zist"
+
+#: lib/libalpm/error.c:93
+#, fuzzy
+msgid "could not download all files"
+msgstr "nem tal�lhat� vagy nem olvashat� a f�jl"
+
+#: lib/libalpm/error.c:96
msgid "could not find or read package"
msgstr "nem tal�lhat� vagy nem olvashat� a csomag"
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "invalid or corrupted package"
msgstr "nem �rv�nyes vagy s�r�lt csomag"
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "cannot open package file"
msgstr "nem siker�lt megnyitni a csomagf�jlt"
-#: lib/libalpm/error.c:95
+#: lib/libalpm/error.c:102
msgid "cannot load package data"
msgstr "nem siker�lt bet�lteni a csomagadatokat"
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "package already installed"
msgstr "a csomag m�r telep�tve van"
-#: lib/libalpm/error.c:99
+#: lib/libalpm/error.c:106
msgid "package not installed or lesser version"
msgstr "a csomag nincs telep�tve vagy kisebb verzi�j�"
-#: lib/libalpm/error.c:101
+#: lib/libalpm/error.c:108
+#, fuzzy
+msgid "cannot remove all files for package"
+msgstr "nem siker�lt elt�vol�tani a %s f�jlt"
+
+#: lib/libalpm/error.c:110
msgid "package name is not valid"
msgstr "nem �rv�nyes a csomagn�v"
-#: lib/libalpm/error.c:103
+#: lib/libalpm/error.c:112
msgid "corrupted package"
msgstr "s�r�lt csomag"
-#: lib/libalpm/error.c:105
+#: lib/libalpm/error.c:114
msgid "no such repository"
msgstr ""
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:117
msgid "group not found"
msgstr "a csoport nem tal�lhat�"
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:120
msgid "could not satisfy dependencies"
msgstr "nem siker�lt kiel�g�teni a f�gg�s�geket"
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:122
msgid "conflicting dependencies"
msgstr "�tk�z� f�gg�s�gek"
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:124
msgid "conflicting files"
msgstr "�tk�z� f�jlok"
-#: lib/libalpm/error.c:118
-msgid "user aborted"
+#: lib/libalpm/error.c:127
+#, fuzzy
+msgid "user aborted the operation"
msgstr "felhaszn�l�i megszak�t�s"
-#: lib/libalpm/error.c:120
-msgid "libarchive error"
-msgstr "libarchive hiba"
-
-#: lib/libalpm/error.c:122
+#: lib/libalpm/error.c:129
msgid "internal error"
msgstr "bels� hiba"
-#: lib/libalpm/error.c:124
-msgid "not enough space"
+#: lib/libalpm/error.c:131
+msgid "libarchive error"
+msgstr "libarchive hiba"
+
+#: lib/libalpm/error.c:133
+#, fuzzy
+msgid "not enough space on disk"
msgstr "nincs el�g hely"
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:136
msgid "not confirmed"
msgstr "nem meger�s�tett"
-#: lib/libalpm/error.c:129
-msgid "bad section name"
+#: lib/libalpm/error.c:139
+#, fuzzy
+msgid "bad configuration section name"
msgstr "rossz szekci�n�v"
-#: lib/libalpm/error.c:131
-msgid "'local' is reserved and cannot be used as a package tree"
+#: lib/libalpm/error.c:141
+#, fuzzy
+msgid "'local' is reserved and cannot be used as a repository name"
msgstr "a 'local' n�v fenntartott �s nem haszn�lhat� csomagfak�nt"
-#: lib/libalpm/error.c:133
-msgid "syntax error"
-msgstr "szintaktikai hiba"
+#: lib/libalpm/error.c:143
+#, fuzzy
+msgid "syntax error in config file"
+msgstr "%s: szintaktikai hiba a le�r�f�jl %d. sor�ban"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:145
msgid "all directives must belong to a section"
msgstr "minden direkt�v�nak egy szekci�hoz kell tartoznia"
-#: lib/libalpm/error.c:137
+#: lib/libalpm/error.c:147
msgid "invalid regular expression"
msgstr ""
-#: lib/libalpm/error.c:139
+#: lib/libalpm/error.c:150
#, fuzzy
msgid "connection to remote host failed"
msgstr "nem siker�lt elt�vol�tani a %s f�jlt"
-#: lib/libalpm/error.c:141
-msgid "forking process failed"
-msgstr ""
-
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:153
msgid "unexpected error"
msgstr "nemv�rt hiba"
@@ -955,41 +960,66 @@ msgstr "nemv�rt hiba"
msgid "%s can't be opened\n"
msgstr "nem siker�lt megnyitni a k�vetkez�t: %s\n"
-#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
+#: lib/libalpm/package.c:146
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr "hi�nyz� csomagverzi� itt: %s"
+
+#: lib/libalpm/package.c:150
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr "%s-%s: a helyi verzi� �jabb"
+
+#: lib/libalpm/package.c:155
+#, c-format
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr "%s-%s: a csomagfriss�t�s figyelmen k�v�l hagy�sa (%s)"
+
+#: lib/libalpm/package.c:160
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr "%s-%s: a csomag friss�t�s�nek k�sleltet�se (%s)\n"
+
+#: lib/libalpm/package.c:165
+#, c-format
+msgid "compare versions for %s: %s vs %s, result=%d"
+msgstr ""
+
+#: lib/libalpm/package.c:208 lib/libalpm/package.c:263
#, c-format
msgid "%s: syntax error in description file line %d"
msgstr "%s: szintaktikai hiba a le�r�f�jl %d. sor�ban"
-#: lib/libalpm/package.c:331
+#: lib/libalpm/package.c:337
msgid "could not parse the package description file"
msgstr "nem siker�lt �rtelmezni a csomagle�r� f�jlt"
-#: lib/libalpm/package.c:335
+#: lib/libalpm/package.c:341
#, c-format
msgid "missing package name in %s"
msgstr "hi�nyz� csomagn�v itt: %s"
-#: lib/libalpm/package.c:339
+#: lib/libalpm/package.c:345
#, c-format
msgid "missing package version in %s"
msgstr "hi�nyz� csomagverzi� itt: %s"
-#: lib/libalpm/package.c:374
+#: lib/libalpm/package.c:380
#, c-format
msgid "could not remove tempfile %s"
msgstr "nem siker�lt elt�vol�tani a %s ideiglenes f�jlt"
-#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#: lib/libalpm/package.c:393 lib/libalpm/package.c:400
#, fuzzy, c-format
msgid "error while reading package: %s"
msgstr "csomag friss�t�se: %s-%s"
-#: lib/libalpm/package.c:400
+#: lib/libalpm/package.c:406
#, fuzzy
msgid "missing package metadata"
msgstr "hi�nyz� csomagn�v itt: %s"
-#: lib/libalpm/package.c:407
+#: lib/libalpm/package.c:413
#, fuzzy, c-format
msgid "missing package filelist in %s, generating one"
msgstr "hi�nyz� csomaginform�ci�-f�jl ebben: %s"
@@ -1018,71 +1048,81 @@ msgstr "nem tal�lhat� a %s az adatb�zisban -- kihagy�s"
msgid "finding removable dependencies"
msgstr "elt�vol�that� f�gg�s�gek keres�se"
-#: lib/libalpm/remove.c:193
+#: lib/libalpm/remove.c:186
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s"
+msgstr "nem siker�lt elt�vol�tani a %s f�jlt"
+
+#: lib/libalpm/remove.c:226
#, c-format
msgid "file %s does not exist"
msgstr "a %s f�jl neml�tezik"
-#: lib/libalpm/remove.c:199
+#: lib/libalpm/remove.c:232
#, c-format
msgid "keeping directory %s"
msgstr "a %s k�nyvt�r megtart�sa"
-#: lib/libalpm/remove.c:201
+#: lib/libalpm/remove.c:234
#, c-format
msgid "removing directory %s"
msgstr "a %s k�nyvt�r t�rl�se"
-#: lib/libalpm/remove.c:215
+#: lib/libalpm/remove.c:248
#, c-format
msgid "skipping removal of %s as it has moved to another package"
msgstr "a %s t�rl�s�nek kihagy�sa, mivel az egy m�sik csomagba ker�lt �t"
-#: lib/libalpm/remove.c:227
+#: lib/libalpm/remove.c:260
#, c-format
msgid "%s saved as %s"
msgstr "a %s elmentve %s n�ven"
-#: lib/libalpm/remove.c:231
+#: lib/libalpm/remove.c:264
#, c-format
msgid "unlinking %s"
msgstr "a %s t�rl�se"
-#: lib/libalpm/remove.c:237
+#: lib/libalpm/remove.c:271
#, fuzzy, c-format
msgid "cannot remove file %s: %s"
msgstr "nem siker�lt elt�vol�tani a %s f�jlt"
-#: lib/libalpm/remove.c:265
+#: lib/libalpm/remove.c:299
#, c-format
msgid "removing package %s-%s"
msgstr "a %s-%s csomag elt�vol�t�sa"
-#: lib/libalpm/remove.c:276
+#: lib/libalpm/remove.c:311
+#, fuzzy, c-format
+msgid "not removing package '%s', can't remove all files"
+msgstr "a %s-%s csomag elt�vol�t�sa"
+
+#: lib/libalpm/remove.c:317
msgid "removing files"
msgstr "f�jlok t�rl�se"
-#: lib/libalpm/remove.c:294
+#: lib/libalpm/remove.c:335
#, c-format
msgid "removing database entry '%s'"
msgstr "a '%s' adatb�zis-bejegyz�s elt�vol�t�sa"
-#: lib/libalpm/remove.c:296
+#: lib/libalpm/remove.c:337
#, c-format
msgid "could not remove database entry %s-%s"
msgstr "nem siker�lt elt�vol�tani a %s-%s adatb�zis-bejegyz�st"
-#: lib/libalpm/remove.c:299
+#: lib/libalpm/remove.c:340
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr "nem siker�lt elt�vol�tani a '%s' bejegyz�st a gyors�t�t�rb�l"
-#: lib/libalpm/remove.c:333
+#: lib/libalpm/remove.c:374
#, fuzzy, c-format
msgid "could not find dependency '%s' for removal"
msgstr "nem tal�lhat� a '%s' f�gg�s�g"
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/remove.c:384
#, c-format
msgid "updating 'requiredby' field for package '%s'"
msgstr "a '%s' csomag 'f�gg t�le' mez�j�nek friss�t�se"
@@ -1091,201 +1131,196 @@ msgstr "a '%s' csomag 'f�gg t�le' mez�j�nek friss�t�se"
msgid "checking for package upgrades"
msgstr "csomagfriss�t�sek vizsg�lata"
-#: lib/libalpm/sync.c:278
+#: lib/libalpm/sync.c:277
#, fuzzy, c-format
msgid "searching for target in repo '%s'"
msgstr "c�l bet�lt�se '%s'"
-#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
+#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
#, c-format
msgid "target '%s' not found -- looking for provisions"
msgstr "a '%s' c�l nem tal�lhat� -- csomagok keres�se amik szolg�ltatj�k"
-#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
+#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
#, c-format
msgid "found '%s' as a provision for '%s'"
msgstr "a '%s' szolg�ltatja a k�vetkez�t: '%s'"
-#: lib/libalpm/sync.c:299
+#: lib/libalpm/sync.c:298
#, fuzzy, c-format
msgid "repository '%s' not found"
msgstr "a csoport nem tal�lhat�"
-#: lib/libalpm/sync.c:333
+#: lib/libalpm/sync.c:332
#, c-format
msgid "%s-%s is up to date -- skipping"
msgstr "%s-%s naprak�sz -- kihagy�s"
-#: lib/libalpm/sync.c:353
+#: lib/libalpm/sync.c:352
#, c-format
msgid "adding target '%s' to the transaction set"
msgstr "a '%s' c�l hozz�ad�sa a tranzakci�hoz"
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:400
#, fuzzy
msgid "resolving target's dependencies"
msgstr "a c�lok f�gg�s�geinek felold�sa"
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:420
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr "a %s-%s csomag hozz�ad�sa a tranzakci� c�ljaihoz"
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:455
msgid "looking for unresolvable dependencies"
msgstr "feloldhatatlan f�gg�s�gek keres�se"
-#: lib/libalpm/sync.c:487
+#: lib/libalpm/sync.c:486
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr ""
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:508
#, fuzzy, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr "a '%s' nem tal�lhat� a t�voli adatb�zisban -- kihagy�s"
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:519
#, c-format
msgid "package '%s' provides its own conflict"
msgstr ""
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
#, fuzzy, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr "az �jabb verzi� (%s-%s) m�r el�rhet� a c�l list�ban -- kihagy�s"
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
#, fuzzy, c-format
msgid "removing '%s' from target list"
msgstr "a '%s' bejegyz�s elt�vol�t�sa a '%s' gyors�t�t�rb�l"
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:568
#, fuzzy, c-format
msgid "resolving package '%s' conflict"
msgstr "a %s-%s csomag elt�vol�t�sa"
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:591
#, c-format
msgid "electing '%s' for removal"
msgstr ""
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
msgid "unresolvable package conflicts detected"
msgstr ""
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:670
msgid "checking dependencies of packages designated for removal"
msgstr ""
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:684
msgid "something has gone horribly wrong"
msgstr ""
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:703
#, fuzzy, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr "a '%s' szolg�ltatja a k�vetkez�t: '%s'"
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:799
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:810
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:811
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:816
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:817
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:824
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:853 lib/libalpm/sync.c:865
#, fuzzy, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr "sikertelen az sha1 ellen�rz� �sszeg el�r�se a %s-%s csomag sz�m�ra\n"
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:884
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:886
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:907
#, fuzzy
msgid "could not create removal transaction"
msgstr "nem siker�lt l�trehozni az adatb�zist"
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:913
msgid "could not initialize the removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:933
msgid "removing conflicting and to-be-replaced packages"
msgstr ""
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:935
#, fuzzy
msgid "could not prepare removal transaction"
msgstr "nem siker�lt l�trehozni az adatb�zist"
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:941
msgid "could not commit removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:948
#, fuzzy
msgid "installing packages"
msgstr "telep�t�s"
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:951
#, fuzzy
msgid "could not create transaction"
msgstr "nem siker�lt l�trehozni az adatb�zist"
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:956
msgid "could not initialize transaction"
msgstr ""
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:979
#, fuzzy
msgid "could not prepare transaction"
msgstr "�rtelmezhetetlen token %s"
-#: lib/libalpm/sync.c:985
-#, fuzzy
-msgid "could not commit transaction"
-msgstr "nem siker�lt l�trehozni az adatb�zist"
-
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:991
msgid "updating database for replaced packages' dependencies"
msgstr ""
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1020
#, fuzzy, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr "sikertelen a %s-%s 'f�gg t�le' adatb�zis-bejegyz�s�nek friss�t�se"
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1029
#, fuzzy, c-format
msgid "could not update new database entry %s-%s"
msgstr "sikertelen a '%s-%s' adatb�zis-bejegyz�s friss�t�se"
@@ -1375,6 +1410,9 @@ msgstr ""
msgid "depcmp: %s-%s %s %s => %s"
msgstr ""
+#~ msgid "syntax error"
+#~ msgstr "szintaktikai hiba"
+
#~ msgid "unpacking %s"
#~ msgstr "%s kit�m�r�t�se"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index 1aab31fc..bd0fcfcf 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -7,7 +7,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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:35-0500\n"
"PO-Revision-Date: 2007-02-06 20:15-0500\n"
"Last-Translator: Dan McGee <pacman-dev@archlinux.org>\n"
"MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr ""
msgid "looking for unsatisfied dependencies"
msgstr ""
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:475
msgid "looking for conflicts"
msgstr ""
@@ -60,222 +60,222 @@ msgstr ""
msgid "looking for file conflicts"
msgstr ""
-#: lib/libalpm/add.c:391
+#: lib/libalpm/add.c:394
#, c-format
msgid "upgrading package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
+#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
#, c-format
msgid "loading FILES info for '%s'"
msgstr ""
-#: lib/libalpm/add.c:423
+#: lib/libalpm/add.c:426
#, c-format
msgid "removing old package first (%s-%s)"
msgstr ""
-#: lib/libalpm/add.c:453
+#: lib/libalpm/add.c:456
#, c-format
msgid "adding package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:467
#, c-format
msgid "adding new package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:468
+#: lib/libalpm/add.c:471
msgid "extracting files"
msgstr ""
-#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:487 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr ""
-#: lib/libalpm/add.c:529
+#: lib/libalpm/add.c:545
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr ""
-#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
+#: lib/libalpm/add.c:581 lib/libalpm/add.c:734
#, c-format
msgid "could not extract %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:608
+#: lib/libalpm/add.c:624
#, c-format
msgid "checking md5 hashes for %s"
msgstr ""
-#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
+#: lib/libalpm/add.c:625 lib/libalpm/add.c:632
#, c-format
msgid "current: %s"
msgstr ""
-#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
+#: lib/libalpm/add.c:626 lib/libalpm/add.c:633
#, c-format
msgid "new: %s"
msgstr ""
-#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
+#: lib/libalpm/add.c:628 lib/libalpm/add.c:635
#, c-format
msgid "original: %s"
msgstr ""
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:631
#, c-format
msgid "checking sha1 hashes for %s"
msgstr ""
-#: lib/libalpm/add.c:633
+#: lib/libalpm/add.c:649
#, c-format
msgid "could not rename %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:634
+#: lib/libalpm/add.c:650
#, c-format
msgid "error: could not rename %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:698
#, c-format
msgid "could not copy %s to %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:639
+#: lib/libalpm/add.c:655
#, c-format
msgid "error: could not copy %s to %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:659
#, c-format
msgid "%s saved as %s.pacorig"
msgstr ""
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:660
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
+#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679
msgid "action: installing new file"
msgstr ""
-#: lib/libalpm/add.c:661
+#: lib/libalpm/add.c:677
msgid "action: leaving existing file in place"
msgstr ""
-#: lib/libalpm/add.c:667
+#: lib/libalpm/add.c:683
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
-#: lib/libalpm/add.c:671
+#: lib/libalpm/add.c:687
#, c-format
msgid "could not install %s as %s: %s"
msgstr ""
-#: lib/libalpm/add.c:672
+#: lib/libalpm/add.c:688
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr ""
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:690
#, c-format
msgid "%s installed as %s"
msgstr ""
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:691
#, c-format
msgid "warning: %s installed as %s"
msgstr ""
-#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:696 lib/libalpm/add.c:716
#, c-format
msgid "extracting %s"
msgstr ""
-#: lib/libalpm/add.c:702
+#: lib/libalpm/add.c:718
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr ""
-#: lib/libalpm/add.c:704
+#: lib/libalpm/add.c:720
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr ""
-#: lib/libalpm/add.c:705
+#: lib/libalpm/add.c:721
#, c-format
msgid "warning: extracting %s%s as %s"
msgstr ""
-#: lib/libalpm/add.c:719
+#: lib/libalpm/add.c:735
#, c-format
msgid "error: could not extract %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:729
+#: lib/libalpm/add.c:745
msgid "appending backup entry"
msgstr ""
-#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
+#: lib/libalpm/add.c:776 lib/libalpm/add.c:778
#, c-format
msgid "errors occurred while %s %s"
msgstr ""
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "upgrading"
msgstr ""
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "installing"
msgstr ""
-#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
+#: lib/libalpm/add.c:800 lib/libalpm/add.c:856
#, c-format
msgid "adding '%s' in requiredby field for '%s'"
msgstr ""
-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
+#: lib/libalpm/add.c:811 lib/libalpm/remove.c:334
msgid "updating database"
msgstr ""
-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:812
#, c-format
msgid "adding database entry '%s'"
msgstr ""
-#: lib/libalpm/add.c:798
+#: lib/libalpm/add.c:814
#, c-format
msgid "could not update database entry %s-%s"
msgstr ""
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:816
#, c-format
msgid "error updating database for %s-%s!"
msgstr ""
-#: lib/libalpm/add.c:804
+#: lib/libalpm/add.c:820
#, c-format
msgid "could not add entry '%s' in cache"
msgstr ""
-#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
+#: lib/libalpm/add.c:826 lib/libalpm/remove.c:344
msgid "updating dependency packages 'requiredby' fields"
msgstr ""
-#: lib/libalpm/add.c:832
+#: lib/libalpm/add.c:848
#, c-format
msgid "could not find dependency '%s'"
msgstr ""
-#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
+#: lib/libalpm/add.c:859 lib/libalpm/remove.c:386
#, c-format
msgid "could not update 'requiredby' database entry %s-%s"
msgstr ""
-#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:885 lib/libalpm/remove.c:399 lib/libalpm/sync.c:1045
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr ""
@@ -361,185 +361,170 @@ msgstr ""
msgid "md5sums do not match for package %s-%s"
msgstr ""
-#: lib/libalpm/alpm.c:791
+#: lib/libalpm/alpm.c:790
#, c-format
msgid "could not remove lock file %s"
msgstr ""
-#: lib/libalpm/alpm.c:792
+#: lib/libalpm/alpm.c:791
#, c-format
msgid "warning: could not remove lock file %s"
msgstr ""
-#: lib/libalpm/alpm.c:929
+#: lib/libalpm/alpm.c:926
#, c-format
msgid "config: new section '%s'"
msgstr ""
-#: lib/libalpm/alpm.c:958
+#: lib/libalpm/alpm.c:955
msgid "config: nopassiveftp"
msgstr ""
-#: lib/libalpm/alpm.c:961
+#: lib/libalpm/alpm.c:958
msgid "config: usesyslog"
msgstr ""
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:961
msgid "config: chomp"
msgstr ""
-#: lib/libalpm/alpm.c:967
+#: lib/libalpm/alpm.c:964
msgid "config: usecolor"
msgstr ""
-#: lib/libalpm/alpm.c:976
+#: lib/libalpm/alpm.c:973
#, c-format
msgid "config: including %s"
msgstr ""
-#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#: lib/libalpm/alpm.c:983 lib/libalpm/alpm.c:988
#, c-format
msgid "config: noupgrade: %s"
msgstr ""
-#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#: lib/libalpm/alpm.c:996 lib/libalpm/alpm.c:1001
#, c-format
msgid "config: noextract: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#: lib/libalpm/alpm.c:1009 lib/libalpm/alpm.c:1014
#, c-format
msgid "config: ignorepkg: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#: lib/libalpm/alpm.c:1022 lib/libalpm/alpm.c:1027
#, c-format
msgid "config: holdpkg: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1034
#, c-format
msgid "config: dbpath: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1044
+#: lib/libalpm/alpm.c:1041
#, c-format
msgid "config: cachedir: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1047
+#: lib/libalpm/alpm.c:1044
#, c-format
msgid "config: logfile: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1050
+#: lib/libalpm/alpm.c:1047
#, c-format
msgid "config: xfercommand: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1055
+#: lib/libalpm/alpm.c:1052
#, c-format
msgid "config: upgradedelay: %d"
msgstr ""
-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
msgid "checking for package replacements"
msgstr ""
-#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1100 lib/libalpm/sync.c:138
#, c-format
msgid "checking replacement '%s' for package '%s'"
msgstr ""
-#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1102 lib/libalpm/sync.c:140
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:174
#, c-format
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#: lib/libalpm/alpm.c:1157 lib/libalpm/sync.c:211
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr ""
-#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1171 lib/libalpm/sync.c:225 lib/libalpm/sync.c:501
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr ""
-#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#: lib/libalpm/alpm.c:1177 lib/libalpm/sync.c:232
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr ""
-#: lib/libalpm/be_files.c:59
+#: lib/libalpm/be_files.c:58
#, c-format
msgid "unpacking database '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:183
+#: lib/libalpm/be_files.c:182
#, c-format
msgid "invalid name for dabatase entry '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:211
+#: lib/libalpm/be_files.c:210
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:216
+#: lib/libalpm/be_files.c:215
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:224
+#: lib/libalpm/be_files.c:223
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:232
+#: lib/libalpm/be_files.c:231
#, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
-#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
-#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
-#: lib/libalpm/package.c:185
+#: lib/libalpm/be_files.c:239 lib/libalpm/be_files.c:383
+#: lib/libalpm/be_files.c:406 lib/libalpm/be_files.c:494
+#: lib/libalpm/be_files.c:580 lib/libalpm/be_files.c:607
+#: lib/libalpm/package.c:194
#, c-format
msgid "could not open file %s: %s"
msgstr ""
-#: lib/libalpm/be_files.c:492
+#: lib/libalpm/be_files.c:491
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:578
+#: lib/libalpm/be_files.c:577
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:605
+#: lib/libalpm/be_files.c:604
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -606,8 +591,8 @@ msgstr ""
#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:718
#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
#, c-format
msgid "malloc failure: could not allocate %d bytes"
@@ -754,11 +739,11 @@ msgid "insufficient privileges"
msgstr ""
#: lib/libalpm/error.c:40
-msgid "wrong or NULL argument passed"
+msgid "could not find or read file"
msgstr ""
#: lib/libalpm/error.c:42
-msgid "could not find or read file"
+msgid "wrong or NULL argument passed"
msgstr ""
#: lib/libalpm/error.c:45
@@ -801,135 +786,147 @@ msgstr ""
msgid "could not remove database entry"
msgstr ""
-#: lib/libalpm/error.c:71
-msgid "could not set parameter"
+#: lib/libalpm/error.c:67
+msgid "invalid url for server"
msgstr ""
-#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
-msgid "transaction not initialized"
+#: lib/libalpm/error.c:74
+msgid "could not set parameter"
msgstr ""
-#: lib/libalpm/error.c:76
+#: lib/libalpm/error.c:77
msgid "transaction already initialized"
msgstr ""
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:79 lib/libalpm/error.c:83
+msgid "transaction not initialized"
+msgstr ""
+
+#: lib/libalpm/error.c:81
msgid "duplicate target"
msgstr ""
-#: lib/libalpm/error.c:82
+#: lib/libalpm/error.c:85
msgid "transaction not prepared"
msgstr ""
-#: lib/libalpm/error.c:84
+#: lib/libalpm/error.c:87
msgid "transaction aborted"
msgstr ""
-#: lib/libalpm/error.c:86
+#: lib/libalpm/error.c:89
msgid "operation not compatible with the transaction type"
msgstr ""
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:984
+msgid "could not commit transaction"
+msgstr ""
+
+#: lib/libalpm/error.c:93
+msgid "could not download all files"
+msgstr ""
+
+#: lib/libalpm/error.c:96
msgid "could not find or read package"
msgstr ""
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "invalid or corrupted package"
msgstr ""
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "cannot open package file"
msgstr ""
-#: lib/libalpm/error.c:95
+#: lib/libalpm/error.c:102
msgid "cannot load package data"
msgstr ""
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "package already installed"
msgstr ""
-#: lib/libalpm/error.c:99
+#: lib/libalpm/error.c:106
msgid "package not installed or lesser version"
msgstr ""
-#: lib/libalpm/error.c:101
+#: lib/libalpm/error.c:108
+msgid "cannot remove all files for package"
+msgstr ""
+
+#: lib/libalpm/error.c:110
msgid "package name is not valid"
msgstr ""
-#: lib/libalpm/error.c:103
+#: lib/libalpm/error.c:112
msgid "corrupted package"
msgstr ""
-#: lib/libalpm/error.c:105
+#: lib/libalpm/error.c:114
msgid "no such repository"
msgstr ""
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:117
msgid "group not found"
msgstr ""
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:120
msgid "could not satisfy dependencies"
msgstr ""
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:122
msgid "conflicting dependencies"
msgstr ""
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:124
msgid "conflicting files"
msgstr ""
-#: lib/libalpm/error.c:118
-msgid "user aborted"
+#: lib/libalpm/error.c:127
+msgid "user aborted the operation"
msgstr ""
-#: lib/libalpm/error.c:120
-msgid "libarchive error"
+#: lib/libalpm/error.c:129
+msgid "internal error"
msgstr ""
-#: lib/libalpm/error.c:122
-msgid "internal error"
+#: lib/libalpm/error.c:131
+msgid "libarchive error"
msgstr ""
-#: lib/libalpm/error.c:124
-msgid "not enough space"
+#: lib/libalpm/error.c:133
+msgid "not enough space on disk"
msgstr ""
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:136
msgid "not confirmed"
msgstr ""
-#: lib/libalpm/error.c:129
-msgid "bad section name"
+#: lib/libalpm/error.c:139
+msgid "bad configuration section name"
msgstr ""
-#: lib/libalpm/error.c:131
-msgid "'local' is reserved and cannot be used as a package tree"
+#: lib/libalpm/error.c:141
+msgid "'local' is reserved and cannot be used as a repository name"
msgstr ""
-#: lib/libalpm/error.c:133
-msgid "syntax error"
+#: lib/libalpm/error.c:143
+msgid "syntax error in config file"
msgstr ""
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:145
msgid "all directives must belong to a section"
msgstr ""
-#: lib/libalpm/error.c:137
+#: lib/libalpm/error.c:147
msgid "invalid regular expression"
msgstr ""
-#: lib/libalpm/error.c:139
+#: lib/libalpm/error.c:150
msgid "connection to remote host failed"
msgstr ""
-#: lib/libalpm/error.c:141
-msgid "forking process failed"
-msgstr ""
-
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:153
msgid "unexpected error"
msgstr ""
@@ -938,40 +935,65 @@ msgstr ""
msgid "%s can't be opened\n"
msgstr ""
-#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
+#: lib/libalpm/package.c:146
+#, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr ""
+
+#: lib/libalpm/package.c:150
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:155
+#, c-format
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:160
+#, c-format
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:165
+#, c-format
+msgid "compare versions for %s: %s vs %s, result=%d"
+msgstr ""
+
+#: lib/libalpm/package.c:208 lib/libalpm/package.c:263
#, c-format
msgid "%s: syntax error in description file line %d"
msgstr ""
-#: lib/libalpm/package.c:331
+#: lib/libalpm/package.c:337
msgid "could not parse the package description file"
msgstr ""
-#: lib/libalpm/package.c:335
+#: lib/libalpm/package.c:341
#, c-format
msgid "missing package name in %s"
msgstr ""
-#: lib/libalpm/package.c:339
+#: lib/libalpm/package.c:345
#, c-format
msgid "missing package version in %s"
msgstr ""
-#: lib/libalpm/package.c:374
+#: lib/libalpm/package.c:380
#, c-format
msgid "could not remove tempfile %s"
msgstr ""
-#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#: lib/libalpm/package.c:393 lib/libalpm/package.c:400
#, c-format
msgid "error while reading package: %s"
msgstr ""
-#: lib/libalpm/package.c:400
+#: lib/libalpm/package.c:406
msgid "missing package metadata"
msgstr ""
-#: lib/libalpm/package.c:407
+#: lib/libalpm/package.c:413
#, c-format
msgid "missing package filelist in %s, generating one"
msgstr ""
@@ -1000,71 +1022,81 @@ msgstr ""
msgid "finding removable dependencies"
msgstr ""
-#: lib/libalpm/remove.c:193
+#: lib/libalpm/remove.c:186
+#, c-format
+msgid "cannot remove file '%s': %s"
+msgstr ""
+
+#: lib/libalpm/remove.c:226
#, c-format
msgid "file %s does not exist"
msgstr ""
-#: lib/libalpm/remove.c:199
+#: lib/libalpm/remove.c:232
#, c-format
msgid "keeping directory %s"
msgstr ""
-#: lib/libalpm/remove.c:201
+#: lib/libalpm/remove.c:234
#, c-format
msgid "removing directory %s"
msgstr ""
-#: lib/libalpm/remove.c:215
+#: lib/libalpm/remove.c:248
#, c-format
msgid "skipping removal of %s as it has moved to another package"
msgstr ""
-#: lib/libalpm/remove.c:227
+#: lib/libalpm/remove.c:260
#, c-format
msgid "%s saved as %s"
msgstr ""
-#: lib/libalpm/remove.c:231
+#: lib/libalpm/remove.c:264
#, c-format
msgid "unlinking %s"
msgstr ""
-#: lib/libalpm/remove.c:237
+#: lib/libalpm/remove.c:271
#, c-format
msgid "cannot remove file %s: %s"
msgstr ""
-#: lib/libalpm/remove.c:265
+#: lib/libalpm/remove.c:299
#, c-format
msgid "removing package %s-%s"
msgstr ""
-#: lib/libalpm/remove.c:276
+#: lib/libalpm/remove.c:311
+#, c-format
+msgid "not removing package '%s', can't remove all files"
+msgstr ""
+
+#: lib/libalpm/remove.c:317
msgid "removing files"
msgstr ""
-#: lib/libalpm/remove.c:294
+#: lib/libalpm/remove.c:335
#, c-format
msgid "removing database entry '%s'"
msgstr ""
-#: lib/libalpm/remove.c:296
+#: lib/libalpm/remove.c:337
#, c-format
msgid "could not remove database entry %s-%s"
msgstr ""
-#: lib/libalpm/remove.c:299
+#: lib/libalpm/remove.c:340
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr ""
-#: lib/libalpm/remove.c:333
+#: lib/libalpm/remove.c:374
#, c-format
msgid "could not find dependency '%s' for removal"
msgstr ""
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/remove.c:384
#, c-format
msgid "updating 'requiredby' field for package '%s'"
msgstr ""
@@ -1073,194 +1105,190 @@ msgstr ""
msgid "checking for package upgrades"
msgstr ""
-#: lib/libalpm/sync.c:278
+#: lib/libalpm/sync.c:277
#, c-format
msgid "searching for target in repo '%s'"
msgstr ""
-#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
+#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
#, c-format
msgid "target '%s' not found -- looking for provisions"
msgstr ""
-#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
+#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
#, c-format
msgid "found '%s' as a provision for '%s'"
msgstr ""
-#: lib/libalpm/sync.c:299
+#: lib/libalpm/sync.c:298
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: lib/libalpm/sync.c:333
+#: lib/libalpm/sync.c:332
#, c-format
msgid "%s-%s is up to date -- skipping"
msgstr ""
-#: lib/libalpm/sync.c:353
+#: lib/libalpm/sync.c:352
#, c-format
msgid "adding target '%s' to the transaction set"
msgstr ""
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:400
msgid "resolving target's dependencies"
msgstr ""
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:420
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr ""
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:455
msgid "looking for unresolvable dependencies"
msgstr ""
-#: lib/libalpm/sync.c:487
+#: lib/libalpm/sync.c:486
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr ""
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:508
#, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr ""
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:519
#, c-format
msgid "package '%s' provides its own conflict"
msgstr ""
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
#, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr ""
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
#, c-format
msgid "removing '%s' from target list"
msgstr ""
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:568
#, c-format
msgid "resolving package '%s' conflict"
msgstr ""
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:591
#, c-format
msgid "electing '%s' for removal"
msgstr ""
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
msgid "unresolvable package conflicts detected"
msgstr ""
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:670
msgid "checking dependencies of packages designated for removal"
msgstr ""
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:684
msgid "something has gone horribly wrong"
msgstr ""
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:703
#, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr ""
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:799
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:810
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:811
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:816
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:817
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:824
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:853 lib/libalpm/sync.c:865
#, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr ""
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:884
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:886
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:907
msgid "could not create removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:913
msgid "could not initialize the removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:933
msgid "removing conflicting and to-be-replaced packages"
msgstr ""
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:935
msgid "could not prepare removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:941
msgid "could not commit removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:948
msgid "installing packages"
msgstr ""
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:951
msgid "could not create transaction"
msgstr ""
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:956
msgid "could not initialize transaction"
msgstr ""
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:979
msgid "could not prepare transaction"
msgstr ""
-#: lib/libalpm/sync.c:985
-msgid "could not commit transaction"
-msgstr ""
-
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:991
msgid "updating database for replaced packages' dependencies"
msgstr ""
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1020
#, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr ""
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1029
#, c-format
msgid "could not update new database entry %s-%s"
msgstr ""
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 854b38ba..296cd3c0 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -7,7 +7,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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:35-0500\n"
"PO-Revision-Date: 2007-02-06 20:16-0500\n"
"Last-Translator: Dan McGee <pacman-dev@archlinux.org>\n"
"MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr ""
msgid "looking for unsatisfied dependencies"
msgstr ""
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:475
msgid "looking for conflicts"
msgstr ""
@@ -60,222 +60,222 @@ msgstr ""
msgid "looking for file conflicts"
msgstr ""
-#: lib/libalpm/add.c:391
+#: lib/libalpm/add.c:394
#, c-format
msgid "upgrading package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
+#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
#, c-format
msgid "loading FILES info for '%s'"
msgstr ""
-#: lib/libalpm/add.c:423
+#: lib/libalpm/add.c:426
#, c-format
msgid "removing old package first (%s-%s)"
msgstr ""
-#: lib/libalpm/add.c:453
+#: lib/libalpm/add.c:456
#, c-format
msgid "adding package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:467
#, c-format
msgid "adding new package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:468
+#: lib/libalpm/add.c:471
msgid "extracting files"
msgstr ""
-#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:487 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr ""
-#: lib/libalpm/add.c:529
+#: lib/libalpm/add.c:545
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr ""
-#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
+#: lib/libalpm/add.c:581 lib/libalpm/add.c:734
#, c-format
msgid "could not extract %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:608
+#: lib/libalpm/add.c:624
#, c-format
msgid "checking md5 hashes for %s"
msgstr ""
-#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
+#: lib/libalpm/add.c:625 lib/libalpm/add.c:632
#, c-format
msgid "current: %s"
msgstr ""
-#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
+#: lib/libalpm/add.c:626 lib/libalpm/add.c:633
#, c-format
msgid "new: %s"
msgstr ""
-#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
+#: lib/libalpm/add.c:628 lib/libalpm/add.c:635
#, c-format
msgid "original: %s"
msgstr ""
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:631
#, c-format
msgid "checking sha1 hashes for %s"
msgstr ""
-#: lib/libalpm/add.c:633
+#: lib/libalpm/add.c:649
#, c-format
msgid "could not rename %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:634
+#: lib/libalpm/add.c:650
#, c-format
msgid "error: could not rename %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:698
#, c-format
msgid "could not copy %s to %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:639
+#: lib/libalpm/add.c:655
#, c-format
msgid "error: could not copy %s to %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:659
#, c-format
msgid "%s saved as %s.pacorig"
msgstr ""
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:660
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
+#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679
msgid "action: installing new file"
msgstr ""
-#: lib/libalpm/add.c:661
+#: lib/libalpm/add.c:677
msgid "action: leaving existing file in place"
msgstr ""
-#: lib/libalpm/add.c:667
+#: lib/libalpm/add.c:683
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
-#: lib/libalpm/add.c:671
+#: lib/libalpm/add.c:687
#, c-format
msgid "could not install %s as %s: %s"
msgstr ""
-#: lib/libalpm/add.c:672
+#: lib/libalpm/add.c:688
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr ""
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:690
#, c-format
msgid "%s installed as %s"
msgstr ""
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:691
#, c-format
msgid "warning: %s installed as %s"
msgstr ""
-#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:696 lib/libalpm/add.c:716
#, c-format
msgid "extracting %s"
msgstr ""
-#: lib/libalpm/add.c:702
+#: lib/libalpm/add.c:718
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr ""
-#: lib/libalpm/add.c:704
+#: lib/libalpm/add.c:720
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr ""
-#: lib/libalpm/add.c:705
+#: lib/libalpm/add.c:721
#, c-format
msgid "warning: extracting %s%s as %s"
msgstr ""
-#: lib/libalpm/add.c:719
+#: lib/libalpm/add.c:735
#, c-format
msgid "error: could not extract %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:729
+#: lib/libalpm/add.c:745
msgid "appending backup entry"
msgstr ""
-#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
+#: lib/libalpm/add.c:776 lib/libalpm/add.c:778
#, c-format
msgid "errors occurred while %s %s"
msgstr ""
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "upgrading"
msgstr ""
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
msgid "installing"
msgstr ""
-#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
+#: lib/libalpm/add.c:800 lib/libalpm/add.c:856
#, c-format
msgid "adding '%s' in requiredby field for '%s'"
msgstr ""
-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
+#: lib/libalpm/add.c:811 lib/libalpm/remove.c:334
msgid "updating database"
msgstr ""
-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:812
#, c-format
msgid "adding database entry '%s'"
msgstr ""
-#: lib/libalpm/add.c:798
+#: lib/libalpm/add.c:814
#, c-format
msgid "could not update database entry %s-%s"
msgstr ""
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:816
#, c-format
msgid "error updating database for %s-%s!"
msgstr ""
-#: lib/libalpm/add.c:804
+#: lib/libalpm/add.c:820
#, c-format
msgid "could not add entry '%s' in cache"
msgstr ""
-#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
+#: lib/libalpm/add.c:826 lib/libalpm/remove.c:344
msgid "updating dependency packages 'requiredby' fields"
msgstr ""
-#: lib/libalpm/add.c:832
+#: lib/libalpm/add.c:848
#, c-format
msgid "could not find dependency '%s'"
msgstr ""
-#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
+#: lib/libalpm/add.c:859 lib/libalpm/remove.c:386
#, c-format
msgid "could not update 'requiredby' database entry %s-%s"
msgstr ""
-#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:885 lib/libalpm/remove.c:399 lib/libalpm/sync.c:1045
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr ""
@@ -361,185 +361,170 @@ msgstr ""
msgid "md5sums do not match for package %s-%s"
msgstr ""
-#: lib/libalpm/alpm.c:791
+#: lib/libalpm/alpm.c:790
#, c-format
msgid "could not remove lock file %s"
msgstr ""
-#: lib/libalpm/alpm.c:792
+#: lib/libalpm/alpm.c:791
#, c-format
msgid "warning: could not remove lock file %s"
msgstr ""
-#: lib/libalpm/alpm.c:929
+#: lib/libalpm/alpm.c:926
#, c-format
msgid "config: new section '%s'"
msgstr ""
-#: lib/libalpm/alpm.c:958
+#: lib/libalpm/alpm.c:955
msgid "config: nopassiveftp"
msgstr ""
-#: lib/libalpm/alpm.c:961
+#: lib/libalpm/alpm.c:958
msgid "config: usesyslog"
msgstr ""
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:961
msgid "config: chomp"
msgstr ""
-#: lib/libalpm/alpm.c:967
+#: lib/libalpm/alpm.c:964
msgid "config: usecolor"
msgstr ""
-#: lib/libalpm/alpm.c:976
+#: lib/libalpm/alpm.c:973
#, c-format
msgid "config: including %s"
msgstr ""
-#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#: lib/libalpm/alpm.c:983 lib/libalpm/alpm.c:988
#, c-format
msgid "config: noupgrade: %s"
msgstr ""
-#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#: lib/libalpm/alpm.c:996 lib/libalpm/alpm.c:1001
#, c-format
msgid "config: noextract: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#: lib/libalpm/alpm.c:1009 lib/libalpm/alpm.c:1014
#, c-format
msgid "config: ignorepkg: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#: lib/libalpm/alpm.c:1022 lib/libalpm/alpm.c:1027
#, c-format
msgid "config: holdpkg: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1034
#, c-format
msgid "config: dbpath: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1044
+#: lib/libalpm/alpm.c:1041
#, c-format
msgid "config: cachedir: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1047
+#: lib/libalpm/alpm.c:1044
#, c-format
msgid "config: logfile: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1050
+#: lib/libalpm/alpm.c:1047
#, c-format
msgid "config: xfercommand: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1055
+#: lib/libalpm/alpm.c:1052
#, c-format
msgid "config: upgradedelay: %d"
msgstr ""
-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
msgid "checking for package replacements"
msgstr ""
-#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1100 lib/libalpm/sync.c:138
#, c-format
msgid "checking replacement '%s' for package '%s'"
msgstr ""
-#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1102 lib/libalpm/sync.c:140
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:174
#, c-format
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#: lib/libalpm/alpm.c:1157 lib/libalpm/sync.c:211
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr ""
-#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1171 lib/libalpm/sync.c:225 lib/libalpm/sync.c:501
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr ""
-#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#: lib/libalpm/alpm.c:1177 lib/libalpm/sync.c:232
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr ""
-#: lib/libalpm/be_files.c:59
+#: lib/libalpm/be_files.c:58
#, c-format
msgid "unpacking database '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:183
+#: lib/libalpm/be_files.c:182
#, c-format
msgid "invalid name for dabatase entry '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:211
+#: lib/libalpm/be_files.c:210
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:216
+#: lib/libalpm/be_files.c:215
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:224
+#: lib/libalpm/be_files.c:223
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:232
+#: lib/libalpm/be_files.c:231
#, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
-#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
-#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
-#: lib/libalpm/package.c:185
+#: lib/libalpm/be_files.c:239 lib/libalpm/be_files.c:383
+#: lib/libalpm/be_files.c:406 lib/libalpm/be_files.c:494
+#: lib/libalpm/be_files.c:580 lib/libalpm/be_files.c:607
+#: lib/libalpm/package.c:194
#, c-format
msgid "could not open file %s: %s"
msgstr ""
-#: lib/libalpm/be_files.c:492
+#: lib/libalpm/be_files.c:491
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:578
+#: lib/libalpm/be_files.c:577
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:605
+#: lib/libalpm/be_files.c:604
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -606,8 +591,8 @@ msgstr ""
#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:718
#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
#, c-format
msgid "malloc failure: could not allocate %d bytes"
@@ -754,11 +739,11 @@ msgid "insufficient privileges"
msgstr ""
#: lib/libalpm/error.c:40
-msgid "wrong or NULL argument passed"
+msgid "could not find or read file"
msgstr ""
#: lib/libalpm/error.c:42
-msgid "could not find or read file"
+msgid "wrong or NULL argument passed"
msgstr ""
#: lib/libalpm/error.c:45
@@ -801,135 +786,147 @@ msgstr ""
msgid "could not remove database entry"
msgstr ""
-#: lib/libalpm/error.c:71
-msgid "could not set parameter"
+#: lib/libalpm/error.c:67
+msgid "invalid url for server"
msgstr ""
-#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
-msgid "transaction not initialized"
+#: lib/libalpm/error.c:74
+msgid "could not set parameter"
msgstr ""
-#: lib/libalpm/error.c:76
+#: lib/libalpm/error.c:77
msgid "transaction already initialized"
msgstr ""
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:79 lib/libalpm/error.c:83
+msgid "transaction not initialized"
+msgstr ""
+
+#: lib/libalpm/error.c:81
msgid "duplicate target"
msgstr ""
-#: lib/libalpm/error.c:82
+#: lib/libalpm/error.c:85
msgid "transaction not prepared"
msgstr ""
-#: lib/libalpm/error.c:84
+#: lib/libalpm/error.c:87
msgid "transaction aborted"
msgstr ""
-#: lib/libalpm/error.c:86
+#: lib/libalpm/error.c:89
msgid "operation not compatible with the transaction type"
msgstr ""
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:984
+msgid "could not commit transaction"
+msgstr ""
+
+#: lib/libalpm/error.c:93
+msgid "could not download all files"
+msgstr ""
+
+#: lib/libalpm/error.c:96
msgid "could not find or read package"
msgstr ""
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "invalid or corrupted package"
msgstr ""
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "cannot open package file"
msgstr ""
-#: lib/libalpm/error.c:95
+#: lib/libalpm/error.c:102
msgid "cannot load package data"
msgstr ""
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "package already installed"
msgstr ""
-#: lib/libalpm/error.c:99
+#: lib/libalpm/error.c:106
msgid "package not installed or lesser version"
msgstr ""
-#: lib/libalpm/error.c:101
+#: lib/libalpm/error.c:108
+msgid "cannot remove all files for package"
+msgstr ""
+
+#: lib/libalpm/error.c:110
msgid "package name is not valid"
msgstr ""
-#: lib/libalpm/error.c:103
+#: lib/libalpm/error.c:112
msgid "corrupted package"
msgstr ""
-#: lib/libalpm/error.c:105
+#: lib/libalpm/error.c:114
msgid "no such repository"
msgstr ""
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:117
msgid "group not found"
msgstr ""
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:120
msgid "could not satisfy dependencies"
msgstr ""
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:122
msgid "conflicting dependencies"
msgstr ""
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:124
msgid "conflicting files"
msgstr ""
-#: lib/libalpm/error.c:118
-msgid "user aborted"
+#: lib/libalpm/error.c:127
+msgid "user aborted the operation"
msgstr ""
-#: lib/libalpm/error.c:120
-msgid "libarchive error"
+#: lib/libalpm/error.c:129
+msgid "internal error"
msgstr ""
-#: lib/libalpm/error.c:122
-msgid "internal error"
+#: lib/libalpm/error.c:131
+msgid "libarchive error"
msgstr ""
-#: lib/libalpm/error.c:124
-msgid "not enough space"
+#: lib/libalpm/error.c:133
+msgid "not enough space on disk"
msgstr ""
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:136
msgid "not confirmed"
msgstr ""
-#: lib/libalpm/error.c:129
-msgid "bad section name"
+#: lib/libalpm/error.c:139
+msgid "bad configuration section name"
msgstr ""
-#: lib/libalpm/error.c:131
-msgid "'local' is reserved and cannot be used as a package tree"
+#: lib/libalpm/error.c:141
+msgid "'local' is reserved and cannot be used as a repository name"
msgstr ""
-#: lib/libalpm/error.c:133
-msgid "syntax error"
+#: lib/libalpm/error.c:143
+msgid "syntax error in config file"
msgstr ""
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:145
msgid "all directives must belong to a section"
msgstr ""
-#: lib/libalpm/error.c:137
+#: lib/libalpm/error.c:147
msgid "invalid regular expression"
msgstr ""
-#: lib/libalpm/error.c:139
+#: lib/libalpm/error.c:150
msgid "connection to remote host failed"
msgstr ""
-#: lib/libalpm/error.c:141
-msgid "forking process failed"
-msgstr ""
-
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:153
msgid "unexpected error"
msgstr ""
@@ -938,40 +935,65 @@ msgstr ""
msgid "%s can't be opened\n"
msgstr ""
-#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
+#: lib/libalpm/package.c:146
+#, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr ""
+
+#: lib/libalpm/package.c:150
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:155
+#, c-format
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:160
+#, c-format
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:165
+#, c-format
+msgid "compare versions for %s: %s vs %s, result=%d"
+msgstr ""
+
+#: lib/libalpm/package.c:208 lib/libalpm/package.c:263
#, c-format
msgid "%s: syntax error in description file line %d"
msgstr ""
-#: lib/libalpm/package.c:331
+#: lib/libalpm/package.c:337
msgid "could not parse the package description file"
msgstr ""
-#: lib/libalpm/package.c:335
+#: lib/libalpm/package.c:341
#, c-format
msgid "missing package name in %s"
msgstr ""
-#: lib/libalpm/package.c:339
+#: lib/libalpm/package.c:345
#, c-format
msgid "missing package version in %s"
msgstr ""
-#: lib/libalpm/package.c:374
+#: lib/libalpm/package.c:380
#, c-format
msgid "could not remove tempfile %s"
msgstr ""
-#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#: lib/libalpm/package.c:393 lib/libalpm/package.c:400
#, c-format
msgid "error while reading package: %s"
msgstr ""
-#: lib/libalpm/package.c:400
+#: lib/libalpm/package.c:406
msgid "missing package metadata"
msgstr ""
-#: lib/libalpm/package.c:407
+#: lib/libalpm/package.c:413
#, c-format
msgid "missing package filelist in %s, generating one"
msgstr ""
@@ -1000,71 +1022,81 @@ msgstr ""
msgid "finding removable dependencies"
msgstr ""
-#: lib/libalpm/remove.c:193
+#: lib/libalpm/remove.c:186
+#, c-format
+msgid "cannot remove file '%s': %s"
+msgstr ""
+
+#: lib/libalpm/remove.c:226
#, c-format
msgid "file %s does not exist"
msgstr ""
-#: lib/libalpm/remove.c:199
+#: lib/libalpm/remove.c:232
#, c-format
msgid "keeping directory %s"
msgstr ""
-#: lib/libalpm/remove.c:201
+#: lib/libalpm/remove.c:234
#, c-format
msgid "removing directory %s"
msgstr ""
-#: lib/libalpm/remove.c:215
+#: lib/libalpm/remove.c:248
#, c-format
msgid "skipping removal of %s as it has moved to another package"
msgstr ""
-#: lib/libalpm/remove.c:227
+#: lib/libalpm/remove.c:260
#, c-format
msgid "%s saved as %s"
msgstr ""
-#: lib/libalpm/remove.c:231
+#: lib/libalpm/remove.c:264
#, c-format
msgid "unlinking %s"
msgstr ""
-#: lib/libalpm/remove.c:237
+#: lib/libalpm/remove.c:271
#, c-format
msgid "cannot remove file %s: %s"
msgstr ""
-#: lib/libalpm/remove.c:265
+#: lib/libalpm/remove.c:299
#, c-format
msgid "removing package %s-%s"
msgstr ""
-#: lib/libalpm/remove.c:276
+#: lib/libalpm/remove.c:311
+#, c-format
+msgid "not removing package '%s', can't remove all files"
+msgstr ""
+
+#: lib/libalpm/remove.c:317
msgid "removing files"
msgstr ""
-#: lib/libalpm/remove.c:294
+#: lib/libalpm/remove.c:335
#, c-format
msgid "removing database entry '%s'"
msgstr ""
-#: lib/libalpm/remove.c:296
+#: lib/libalpm/remove.c:337
#, c-format
msgid "could not remove database entry %s-%s"
msgstr ""
-#: lib/libalpm/remove.c:299
+#: lib/libalpm/remove.c:340
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr ""
-#: lib/libalpm/remove.c:333
+#: lib/libalpm/remove.c:374
#, c-format
msgid "could not find dependency '%s' for removal"
msgstr ""
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/remove.c:384
#, c-format
msgid "updating 'requiredby' field for package '%s'"
msgstr ""
@@ -1073,194 +1105,190 @@ msgstr ""
msgid "checking for package upgrades"
msgstr ""
-#: lib/libalpm/sync.c:278
+#: lib/libalpm/sync.c:277
#, c-format
msgid "searching for target in repo '%s'"
msgstr ""
-#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
+#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
#, c-format
msgid "target '%s' not found -- looking for provisions"
msgstr ""
-#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
+#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
#, c-format
msgid "found '%s' as a provision for '%s'"
msgstr ""
-#: lib/libalpm/sync.c:299
+#: lib/libalpm/sync.c:298
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: lib/libalpm/sync.c:333
+#: lib/libalpm/sync.c:332
#, c-format
msgid "%s-%s is up to date -- skipping"
msgstr ""
-#: lib/libalpm/sync.c:353
+#: lib/libalpm/sync.c:352
#, c-format
msgid "adding target '%s' to the transaction set"
msgstr ""
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:400
msgid "resolving target's dependencies"
msgstr ""
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:420
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr ""
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:455
msgid "looking for unresolvable dependencies"
msgstr ""
-#: lib/libalpm/sync.c:487
+#: lib/libalpm/sync.c:486
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr ""
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:508
#, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr ""
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:519
#, c-format
msgid "package '%s' provides its own conflict"
msgstr ""
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
#, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr ""
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
#, c-format
msgid "removing '%s' from target list"
msgstr ""
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:568
#, c-format
msgid "resolving package '%s' conflict"
msgstr ""
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:591
#, c-format
msgid "electing '%s' for removal"
msgstr ""
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
msgid "unresolvable package conflicts detected"
msgstr ""
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:670
msgid "checking dependencies of packages designated for removal"
msgstr ""
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:684
msgid "something has gone horribly wrong"
msgstr ""
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:703
#, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr ""
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:799
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:810
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:811
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:816
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:817
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:824
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:853 lib/libalpm/sync.c:865
#, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr ""
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:884
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:886
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:907
msgid "could not create removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:913
msgid "could not initialize the removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:933
msgid "removing conflicting and to-be-replaced packages"
msgstr ""
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:935
msgid "could not prepare removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:941
msgid "could not commit removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:948
msgid "installing packages"
msgstr ""
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:951
msgid "could not create transaction"
msgstr ""
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:956
msgid "could not initialize transaction"
msgstr ""
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:979
msgid "could not prepare transaction"
msgstr ""
-#: lib/libalpm/sync.c:985
-msgid "could not commit transaction"
-msgstr ""
-
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:991
msgid "updating database for replaced packages' dependencies"
msgstr ""
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1020
#, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr ""
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1029
#, c-format
msgid "could not update new database entry %s-%s"
msgstr ""
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index f230dfa7..7aaae2e6 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -155,14 +155,6 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
return(0);
}
-/* Helper function for comparing strings
- */
-static int str_cmp(const void *s1, const void *s2)
-{
- return(strcmp(s1, s2));
-}
-
-
static int can_remove_file(const char *path)
{
alpm_list_t *i;
@@ -378,7 +370,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
/* Ensure package has the appropriate data */
_alpm_db_read(db, INFRQ_DEPENDS, depinfo);
/* splice out this entry from requiredby */
- depinfo->requiredby = alpm_list_remove(depinfo->requiredby, info->name, str_cmp, &vdata);
+ depinfo->requiredby = alpm_list_remove(depinfo->requiredby, info->name, _alpm_str_cmp, &vdata);
data = vdata;
FREE(data);
_alpm_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), depinfo->name);
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 6719f476..26c3e43c 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -393,8 +393,6 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
}
if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
- trail = alpm_list_new();
-
/* Resolve targets dependencies */
EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL);
_alpm_log(PM_LOG_DEBUG, _("resolving target's dependencies"));
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 7049af67..a9e773a5 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -634,4 +634,12 @@ void _alpm_time2string(time_t t, char *buffer)
}
}
+/* Helper function for comparing strings using the
+ * alpm "compare func" signature */
+int _alpm_str_cmp(const void *s1, const void *s2)
+{
+ return(strcmp(s1, s2));
+}
+
+
/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 4de9f5d8..0eb1d3d4 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -71,6 +71,8 @@ int _alpm_check_freespace(pmtrans_t *trans, alpm_list_t **data);
#endif
#endif
void _alpm_time2string(time_t t, char *buffer);
+int _alpm_str_cmp(const void *s1, const void *s2);
+
#ifdef __sun__
char* strsep(char** str, const char* delims);
char* mkdtemp(char *template);
diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po
index 5108782d..9fdfeccb 100644
--- a/src/pacman/po/de.po
+++ b/src/pacman/po/de.po
@@ -7,7 +7,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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:17-0500\n"
"PO-Revision-Date: 2006-05-04 17:10+0200\n"
"Last-Translator: Marcus Habermehl <bmh1980@frugalware.org>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/pacman/add.c:69 src/pacman/deptest.c:69 src/pacman/remove.c:79
-#: src/pacman/sync.c:442 src/pacman/sync.c:491
+#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
+#: src/pacman/sync.c:438 src/pacman/sync.c:487
#, fuzzy, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -35,13 +35,14 @@ msgstr "Lade Paketdaten ... "
msgid "failed to add target '%s' (%s)"
msgstr "Konnte Paket '%s' nicht hinzufügen (%s)\n"
-#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:86
-#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
-#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+#: src/pacman/add.c:85 src/pacman/sync.c:194 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
msgid "done.\n"
msgstr "beendet.\n"
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr "Konnte Durchführung nicht vorbereiten (%s)\n"
@@ -51,22 +52,22 @@ msgstr "Konnte Durchführung nicht vorbereiten (%s)\n"
msgid ":: %s: requires %s"
msgstr ":: %s: Benötigt %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:605
+#: src/pacman/add.c:118 src/pacman/sync.c:601
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: Steht im Konflikt mit %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:669
+#: src/pacman/add.c:127 src/pacman/sync.c:665
#, fuzzy, c-format
msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
msgstr "%s%s existiert in \"%s\" (Paket) und \"%s\" (Paket)"
-#: src/pacman/add.c:134 src/pacman/sync.c:676
+#: src/pacman/add.c:134 src/pacman/sync.c:672
#, fuzzy, c-format
msgid "%s: %s%s exists in filesystem\n"
msgstr "%s: %s%s existiert im Dateisystem"
-#: src/pacman/add.c:141 src/pacman/sync.c:683 src/pacman/sync.c:689
+#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -74,47 +75,47 @@ msgstr ""
"\n"
"Fehler aufgetreten, kein Paket wird aktualisiert.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:612
+#: src/pacman/add.c:151 src/pacman/sync.c:608
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ""
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr ""
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:484
-#: src/pacman/sync.c:705
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
+#: src/pacman/sync.c:701
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr ""
-#: src/pacman/deptest.c:82
+#: src/pacman/deptest.c:70
msgid "memory allocation failure\n"
msgstr ""
-#: src/pacman/deptest.c:93
+#: src/pacman/deptest.c:81
#, c-format
msgid "add target %s\n"
msgstr "Paket hinzufügen %s\n"
-#: src/pacman/deptest.c:96
+#: src/pacman/deptest.c:84
#, c-format
msgid "could not add target (%s)\n"
msgstr "Konnte Paket nicht hinzufügen (%s)\n"
-#: src/pacman/deptest.c:115
+#: src/pacman/deptest.c:103
#, c-format
msgid "requires: %s"
msgstr "Erfordert: %s"
-#: src/pacman/deptest.c:139
+#: src/pacman/deptest.c:127
#, c-format
msgid "conflict: %s"
msgstr "Konflikt: %s"
-#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
+#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
#, c-format
msgid "could not release transaction (%s)"
msgstr ""
@@ -139,11 +140,11 @@ msgstr "Warnung"
msgid "function"
msgstr "Funktion"
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "Y"
msgstr "J"
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "YES"
msgstr "JA"
@@ -172,12 +173,12 @@ msgstr "Installiert als Abhängigkeit für ein anderes Paket\n"
msgid "Unknown"
msgstr "Unbekannt\n"
-#: src/pacman/package.c:68 src/pacman/package.c:118
+#: src/pacman/package.c:68 src/pacman/package.c:119
#, c-format
msgid "Name : %s\n"
msgstr ""
-#: src/pacman/package.c:69 src/pacman/package.c:119
+#: src/pacman/package.c:69 src/pacman/package.c:120
#, c-format
msgid "Version : %s\n"
msgstr ""
@@ -193,19 +194,19 @@ msgstr ""
msgid "License :"
msgstr "Lizenz :"
-#: src/pacman/package.c:72 src/pacman/package.c:120
+#: src/pacman/package.c:72 src/pacman/package.c:121
msgid "Groups :"
msgstr "Gruppen :"
-#: src/pacman/package.c:73 src/pacman/package.c:121
+#: src/pacman/package.c:73 src/pacman/package.c:122
msgid "Provides :"
msgstr "Stellt bereit :"
-#: src/pacman/package.c:74 src/pacman/package.c:122
+#: src/pacman/package.c:74 src/pacman/package.c:123
msgid "Depends On :"
msgstr "Hängt ab von :"
-#: src/pacman/package.c:75 src/pacman/package.c:123
+#: src/pacman/package.c:75 src/pacman/package.c:124
msgid "Removes :"
msgstr "Entfernt :"
@@ -213,7 +214,7 @@ msgstr "Entfernt :"
msgid "Required By :"
msgstr "Benötigt von :"
-#: src/pacman/package.c:80 src/pacman/package.c:124
+#: src/pacman/package.c:80 src/pacman/package.c:125
msgid "Conflicts With :"
msgstr "Konflikt mit :"
@@ -265,66 +266,71 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: src/pacman/package.c:93 src/pacman/package.c:129
+#: src/pacman/package.c:93 src/pacman/package.c:130
#, c-format
msgid "Description : "
msgstr "Beschreibung : "
-#: src/pacman/package.c:117
+#: src/pacman/package.c:118
#, fuzzy, c-format
msgid "Repository : %s\n"
msgstr "Paketersteller : %s\n"
-#: src/pacman/package.c:125
+#: src/pacman/package.c:126
#, fuzzy
msgid "Replaces :"
msgstr "Ersetzt :"
-#: src/pacman/package.c:126
+#: src/pacman/package.c:127
#, c-format
msgid "Download Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:127
+#: src/pacman/package.c:128
#, fuzzy, c-format
msgid "Installed Size : %6.2f K\n"
msgstr "Inst. Skript : %s\n"
-#: src/pacman/package.c:134
+#: src/pacman/package.c:135
#, fuzzy, c-format
msgid "MD5 Sum : %s"
msgstr ""
"\n"
"MD5 Summe : %s"
-#: src/pacman/package.c:137
+#: src/pacman/package.c:138
#, fuzzy, c-format
msgid "SHA1 Sum : %s"
msgstr ""
"\n"
"SHA1 Summe : %s"
-#: src/pacman/package.c:168
+#: src/pacman/package.c:149
+#, c-format
+msgid "Backup Files :\n"
+msgstr ""
+
+#: src/pacman/package.c:169
#, fuzzy, c-format
msgid "error calculating checksums for %s\n"
msgstr "Fehler beim Berechnen der MD5 oder SHA1 Summen für %s\n"
-#: src/pacman/package.c:181
+#: src/pacman/package.c:182
#, fuzzy, c-format
msgid "MODIFIED\t%s\n"
msgstr "%sMODIFIZIERT\t%s\n"
-#: src/pacman/package.c:183
+#: src/pacman/package.c:184
#, c-format
msgid "Not Modified\t%s\n"
msgstr ""
-#: src/pacman/package.c:188
+#: src/pacman/package.c:189
#, c-format
msgid "MISSING\t\t%s\n"
msgstr "FEHLEND\t\t%s\n"
-#: src/pacman/package.c:221
+#: src/pacman/package.c:222
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "Kein Changelog für '%s' verfügbar.\n"
@@ -346,28 +352,28 @@ msgstr " %s {-A --add} [Optionen] <Datei>\n"
#: src/pacman/pacman.c:91
#, c-format
-msgid " %s {-R --remove} [options] <package>\n"
-msgstr " %s {-R --remove [Optionen] <Paket>\n"
+msgid " %s {-F --freshen} [options] <file>\n"
+msgstr " %s {-F --freshen} [Optionen] <Datei>\n"
#: src/pacman/pacman.c:92
#, c-format
-msgid " %s {-U --upgrade} [options] <file>\n"
-msgstr " %s {-U --upgrade} [Optionen] <Datei>\n"
+msgid " %s {-Q --query} [options] [package]\n"
+msgstr " %s {-Q --query} [Optionen] [Paket]\n"
#: src/pacman/pacman.c:93
#, c-format
-msgid " %s {-F --freshen} [options] <file>\n"
-msgstr " %s {-F --freshen} [Optionen] <Datei>\n"
+msgid " %s {-R --remove} [options] <package>\n"
+msgstr " %s {-R --remove [Optionen] <Paket>\n"
#: src/pacman/pacman.c:94
#, c-format
-msgid " %s {-Q --query} [options] [package]\n"
-msgstr " %s {-Q --query} [Optionen] [Paket]\n"
+msgid " %s {-S --sync} [options] [package]\n"
+msgstr " %s {-S --sync} [Optionen] [Paket]\n"
#: src/pacman/pacman.c:95
#, c-format
-msgid " %s {-S --sync} [options] [package]\n"
-msgstr " %s {-S --sync} [Optionen] [Paket]\n"
+msgid " %s {-U --upgrade} [options] <file>\n"
+msgstr " %s {-U --upgrade} [Optionen] <Datei>\n"
#: src/pacman/pacman.c:96
#, c-format
@@ -391,13 +397,13 @@ msgstr "Optionen:\n"
#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
#: src/pacman/pacman.c:138
-#, c-format
-msgid " -d, --nodeps skip dependency checks\n"
+#, fuzzy, c-format
+msgid " -d, --nodeps skip dependency checks\n"
msgstr " -d, --nodeps Überspringe 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"
+#, fuzzy, c-format
+msgid " -f, --force force install, overwrite conflicting files\n"
msgstr ""
" -f, --force Installation erzwingen, Dateikonflikte überschreiben\n"
@@ -407,26 +413,27 @@ msgid "usage: %s {-R --remove} [options] <package>\n"
msgstr "Benutzung: %s {-R --remove} [Optionen] <Paket>\n"
#: src/pacman/pacman.c:106
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -c, --cascade remove packages and all packages that depend on them\n"
+" -c, --cascade remove packages and all packages that depend on them\n"
msgstr ""
" -c, --cascade Entferne 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"
+#, fuzzy, c-format
+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
-#, c-format
-msgid " -n, --nosave remove configuration files as well\n"
+#, fuzzy, c-format
+msgid " -n, --nosave remove configuration files as well\n"
msgstr " -n, --nosave Auch Konfigurationsdateien entfernen\n"
#: src/pacman/pacman.c:110
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -s, --recursive remove dependencies also (that won't break packages)\n"
+" -s, --recursive remove dependencies also (that won't break packages)\n"
msgstr ""
" -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine "
"Pakete)\n"
@@ -447,14 +454,14 @@ msgid "usage: %s {-Q --query} [options] [package]\n"
msgstr "Benutzung: %s {-Q --query} [Optionen] [Pakete]\n"
#: src/pacman/pacman.c:123
-#, c-format
-msgid " -c, --changelog view the changelog of a package\n"
+#, fuzzy, c-format
+msgid " -c, --changelog view the changelog of a package\n"
msgstr " -c, --changelog Das Changelog des Paketes anzeigen\n"
#: src/pacman/pacman.c:124
#, fuzzy, c-format
msgid ""
-" -e, --orphans list all packages installed as dependencies but no "
+" -e, --orphans list all packages installed as dependencies but no "
"longer\n"
msgstr ""
" -e, --orphans Listet alle Pakete auf, die als Abhängigkeit "
@@ -462,60 +469,60 @@ msgstr ""
#: src/pacman/pacman.c:125
#, fuzzy, c-format
-msgid " required by any package\n"
+msgid " required by any package\n"
msgstr ""
" wurden und nicht von anderen Paketen benötigt werden\n"
#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
-#, c-format
-msgid " -g, --groups view all members of a package group\n"
+#, fuzzy, c-format
+msgid " -g, --groups view all members of a package group\n"
msgstr ""
" -g, --groups Zeige alle Pakete an, die zu einer Gruppe gehören\n"
#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
-#, c-format
-msgid " -i, --info view package information\n"
+#, fuzzy, c-format
+msgid " -i, --info view package information\n"
msgstr " -i, --info Zeige Paketinformationen an\n"
#: src/pacman/pacman.c:128
-#, c-format
-msgid " -l, --list list the contents of the queried package\n"
+#, fuzzy, c-format
+msgid " -l, --list list the contents of the queried package\n"
msgstr " -l, --list Listet den Inhalt des abgefragten Paketes auf\n"
#: src/pacman/pacman.c:129
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -m, --foreign list all packages that were not found in the sync db"
+" -m, --foreign list all packages that were not found in the sync db"
"(s)\n"
msgstr ""
" -m, --foreign Listet alle Pakete auf, die nicht in den Sync db(s)\n"
" gefunden wurden\n"
#: src/pacman/pacman.c:130
-#, c-format
-msgid " -o, --owns <file> query the package that owns <file>\n"
+#, fuzzy, c-format
+msgid " -o, --owns <file> query the package that owns <file>\n"
msgstr " -o, --owns <Datei> Fragt das Paket ab, dass <Datei> enthält\n"
#: src/pacman/pacman.c:131
#, fuzzy, c-format
msgid ""
-" -p, --file query the package file [package] instead of the "
+" -p, --file query the package file [package] instead of the "
"database\n"
msgstr ""
" -p, --file pacman frag die Paketdatei [Paket] ab, anstelle in "
"der\n"
#: src/pacman/pacman.c:132
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -s, --search search locally-installed packages for matching "
+" -s, --search search locally-installed packages for matching "
"strings\n"
msgstr ""
" -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n"
#: src/pacman/pacman.c:133
#, fuzzy, c-format
-msgid " -u, --upgrades list all packages that can be upgraded\n"
+msgid " -u, --upgrades list all packages that can be upgraded\n"
msgstr " -u, --sysupgrade Alle veralteten Pakete aktualisieren\n"
#: src/pacman/pacman.c:135
@@ -524,164 +531,178 @@ msgid "usage: %s {-S --sync} [options] [package]\n"
msgstr "Benutzung: %s {-S --sync} [Optionen] [Paket]\n"
#: src/pacman/pacman.c:137
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -c, --clean remove old packages from cache directory (use -cc for "
+" -c, --clean remove old packages from cache directory (use -cc for "
"all)\n"
msgstr ""
" -c, --clean Entferne alte Pakete aus dem Cache (-cc für alle)\n"
#: src/pacman/pacman.c:139
-#, c-format
-msgid " -e, --dependsonly install dependencies only\n"
+#, fuzzy, c-format
+msgid " -e, --dependsonly install dependencies only\n"
msgstr " -e, --dependsonly Nur Abhängigkeiten installieren\n"
#: src/pacman/pacman.c:143
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -p, --print-uris print out URIs for given packages and their "
+" -p, --print-uris print out URIs for given packages and their "
"dependencies\n"
msgstr ""
" -p, --print-uris URIs der angegebenen Pakete und deren Abhängigkeiten "
"ausgeben\n"
#: src/pacman/pacman.c:144
-#, c-format
-msgid " -s, --search search remote repositories for matching strings\n"
+#, fuzzy, c-format
+msgid ""
+" -s, --search search remote repositories for matching strings\n"
msgstr ""
" -s, --search Durchsuche entferne Repositories Pakete nach einem "
"Wort\n"
#: src/pacman/pacman.c:145
-#, c-format
-msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
+#, fuzzy, c-format
+msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
msgstr " -u, --sysupgrade Alle veralteten Pakete aktualisieren\n"
#: src/pacman/pacman.c:146
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -w, --downloadonly download packages but do not install/upgrade anything\n"
+" -w, --downloadonly download packages but do not install/upgrade "
+"anything\n"
msgstr ""
" -w, --downloadonly Lade Pakete herunter, aber nichts installieren/"
"aktualisieren\n"
#: src/pacman/pacman.c:147
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -y, --refresh download fresh package databases from the server\n"
+" -y, --refresh download fresh package databases from the server\n"
msgstr " -y, --refresh Lade frische Paketdatenbank vom Server\n"
#: src/pacman/pacman.c:148
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --ignore <pkg> ignore a package upgrade (can be used more than once)\n"
+" --ignore <pkg> ignore a package upgrade (can be used more than "
+"once)\n"
msgstr ""
" --ignore <pkg> Ignoriere ein neues Paket (kann mehrfach genutzt "
"werden)\n"
#: src/pacman/pacman.c:150
-#, c-format
-msgid " --config <path> set an alternate configuration file\n"
+#, fuzzy, c-format
+msgid " --config <path> set an alternate configuration file\n"
msgstr " --config <path> Setzt eine alternative Konfigurationsdatei\n"
#: src/pacman/pacman.c:151
-#, c-format
-msgid " --noconfirm do not ask for anything confirmation\n"
+#, fuzzy, c-format
+msgid " --noconfirm do not ask for anything confirmation\n"
msgstr " --noconfirm Niemals nachfragen\n"
#: src/pacman/pacman.c:152
#, c-format
-msgid " --ask <number> pre-specify answers for questions (see manpage)\n"
+msgid ""
+" --ask <number> pre-specify answers for questions (see manpage)\n"
msgstr ""
#: src/pacman/pacman.c:153
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --noprogressbar do not show a progress bar when downloading files\n"
+" --noprogressbar do not show a progress bar when downloading files\n"
msgstr ""
" --noprogressbar Keine Fortschrittsanzeige anzeigen, wenn Dateien\n"
" herunter geladen werden\n"
#: src/pacman/pacman.c:154
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --noscriptlet do not execute the install scriptlet if there is any\n"
+" --noscriptlet do not execute the install scriptlet if there is any\n"
msgstr " --noscriptlet Installationskript nicht ausführen\n"
#: src/pacman/pacman.c:155
-#, c-format
-msgid " -v, --verbose be verbose\n"
+#, fuzzy, c-format
+msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose Sei gesprächig\n"
#: src/pacman/pacman.c:156
-#, c-format
-msgid " -r, --root <path> set an alternate installation root\n"
+#, fuzzy, c-format
+msgid " -r, --root <path> set an alternate installation root\n"
msgstr ""
" -r, --root <path> Benutze <path> als Installationsverzeichnis,\n"
" anstelle von /\n"
#: src/pacman/pacman.c:157
-#, c-format
-msgid " -b, --dbpath <path> set an alternate database location\n"
+#, fuzzy, c-format
+msgid " -b, --dbpath <path> set an alternate database location\n"
msgstr " -b, --dbpath <path> Einen anderen Ort für die Datenbank verwenden\n"
-#: src/pacman/pacman.c:170
+#: src/pacman/pacman.c:158
+#, fuzzy, c-format
+msgid " --cachedir <dir> set an alternate database location\n"
+msgstr " -b, --dbpath <path> Einen anderen Ort für die Datenbank verwenden\n"
+
+#: src/pacman/pacman.c:171
#, c-format
msgid " This program may be freely redistributed under\n"
msgstr ""
-#: src/pacman/pacman.c:171
+#: src/pacman/pacman.c:172
#, c-format
msgid " the terms of the GNU General Public License\n"
msgstr ""
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:299
#, fuzzy, c-format
-msgid "error: '%s' is not a valid debug level"
+msgid "'%s' is not a valid debug level"
msgstr "%s ist kein gültiger regulärer Ausdruck\n"
-#: src/pacman/pacman.c:334
-#, c-format
-msgid "error: '%s' is not a valid db path\n"
-msgstr ""
+#: src/pacman/pacman.c:315
+#, fuzzy, c-format
+msgid "'%s' is not a valid cache directory\n"
+msgstr "Konnte nicht auf Cacheverzeichnis zugreifen\n"
-#: src/pacman/pacman.c:364
-#, c-format
-msgid "error: '%s' is not a valid root path\n"
-msgstr ""
+#: src/pacman/pacman.c:341
+#, fuzzy, c-format
+msgid "'%s' is not a valid db path\n"
+msgstr "%s ist kein gültiger regulärer Ausdruck\n"
-#: src/pacman/pacman.c:391
+#: src/pacman/pacman.c:371
+#, fuzzy, c-format
+msgid "'%s' is not a valid root path\n"
+msgstr "%s ist kein gültiger regulärer Ausdruck\n"
+
+#: src/pacman/pacman.c:398
msgid "only one operation may be used at a time\n"
msgstr ""
-#: src/pacman/pacman.c:454
+#: src/pacman/pacman.c:461
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "Konnte alpm Bibliothek nicht initialisieren (%s)\n"
-#: src/pacman/pacman.c:487
+#: src/pacman/pacman.c:494
msgid "you cannot perform this operation unless you are root.\n"
msgstr "Sie benötigen root Rechte um diese Operation ausführen zu können\n"
-#: src/pacman/pacman.c:503
+#: src/pacman/pacman.c:510
#, fuzzy, c-format
msgid "failed to parse config (%s)\n"
msgstr "Konnte Durchführung nicht vorbereiten (%s)\n"
-#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Pakete:"
-#: src/pacman/pacman.c:519
+#: src/pacman/pacman.c:526
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:533
msgid "no targets specified (use -h for help)\n"
msgstr "Keine Pakete angegeben (benutzen Sie -h für Hilfe)\n"
-#: src/pacman/pacman.c:539
+#: src/pacman/pacman.c:546
msgid "no operation specified (use -h for help)\n"
msgstr "Keine Operation angegeben (benutzen Sie -h für Hilfe)\n"
@@ -699,39 +720,39 @@ msgstr "%s ist in %s %s enthalten\n"
msgid "No package owns %s\n"
msgstr "Kein Paket enthält %s\n"
-#: src/pacman/query.c:122 src/pacman/sync.c:413
+#: src/pacman/query.c:119 src/pacman/sync.c:409
msgid "no usable package repositories configured.\n"
msgstr "Keine brauchbaren Paketrepositories konfiguriert.\n"
-#: src/pacman/query.c:128
+#: src/pacman/query.c:125
#, fuzzy
msgid "Checking for package upgrades..."
msgstr "Prüfe Paketintegrität ... "
-#: src/pacman/query.c:135
+#: src/pacman/query.c:132
msgid "no upgrades found"
msgstr ""
-#: src/pacman/query.c:173
+#: src/pacman/query.c:170
#, c-format
msgid "group \"%s\" was not found\n"
msgstr "Gruppe \"%s\" wurde nicht gefunden\n"
-#: src/pacman/query.c:184
+#: src/pacman/query.c:181
msgid "no package file was specified for --file\n"
msgstr "Es wurde kein Paket für --file angegeben\n"
-#: src/pacman/query.c:188
+#: src/pacman/query.c:185
#, c-format
msgid "failed to load package '%s' (%s)\n"
msgstr "Konnte Paket '%s' nicht laden (%s)\n"
-#: src/pacman/query.c:226 src/pacman/query.c:263
+#: src/pacman/query.c:223 src/pacman/query.c:255
#, c-format
msgid "package \"%s\" not found\n"
msgstr "Paket \"%s\" nicht gefunden\n"
-#: src/pacman/remove.c:58 src/pacman/sync.c:528
+#: src/pacman/remove.c:58 src/pacman/sync.c:524
#, c-format
msgid ":: group %s:\n"
msgstr ":: Gruppe %s:\n"
@@ -745,7 +766,7 @@ msgstr " Entferne den gesamten Inhalt? [J/n] "
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ":: Entferne %s aus Gruppe %s? [J/n] "
-#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
+#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
#, c-format
msgid "failed to init transaction (%s)\n"
msgstr ""
@@ -811,39 +832,39 @@ msgstr "Konnte %s nicht aktualisieren (%s)\n"
msgid " %s is up to date\n"
msgstr " %s ist aktuell\n"
-#: src/pacman/sync.c:341
+#: src/pacman/sync.c:337
#, c-format
msgid "package \"%s\" was not found.\n"
msgstr "Paket \"%s\" wurde nicht gefunden.\n"
-#: src/pacman/sync.c:378
+#: src/pacman/sync.c:374
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr "Repository \"%s\" wurde nicht gefunden.\n"
-#: src/pacman/sync.c:450
+#: src/pacman/sync.c:446
msgid ":: Synchronizing package databases...\n"
msgstr ":: Synchronisiere Paketdatenbank ...\n"
-#: src/pacman/sync.c:451
+#: src/pacman/sync.c:447
msgid "synchronizing package lists"
msgstr "Synchronisiere Paketlisten"
-#: src/pacman/sync.c:453
+#: src/pacman/sync.c:449
#, fuzzy
msgid "failed to synchronize any databases"
msgstr "Konnte %s nicht synchronisieren\n"
-#: src/pacman/sync.c:459
+#: src/pacman/sync.c:455
#, fuzzy
msgid ":: Starting full system upgrade...\n"
msgstr "Starte komplette Systemaktualisierung"
-#: src/pacman/sync.c:460
+#: src/pacman/sync.c:456
msgid "starting full system upgrade"
msgstr "Starte komplette Systemaktualisierung"
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:474
msgid ""
"\n"
":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -851,56 +872,56 @@ msgstr ""
"\n"
":: pacman hat eine neuere Version des \"pacman\" Paketes gefunden.\n"
-#: src/pacman/sync.c:479
+#: src/pacman/sync.c:475
msgid ":: It is recommended that you allow pacman to upgrade itself\n"
msgstr ":: Es wird empfohlen, zuerst pacman zu aktualisieren und\n"
-#: src/pacman/sync.c:480
+#: src/pacman/sync.c:476
msgid ":: first, then you can re-run the operation with the newer version.\n"
msgstr ":: danach Ihre Eingabe mit der neueren Version zu wiederholen.\n"
-#: src/pacman/sync.c:482
+#: src/pacman/sync.c:478
msgid ":: Upgrade pacman first? [Y/n] "
msgstr ":: Zuerst pacman aktualisieren? [J/n] "
-#: src/pacman/sync.c:497
+#: src/pacman/sync.c:493
#, fuzzy, c-format
msgid "pacman: %s\n"
msgstr "Kein Paket enthält %s\n"
-#: src/pacman/sync.c:517
+#: src/pacman/sync.c:513
#, c-format
msgid "'%s': %s\n"
msgstr ""
-#: src/pacman/sync.c:532
+#: src/pacman/sync.c:528
msgid ":: Install whole content? [Y/n] "
msgstr ":: Gesamten Inhalt installieren? [J/n] "
-#: src/pacman/sync.c:539
+#: src/pacman/sync.c:535
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ":: %s aus Gruppe %s installieren? [J/n] "
-#: src/pacman/sync.c:563
+#: src/pacman/sync.c:559
#, fuzzy, c-format
msgid "'%s': not found in sync db\n"
msgstr "Konnte Paket '%s' nicht hinzufügen: Nicht in sync db gefunden\n"
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "requires"
msgstr "benötigt"
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "is required by"
msgstr "wird benötigt von"
-#: src/pacman/sync.c:625
+#: src/pacman/sync.c:621
#, fuzzy
msgid "local database is up to date\n"
msgstr " %s ist aktuell\n"
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:630
msgid ""
"\n"
"Beginning download...\n"
@@ -908,11 +929,11 @@ msgstr ""
"\n"
"Beginne download ...\n"
-#: src/pacman/sync.c:638
+#: src/pacman/sync.c:634
msgid "Proceed with download? [Y/n] "
msgstr "Download fortsetzen? [J/n] "
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:642
msgid ""
"\n"
"Beginning upgrade process...\n"
@@ -920,137 +941,128 @@ msgstr ""
"\n"
"Beginne Aktualisierungsprozess ...\n"
-#: src/pacman/sync.c:650
+#: src/pacman/sync.c:646
#, fuzzy
msgid "Proceed with installation? [Y/n] "
msgstr "Download fortsetzen? [J/n] "
-#: src/pacman/trans.c:57
-msgid "] 100% LOCAL "
-msgstr "] 100 % LOKAL "
-
-#: src/pacman/trans.c:68
+#: src/pacman/trans.c:52
msgid "checking dependencies... "
msgstr "Prüfe Abhängigkeiten ... "
-#: src/pacman/trans.c:72
+#: src/pacman/trans.c:56
msgid "checking for file conflicts... "
msgstr "Prüfe auf Dateikonflikte ... "
-#: src/pacman/trans.c:76
+#: src/pacman/trans.c:60
#, fuzzy
msgid "cleaning up... "
msgstr "Entferne %s ... "
-#: src/pacman/trans.c:79
+#: src/pacman/trans.c:63
msgid "resolving dependencies... "
msgstr "Löse Abhängigkeiten auf ... "
-#: src/pacman/trans.c:82
+#: src/pacman/trans.c:66
msgid "looking for inter-conflicts... "
msgstr ""
-#: src/pacman/trans.c:102
+#: src/pacman/trans.c:86
#, c-format
msgid "installing %s... "
msgstr "Installiere %s ... "
-#: src/pacman/trans.c:109
+#: src/pacman/trans.c:93
#, c-format
msgid "installed %s (%s)"
msgstr "Installiert %s (%s)"
-#: src/pacman/trans.c:116
+#: src/pacman/trans.c:100
#, c-format
msgid "removing %s... "
msgstr "Entferne %s ... "
-#: src/pacman/trans.c:123
+#: src/pacman/trans.c:107
#, c-format
msgid "removed %s (%s)"
msgstr "Entfernt %s (%s)"
-#: src/pacman/trans.c:130
+#: src/pacman/trans.c:114
#, c-format
msgid "upgrading %s... "
msgstr "Aktualisiere %s ... "
-#: src/pacman/trans.c:137
+#: src/pacman/trans.c:121
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr "Aktualisiert %s (%s -> %s)"
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:128
msgid "checking package integrity... "
msgstr "Prüfe Paketintegrität ... "
-#: src/pacman/trans.c:158
-#, fuzzy
-msgid " done.\n"
-msgstr "beendet.\n"
-
-#: src/pacman/trans.c:160
-msgid " failed.\n"
+#: src/pacman/trans.c:144
+msgid "failed.\n"
msgstr ""
-#: src/pacman/trans.c:167
+#: src/pacman/trans.c:151
#, fuzzy, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ""
"\n"
":: Empfange Pakete von %s ...\n"
-#: src/pacman/trans.c:190
+#: src/pacman/trans.c:171
#, 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:204
+#: src/pacman/trans.c:185
#, fuzzy, 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:217
+#: src/pacman/trans.c:198
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ":: %s mit %s/%s ersetzen? [J/n] "
-#: src/pacman/trans.c:232
+#: src/pacman/trans.c:213
#, 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:248
+#: src/pacman/trans.c:229
#, 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:266
+#: src/pacman/trans.c:247
#, 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:284
+#: src/pacman/trans.c:265
#, 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:333
+#: src/pacman/trans.c:314
msgid "installing"
msgstr "installiere"
-#: src/pacman/trans.c:336
+#: src/pacman/trans.c:317
msgid "upgrading"
msgstr "aktualisiere"
-#: src/pacman/trans.c:339
+#: src/pacman/trans.c:320
#, fuzzy
msgid "removing"
msgstr "Entferne %s ... "
-#: src/pacman/trans.c:342
+#: src/pacman/trans.c:323
#, fuzzy
msgid "checking for file conflicts"
msgstr "Prüfe auf Dateikonflikte ... "
@@ -1060,14 +1072,14 @@ msgstr "Prüfe auf Dateikonflikte ... "
msgid "None\n"
msgstr "Nichts\n"
-#: src/pacman/util.c:303
+#: src/pacman/util.c:310
#, fuzzy
msgid "Remove:"
msgstr ""
"\n"
"Entfernen: "
-#: src/pacman/util.c:311
+#: src/pacman/util.c:318
#, fuzzy, c-format
msgid ""
"\n"
@@ -1076,7 +1088,7 @@ msgstr ""
"\n"
"Gesamtgröße: %.1f MB\n"
-#: src/pacman/util.c:322
+#: src/pacman/util.c:329
#, fuzzy, c-format
msgid ""
"\n"
@@ -1085,13 +1097,20 @@ msgstr ""
"\n"
"Gesamtgröße: %.1f MB\n"
-#: src/pacman/util.c:329
+#: src/pacman/util.c:336
#, fuzzy, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr ""
"\n"
"Gesamtgröße: %.1f MB\n"
+#~ msgid "] 100% LOCAL "
+#~ msgstr "] 100 % LOKAL "
+
+#, fuzzy
+#~ msgid " done.\n"
+#~ msgstr "beendet.\n"
+
#~ msgid "done."
#~ msgstr "erledigt."
diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po
index a325a8d9..aebd7e61 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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:17-0500\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:69 src/pacman/remove.c:79
-#: src/pacman/sync.c:442 src/pacman/sync.c:491
+#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
+#: src/pacman/sync.c:438 src/pacman/sync.c:487
#, fuzzy, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -36,13 +36,14 @@ 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:194 src/pacman/trans.c:86
-#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
-#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+#: src/pacman/add.c:85 src/pacman/sync.c:194 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
msgid "done.\n"
msgstr "fait.\n"
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr "�chec de pr�paration de la transaction (%s)\n"
@@ -52,22 +53,22 @@ msgstr "�chec de pr�paration de la transaction (%s)\n"
msgid ":: %s: requires %s"
msgstr ":: %s: requiert %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:605
+#: src/pacman/add.c:118 src/pacman/sync.c:601
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: conflit avec %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:669
+#: src/pacman/add.c:127 src/pacman/sync.c:665
#, fuzzy, c-format
msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
msgstr "%s%s existe dans \"%s\" (cible) and \"%s\" (cible)"
-#: src/pacman/add.c:134 src/pacman/sync.c:676
+#: src/pacman/add.c:134 src/pacman/sync.c:672
#, fuzzy, c-format
msgid "%s: %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:683 src/pacman/sync.c:689
+#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -75,47 +76,47 @@ msgstr ""
"\n"
"des erreurs se sont produites, aucun paquet n'a �t� mis � jour.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:612
+#: src/pacman/add.c:151 src/pacman/sync.c:608
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ""
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
#, 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:484
-#: src/pacman/sync.c:705
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
+#: src/pacman/sync.c:701
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "�chec de lib�ration de la transaction (%s)\n"
-#: src/pacman/deptest.c:82
+#: src/pacman/deptest.c:70
msgid "memory allocation failure\n"
msgstr "erreur d'allocation m�moire\n"
-#: src/pacman/deptest.c:93
+#: src/pacman/deptest.c:81
#, c-format
msgid "add target %s\n"
msgstr "ajout de la cible %s\n"
-#: src/pacman/deptest.c:96
+#: 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:115
+#: src/pacman/deptest.c:103
#, c-format
msgid "requires: %s"
msgstr "requiert: %s"
-#: src/pacman/deptest.c:139
+#: src/pacman/deptest.c:127
#, c-format
msgid "conflict: %s"
msgstr "conflit: %s"
-#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
+#: 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)"
@@ -140,11 +141,11 @@ msgstr "avertissement"
msgid "function"
msgstr "fonction"
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "Y"
msgstr "O"
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "YES"
msgstr "OUI"
@@ -173,12 +174,12 @@ msgstr "Install� comme d�pendance un autre paquet\n"
msgid "Unknown"
msgstr "Inconnu\n"
-#: src/pacman/package.c:68 src/pacman/package.c:118
+#: src/pacman/package.c:68 src/pacman/package.c:119
#, c-format
msgid "Name : %s\n"
msgstr "Nom : %s\n"
-#: src/pacman/package.c:69 src/pacman/package.c:119
+#: src/pacman/package.c:69 src/pacman/package.c:120
#, c-format
msgid "Version : %s\n"
msgstr ""
@@ -192,19 +193,19 @@ msgstr "Nom : %s\n"
msgid "License :"
msgstr ""
-#: src/pacman/package.c:72 src/pacman/package.c:120
+#: src/pacman/package.c:72 src/pacman/package.c:121
msgid "Groups :"
msgstr "Groupes :"
-#: src/pacman/package.c:73 src/pacman/package.c:121
+#: src/pacman/package.c:73 src/pacman/package.c:122
msgid "Provides :"
msgstr "Fournit :"
-#: src/pacman/package.c:74 src/pacman/package.c:122
+#: src/pacman/package.c:74 src/pacman/package.c:123
msgid "Depends On :"
msgstr "Depend De :"
-#: src/pacman/package.c:75 src/pacman/package.c:123
+#: src/pacman/package.c:75 src/pacman/package.c:124
msgid "Removes :"
msgstr "Supprimer :"
@@ -212,7 +213,7 @@ msgstr "Supprimer :"
msgid "Required By :"
msgstr "Requit par :"
-#: src/pacman/package.c:80 src/pacman/package.c:124
+#: src/pacman/package.c:80 src/pacman/package.c:125
msgid "Conflicts With :"
msgstr "Conflit avec :"
@@ -264,66 +265,71 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: src/pacman/package.c:93 src/pacman/package.c:129
+#: src/pacman/package.c:93 src/pacman/package.c:130
#, c-format
msgid "Description : "
msgstr ""
-#: src/pacman/package.c:117
+#: src/pacman/package.c:118
#, fuzzy, c-format
msgid "Repository : %s\n"
msgstr "D�pot : %s\n"
-#: src/pacman/package.c:125
+#: src/pacman/package.c:126
#, fuzzy
msgid "Replaces :"
msgstr "Remplace :"
-#: src/pacman/package.c:126
+#: src/pacman/package.c:127
#, c-format
msgid "Download Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:127
+#: src/pacman/package.c:128
#, fuzzy, c-format
msgid "Installed Size : %6.2f K\n"
msgstr "Script d'installation : %s\n"
-#: src/pacman/package.c:134
+#: src/pacman/package.c:135
#, fuzzy, c-format
msgid "MD5 Sum : %s"
msgstr ""
"\n"
"somme MD5 : %s"
-#: src/pacman/package.c:137
+#: src/pacman/package.c:138
#, fuzzy, c-format
msgid "SHA1 Sum : %s"
msgstr ""
"\n"
"Somme SHA1 : %s"
-#: src/pacman/package.c:168
+#: src/pacman/package.c:149
+#, c-format
+msgid "Backup Files :\n"
+msgstr ""
+
+#: src/pacman/package.c:169
#, fuzzy, c-format
msgid "error calculating checksums for %s\n"
msgstr "erreur lors du calcul des sommes md5 ou sha1 pour %s\n"
-#: src/pacman/package.c:181
+#: src/pacman/package.c:182
#, fuzzy, c-format
msgid "MODIFIED\t%s\n"
msgstr "%sMODIFIE\t%s\n"
-#: src/pacman/package.c:183
+#: src/pacman/package.c:184
#, c-format
msgid "Not Modified\t%s\n"
msgstr ""
-#: src/pacman/package.c:188
+#: src/pacman/package.c:189
#, c-format
msgid "MISSING\t\t%s\n"
msgstr "MANQUANT\t\t%s\n"
-#: src/pacman/package.c:221
+#: src/pacman/package.c:222
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "Aucun changelog disponible pour '%s'.\n"
@@ -345,27 +351,27 @@ msgstr ""
#: src/pacman/pacman.c:91
#, c-format
-msgid " %s {-R --remove} [options] <package>\n"
+msgid " %s {-F --freshen} [options] <file>\n"
msgstr ""
#: src/pacman/pacman.c:92
#, c-format
-msgid " %s {-U --upgrade} [options] <file>\n"
+msgid " %s {-Q --query} [options] [package]\n"
msgstr ""
#: src/pacman/pacman.c:93
#, c-format
-msgid " %s {-F --freshen} [options] <file>\n"
+msgid " %s {-R --remove} [options] <package>\n"
msgstr ""
#: src/pacman/pacman.c:94
#, c-format
-msgid " %s {-Q --query} [options] [package]\n"
+msgid " %s {-S --sync} [options] [package]\n"
msgstr ""
#: src/pacman/pacman.c:95
#, c-format
-msgid " %s {-S --sync} [options] [package]\n"
+msgid " %s {-U --upgrade} [options] <file>\n"
msgstr ""
#: src/pacman/pacman.c:96
@@ -390,13 +396,13 @@ msgstr ""
#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
#: src/pacman/pacman.c:138
-#, c-format
-msgid " -d, --nodeps skip dependency checks\n"
+#, fuzzy, c-format
+msgid " -d, --nodeps skip dependency checks\n"
msgstr " -d, --nodeps ignore le contr�le des d�pendances\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"
+#, fuzzy, c-format
+msgid " -f, --force force install, overwrite conflicting files\n"
msgstr ""
" -f, --force force l'installation, malgr� les �ventuels fichiers en "
"conflit\n"
@@ -407,28 +413,29 @@ msgid "usage: %s {-R --remove} [options] <package>\n"
msgstr ""
#: src/pacman/pacman.c:106
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -c, --cascade remove packages and all packages that depend on them\n"
+" -c, --cascade remove packages and all packages that depend on them\n"
msgstr ""
" -c, --cascade supprime les paquets et tout ceux qui en d�pendent\n"
#: src/pacman/pacman.c:108
-#, c-format
-msgid " -k, --dbonly only remove database entry, do not remove files\n"
+#, fuzzy, c-format
+msgid ""
+" -k, --dbonly only remove database entry, do not remove files\n"
msgstr ""
" -k, --dbonly supprime uniquement les entr�es dans la base de "
"donn�es, pas les fichiers\n"
#: src/pacman/pacman.c:109
-#, c-format
-msgid " -n, --nosave remove configuration files as well\n"
+#, fuzzy, c-format
+msgid " -n, --nosave remove configuration files as well\n"
msgstr " -n, --nosave efface �galement les fichiers de config\n"
#: src/pacman/pacman.c:110
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -s, --recursive remove dependencies also (that won't break packages)\n"
+" -s, --recursive remove dependencies also (that won't break packages)\n"
msgstr ""
" -s, --recursive supprime les d�pendances �galement (cela ne cassera "
"pas les d�pendances d'autres paquets)\n"
@@ -449,14 +456,14 @@ msgid "usage: %s {-Q --query} [options] [package]\n"
msgstr ""
#: src/pacman/pacman.c:123
-#, c-format
-msgid " -c, --changelog view the changelog of a package\n"
+#, fuzzy, c-format
+msgid " -c, --changelog view the changelog of a package\n"
msgstr " -c, --changelog afficher le changelog du paquet\n"
#: src/pacman/pacman.c:124
#, fuzzy, c-format
msgid ""
-" -e, --orphans list all packages installed as dependencies but no "
+" -e, --orphans list all packages installed as dependencies but no "
"longer\n"
msgstr ""
" -e, --orphans lister tous les paquets qui ont �t� install�s comme "
@@ -464,37 +471,37 @@ msgstr ""
#: src/pacman/pacman.c:125
#, fuzzy, c-format
-msgid " required by any package\n"
+msgid " required by any package\n"
msgstr " et ne sont plus requis par aucun autre paquet\n"
#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
-#, c-format
-msgid " -g, --groups view all members of a package group\n"
+#, fuzzy, c-format
+msgid " -g, --groups view all members of a package group\n"
msgstr ""
" -g, --groups afficher tous les �l�ments d'un group de paquet\n"
#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
-#, c-format
-msgid " -i, --info view package information\n"
+#, fuzzy, c-format
+msgid " -i, --info view package information\n"
msgstr " -i, --info afficher les informations du paquet\n"
#: src/pacman/pacman.c:128
-#, c-format
-msgid " -l, --list list the contents of the queried package\n"
+#, fuzzy, c-format
+msgid " -l, --list list the contents of the queried package\n"
msgstr " -l, --list lister le contenu du paquet interrog�\n"
#: src/pacman/pacman.c:129
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -m, --foreign list all packages that were not found in the sync db"
+" -m, --foreign list all packages that were not found in the sync db"
"(s)\n"
msgstr ""
" -m, --foreign liste les paquets non trouv�s dans la/les base(s) de "
"donn�es de synchronisation\n"
#: src/pacman/pacman.c:130
-#, c-format
-msgid " -o, --owns <file> query the package that owns <file>\n"
+#, fuzzy, c-format
+msgid " -o, --owns <file> query the package that owns <file>\n"
msgstr ""
" -o, --owns <fichier> recherche les paquets contenant le fichier "
"<fiichier>\n"
@@ -502,15 +509,15 @@ msgstr ""
#: src/pacman/pacman.c:131
#, fuzzy, c-format
msgid ""
-" -p, --file query the package file [package] instead of the "
+" -p, --file query the package file [package] instead of the "
"database\n"
msgstr ""
" -p, --file pacman va interroger le fichier [paquet] au lieu de\n"
#: src/pacman/pacman.c:132
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -s, --search search locally-installed packages for matching "
+" -s, --search search locally-installed packages for matching "
"strings\n"
msgstr ""
" -s, --search recherche dans les paquets install�s localement ceux "
@@ -518,7 +525,7 @@ msgstr ""
#: src/pacman/pacman.c:133
#, fuzzy, c-format
-msgid " -u, --upgrades list all packages that can be upgraded\n"
+msgid " -u, --upgrades list all packages that can be upgraded\n"
msgstr " -u, --sysupgrade met � jour tous les paquets obsol�tes\n"
#: src/pacman/pacman.c:135
@@ -527,167 +534,183 @@ msgid "usage: %s {-S --sync} [options] [package]\n"
msgstr ""
#: src/pacman/pacman.c:137
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -c, --clean remove old packages from cache directory (use -cc for "
+" -c, --clean remove old packages from cache directory (use -cc for "
"all)\n"
msgstr ""
" -c, --clean remove old packages from cache directory (use -cc for "
"all)\n"
#: src/pacman/pacman.c:139
-#, c-format
-msgid " -e, --dependsonly install dependencies only\n"
+#, fuzzy, c-format
+msgid " -e, --dependsonly install dependencies only\n"
msgstr " -e, --dependsonly installe les d�pendances uniquement\n"
#: src/pacman/pacman.c:143
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -p, --print-uris print out URIs for given packages and their "
+" -p, --print-uris print out URIs for given packages and their "
"dependencies\n"
msgstr ""
" -p, --print-uris affiche les URIs pour des paquets donn�s et leurs "
"d�pendances\n"
#: src/pacman/pacman.c:144
-#, c-format
-msgid " -s, --search search remote repositories for matching strings\n"
+#, fuzzy, c-format
+msgid ""
+" -s, --search search remote repositories for matching strings\n"
msgstr " -s, --search recherche la cha�ne dans les d�pots distants\n"
#: src/pacman/pacman.c:145
-#, c-format
-msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
+#, fuzzy, c-format
+msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
msgstr " -u, --sysupgrade met � jour tous les paquets obsol�tes\n"
#: src/pacman/pacman.c:146
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -w, --downloadonly download packages but do not install/upgrade anything\n"
+" -w, --downloadonly download packages but do not install/upgrade "
+"anything\n"
msgstr ""
" -w, --downloadonly t�l�charge les paquets mais n'installe rien et ne met "
"rien � jour\n"
#: src/pacman/pacman.c:147
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -y, --refresh download fresh package databases from the server\n"
+" -y, --refresh download fresh package databases from the server\n"
msgstr ""
" -y, --refresh t�l�charge les derni�res bases de donn�es depuis les "
"serveurs\n"
#: src/pacman/pacman.c:148
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --ignore <pkg> ignore a package upgrade (can be used more than once)\n"
+" --ignore <pkg> ignore a package upgrade (can be used more than "
+"once)\n"
msgstr ""
" --ignore <pkg> ignore la mise � jour d'un paquet (peut �tre utilis� "
"plus d'une fois)\n"
#: src/pacman/pacman.c:150
-#, c-format
-msgid " --config <path> set an alternate configuration file\n"
+#, fuzzy, c-format
+msgid " --config <path> set an alternate configuration file\n"
msgstr " --config <path> d�fini un fichier de configuration alternatif\n"
#: src/pacman/pacman.c:151
-#, c-format
-msgid " --noconfirm do not ask for anything confirmation\n"
+#, fuzzy, c-format
+msgid " --noconfirm do not ask for anything confirmation\n"
msgstr " --noconfirm ne demande aucune confirmation\n"
#: src/pacman/pacman.c:152
#, c-format
-msgid " --ask <number> pre-specify answers for questions (see manpage)\n"
+msgid ""
+" --ask <number> pre-specify answers for questions (see manpage)\n"
msgstr ""
#: src/pacman/pacman.c:153
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --noprogressbar do not show a progress bar when downloading files\n"
+" --noprogressbar do not show a progress bar when downloading files\n"
msgstr ""
" --noprogressbar n'affiche pas la barre de progression pendant le "
"t�l�chargement\n"
#: src/pacman/pacman.c:154
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --noscriptlet do not execute the install scriptlet if there is any\n"
+" --noscriptlet do not execute the install scriptlet if there is any\n"
msgstr ""
" --noscriptlet n'ex�cute pas les scripts d'installation s'il y'en a\n"
#: src/pacman/pacman.c:155
-#, c-format
-msgid " -v, --verbose be verbose\n"
+#, fuzzy, c-format
+msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose mode verbeux (affichage prolixe)\n"
#: src/pacman/pacman.c:156
-#, c-format
-msgid " -r, --root <path> set an alternate installation root\n"
+#, fuzzy, c-format
+msgid " -r, --root <path> set an alternate installation root\n"
msgstr " -r, --root <path> d�fini un r�pertoire d'installation alternatif\n"
#: src/pacman/pacman.c:157
-#, c-format
-msgid " -b, --dbpath <path> set an alternate database location\n"
+#, fuzzy, c-format
+msgid " -b, --dbpath <path> set an alternate database location\n"
+msgstr ""
+" -b, --dbpath <path> d�fini un emplacement alternatif pour les bases de "
+"donn�es\n"
+
+#: src/pacman/pacman.c:158
+#, fuzzy, c-format
+msgid " --cachedir <dir> set an alternate database location\n"
msgstr ""
" -b, --dbpath <path> d�fini un emplacement alternatif pour les bases de "
"donn�es\n"
-#: src/pacman/pacman.c:170
+#: src/pacman/pacman.c:171
#, c-format
msgid " This program may be freely redistributed under\n"
msgstr ""
" Ce programme peut �tre librement redistribu� sous\n"
-#: src/pacman/pacman.c:171
+#: src/pacman/pacman.c:172
#, c-format
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:299
#, fuzzy, c-format
-msgid "error: '%s' is not a valid debug level"
+msgid "'%s' is not a valid debug level"
msgstr "%s nest pas une expression r�guli�re valide.\n"
-#: src/pacman/pacman.c:334
-#, c-format
-msgid "error: '%s' is not a valid db path\n"
-msgstr ""
+#: src/pacman/pacman.c:315
+#, 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:364
-#, c-format
-msgid "error: '%s' is not a valid root path\n"
-msgstr ""
+#: src/pacman/pacman.c:341
+#, 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:371
+#, 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:391
+#: src/pacman/pacman.c:398
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:454
+#: src/pacman/pacman.c:461
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "�chec d'initialisation de la librairie alpm (%s)\n"
-#: src/pacman/pacman.c:487
+#: src/pacman/pacman.c:494
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:503
+#: src/pacman/pacman.c:510
#, fuzzy, c-format
msgid "failed to parse config (%s)\n"
msgstr "�chec de pr�paration de la transaction (%s)\n"
-#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Cibles:"
-#: src/pacman/pacman.c:519
+#: src/pacman/pacman.c:526
#, 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:526
+#: src/pacman/pacman.c:533
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:539
+#: src/pacman/pacman.c:546
msgid "no operation specified (use -h for help)\n"
msgstr "aucune op�ration sp�cifi�e (utiliser -h pour de l'aide)\n"
@@ -705,39 +728,39 @@ msgstr "%s appartient � %s %s\n"
msgid "No package owns %s\n"
msgstr "Aucun paquet ne contient %s\n"
-#: src/pacman/query.c:122 src/pacman/sync.c:413
+#: src/pacman/query.c:119 src/pacman/sync.c:409
msgid "no usable package repositories configured.\n"
msgstr "aucun d�pot de paquet utilisable n'est d�finit.\n"
-#: src/pacman/query.c:128
+#: src/pacman/query.c:125
#, fuzzy
msgid "Checking for package upgrades..."
msgstr "verification de l'int�grit� des paquets"
-#: src/pacman/query.c:135
+#: src/pacman/query.c:132
msgid "no upgrades found"
msgstr ""
-#: src/pacman/query.c:173
+#: src/pacman/query.c:170
#, c-format
msgid "group \"%s\" was not found\n"
msgstr "le groupe \"%s\" n'a pas �t� trouv�\n"
-#: src/pacman/query.c:184
+#: src/pacman/query.c:181
msgid "no package file was specified for --file\n"
msgstr "aucun fichier du paquet sp�cifi� pour --file\n"
-#: src/pacman/query.c:188
+#: src/pacman/query.c:185
#, c-format
msgid "failed to load package '%s' (%s)\n"
msgstr "�chec de chargement du paquet '%s' (%s)\n"
-#: src/pacman/query.c:226 src/pacman/query.c:263
+#: src/pacman/query.c:223 src/pacman/query.c:255
#, c-format
msgid "package \"%s\" not found\n"
msgstr "paquet \"%s\" non trouv�\n"
-#: src/pacman/remove.c:58 src/pacman/sync.c:528
+#: src/pacman/remove.c:58 src/pacman/sync.c:524
#, c-format
msgid ":: group %s:\n"
msgstr ":: groupe %s:\n"
@@ -751,7 +774,7 @@ msgstr " Effacer tout le contenu? [O/n] "
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ":: Retirer %s du groupe %s? [O/n] "
-#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
+#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
#, c-format
msgid "failed to init transaction (%s)\n"
msgstr "�chec d'initialisation de la transaction (%s)\n"
@@ -817,39 +840,39 @@ msgstr "echec de mise � jour %s (%s)\n"
msgid " %s is up to date\n"
msgstr " %s est � jour\n"
-#: src/pacman/sync.c:341
+#: src/pacman/sync.c:337
#, c-format
msgid "package \"%s\" was not found.\n"
msgstr "paquet \"%s\" non trouv�.\n"
-#: src/pacman/sync.c:378
+#: src/pacman/sync.c:374
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr "le d�pot \"%s\" n'a pas �t� trouv�.\n"
-#: src/pacman/sync.c:450
+#: src/pacman/sync.c:446
msgid ":: Synchronizing package databases...\n"
msgstr ":: Synchronisation des bases de donn�es de paquets...\n"
-#: src/pacman/sync.c:451
+#: src/pacman/sync.c:447
msgid "synchronizing package lists"
msgstr "synchronisation de la liste des paquets"
-#: src/pacman/sync.c:453
+#: src/pacman/sync.c:449
#, fuzzy
msgid "failed to synchronize any databases"
msgstr "echec lors de la synchronisation %s\n"
-#: src/pacman/sync.c:459
+#: src/pacman/sync.c:455
#, fuzzy
msgid ":: Starting full system upgrade...\n"
msgstr "demarrage de la mise � jour pour le syst�me complet"
-#: src/pacman/sync.c:460
+#: src/pacman/sync.c:456
msgid "starting full system upgrade"
msgstr "demarrage de la mise � jour pour le syst�me complet"
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:474
msgid ""
"\n"
":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -857,59 +880,59 @@ msgstr ""
"\n"
":: pacman a d�tect� une version plus r�cente du paquet \"pacman\".\n"
-#: src/pacman/sync.c:479
+#: src/pacman/sync.c:475
msgid ":: It is recommended that you allow pacman to upgrade itself\n"
msgstr ":: Il est recommand� de laisser pacman se mettre � jour\n"
-#: src/pacman/sync.c:480
+#: src/pacman/sync.c:476
msgid ":: first, then you can re-run the operation with the newer version.\n"
msgstr ""
":: d'abord, vous devriez re-lancer l'op�ration avec la nouvelle version.\n"
-#: src/pacman/sync.c:482
+#: src/pacman/sync.c:478
msgid ":: Upgrade pacman first? [Y/n] "
msgstr ":: Mettre � jour pacman pr�alablement? [O/n] "
-#: src/pacman/sync.c:497
+#: src/pacman/sync.c:493
#, fuzzy, c-format
msgid "pacman: %s\n"
msgstr "Aucun paquet ne contient %s\n"
-#: src/pacman/sync.c:517
+#: src/pacman/sync.c:513
#, c-format
msgid "'%s': %s\n"
msgstr ""
-#: src/pacman/sync.c:532
+#: src/pacman/sync.c:528
msgid ":: Install whole content? [Y/n] "
msgstr ":: Installer tout le contenu? [O/n] "
-#: src/pacman/sync.c:539
+#: src/pacman/sync.c:535
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ":: Installer %s du groupe %s? [O/n] "
-#: src/pacman/sync.c:563
+#: src/pacman/sync.c:559
#, fuzzy, c-format
msgid "'%s': not found in sync db\n"
msgstr ""
"n'a pas pu ajouter la cible '%s': non trouv� dans la base de donn�es de "
"synchronisation\n"
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "requires"
msgstr "requiert"
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "is required by"
msgstr "est requit par"
-#: src/pacman/sync.c:625
+#: src/pacman/sync.c:621
#, fuzzy
msgid "local database is up to date\n"
msgstr " %s est � jour\n"
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:630
msgid ""
"\n"
"Beginning download...\n"
@@ -917,11 +940,11 @@ msgstr ""
"\n"
"D�but du t�l�chargement...\n"
-#: src/pacman/sync.c:638
+#: src/pacman/sync.c:634
msgid "Proceed with download? [Y/n] "
msgstr "Proc�der au t�l�chargement? [O/n] "
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:642
msgid ""
"\n"
"Beginning upgrade process...\n"
@@ -929,140 +952,131 @@ msgstr ""
"\n"
"D�but du processus de mise � jour...\n"
-#: src/pacman/sync.c:650
+#: src/pacman/sync.c:646
#, fuzzy
msgid "Proceed with installation? [Y/n] "
msgstr "Proc�der au t�l�chargement? [O/n] "
-#: src/pacman/trans.c:57
-msgid "] 100% LOCAL "
-msgstr ""
-
-#: src/pacman/trans.c:68
+#: src/pacman/trans.c:52
msgid "checking dependencies... "
msgstr "v�rification des d�pendances..."
-#: src/pacman/trans.c:72
+#: src/pacman/trans.c:56
msgid "checking for file conflicts... "
msgstr "v�rification des conflits de fichiers..."
-#: src/pacman/trans.c:76
+#: src/pacman/trans.c:60
#, fuzzy
msgid "cleaning up... "
msgstr "d�sinstallation de %s... "
-#: src/pacman/trans.c:79
+#: src/pacman/trans.c:63
msgid "resolving dependencies... "
msgstr "r�solution des d�pendances..."
-#: src/pacman/trans.c:82
+#: src/pacman/trans.c:66
msgid "looking for inter-conflicts... "
msgstr "recherche inter-conflits... "
-#: src/pacman/trans.c:102
+#: src/pacman/trans.c:86
#, c-format
msgid "installing %s... "
msgstr "installation de %s ..."
-#: src/pacman/trans.c:109
+#: src/pacman/trans.c:93
#, c-format
msgid "installed %s (%s)"
msgstr "%s install� (%s)"
-#: src/pacman/trans.c:116
+#: src/pacman/trans.c:100
#, c-format
msgid "removing %s... "
msgstr "d�sinstallation de %s... "
-#: src/pacman/trans.c:123
+#: src/pacman/trans.c:107
#, c-format
msgid "removed %s (%s)"
msgstr "%s d�sinstall� (%s)"
-#: src/pacman/trans.c:130
+#: src/pacman/trans.c:114
#, c-format
msgid "upgrading %s... "
msgstr "mise � jour de %s... "
-#: src/pacman/trans.c:137
+#: src/pacman/trans.c:121
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr "%s mit � jour (%s -> %s)"
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:128
msgid "checking package integrity... "
msgstr "verification de l'int�grit� des paquets"
-#: src/pacman/trans.c:158
-#, fuzzy
-msgid " done.\n"
-msgstr "fait.\n"
-
-#: src/pacman/trans.c:160
-msgid " failed.\n"
+#: src/pacman/trans.c:144
+msgid "failed.\n"
msgstr ""
-#: src/pacman/trans.c:167
+#: src/pacman/trans.c:151
#, fuzzy, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ""
"\n"
":: R�cup�ration des paquets depuis %s...\n"
-#: src/pacman/trans.c:190
+#: src/pacman/trans.c:171
#, 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:204
+#: src/pacman/trans.c:185
#, 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:217
+#: src/pacman/trans.c:198
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ":: Remplacer %s avec %s/%s? [O/n] "
-#: src/pacman/trans.c:232
+#: src/pacman/trans.c:213
#, 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:248
+#: src/pacman/trans.c:229
#, 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:266
+#: src/pacman/trans.c:247
#, 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:284
+#: src/pacman/trans.c:265
#, 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:333
+#: src/pacman/trans.c:314
msgid "installing"
msgstr "Installation"
-#: src/pacman/trans.c:336
+#: src/pacman/trans.c:317
msgid "upgrading"
msgstr "Mise � jour"
-#: src/pacman/trans.c:339
+#: src/pacman/trans.c:320
#, fuzzy
msgid "removing"
msgstr "d�sinstallation de %s... "
-#: src/pacman/trans.c:342
+#: src/pacman/trans.c:323
#, fuzzy
msgid "checking for file conflicts"
msgstr "v�rification des conflits de fichiers..."
@@ -1072,14 +1086,14 @@ msgstr "v�rification des conflits de fichiers..."
msgid "None\n"
msgstr "Aucun\n"
-#: src/pacman/util.c:303
+#: src/pacman/util.c:310
#, fuzzy
msgid "Remove:"
msgstr ""
"\n"
"Retire: "
-#: src/pacman/util.c:311
+#: src/pacman/util.c:318
#, fuzzy, c-format
msgid ""
"\n"
@@ -1088,7 +1102,7 @@ msgstr ""
"\n"
"Taille Totale du Paquet: %.1f MB\n"
-#: src/pacman/util.c:322
+#: src/pacman/util.c:329
#, fuzzy, c-format
msgid ""
"\n"
@@ -1097,13 +1111,17 @@ msgstr ""
"\n"
"Taille Totale du Paquet: %.1f MB\n"
-#: src/pacman/util.c:329
+#: src/pacman/util.c:336
#, fuzzy, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr ""
"\n"
"Taille Totale du Paquet: %.1f MB\n"
+#, fuzzy
+#~ msgid " done.\n"
+#~ msgstr "fait.\n"
+
#~ msgid "done."
#~ msgstr "fait."
diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po
index 57429527..9269c89a 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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:17-0500\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:69 src/pacman/remove.c:79
-#: src/pacman/sync.c:442 src/pacman/sync.c:491
+#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
+#: src/pacman/sync.c:438 src/pacman/sync.c:487
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -35,13 +35,14 @@ 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:194 src/pacman/trans.c:86
-#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
-#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+#: src/pacman/add.c:85 src/pacman/sync.c:194 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
msgid "done.\n"
msgstr "k�sz.\n"
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr "nem siker�lt el�k�sz�teni a tranzakci�t (%s)\n"
@@ -51,22 +52,22 @@ msgstr "nem siker�lt el�k�sz�teni a tranzakci�t (%s)\n"
msgid ":: %s: requires %s"
msgstr ":: %s: ig�nyli a k�vetkez�t: %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:605
+#: src/pacman/add.c:118 src/pacman/sync.c:601
#, 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:669
+#: src/pacman/add.c:127 src/pacman/sync.c:665
#, fuzzy, c-format
msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
msgstr "%s%s: l�tezik ebben: \"%s\" (c�l) �s ebben: \"%s\" (c�l)"
-#: src/pacman/add.c:134 src/pacman/sync.c:676
+#: src/pacman/add.c:134 src/pacman/sync.c:672
#, fuzzy, c-format
msgid "%s: %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:683 src/pacman/sync.c:689
+#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -74,47 +75,47 @@ msgstr ""
"\n"
"hib�k l�ptek fel, nem friss�lt csomag.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:612
+#: src/pacman/add.c:151 src/pacman/sync.c:608
#, 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:662
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
#, 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:484
-#: src/pacman/sync.c:705
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
+#: src/pacman/sync.c:701
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "nem siker�lt lez�rni a tranzakci�t (%s)\n"
-#: src/pacman/deptest.c:82
+#: src/pacman/deptest.c:70
msgid "memory allocation failure\n"
msgstr "mem�ria allok�l�si hiba\n"
-#: src/pacman/deptest.c:93
+#: src/pacman/deptest.c:81
#, c-format
msgid "add target %s\n"
msgstr "c�l hozz�ad�sa: %s\n"
-#: src/pacman/deptest.c:96
+#: 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:115
+#: src/pacman/deptest.c:103
#, c-format
msgid "requires: %s"
msgstr "ig�nyli a k�vetkez�t: %s"
-#: src/pacman/deptest.c:139
+#: src/pacman/deptest.c:127
#, c-format
msgid "conflict: %s"
msgstr "�tk�zik a k�vetkez�vel: %s"
-#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
+#: 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)"
@@ -139,11 +140,11 @@ msgstr "figyelmeztet�s"
msgid "function"
msgstr "f�ggv�ny"
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "Y"
msgstr "I"
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "YES"
msgstr "IGEN"
@@ -169,12 +170,12 @@ msgstr "F�gg�s�gk�nt lett telep�tve egy m�sik csomag miatt\n"
msgid "Unknown"
msgstr "Ismeretlen"
-#: src/pacman/package.c:68 src/pacman/package.c:118
+#: src/pacman/package.c:68 src/pacman/package.c:119
#, c-format
msgid "Name : %s\n"
msgstr "N�v : %s\n"
-#: src/pacman/package.c:69 src/pacman/package.c:119
+#: src/pacman/package.c:69 src/pacman/package.c:120
#, c-format
msgid "Version : %s\n"
msgstr "Verzi� : %s\n"
@@ -188,19 +189,19 @@ msgstr "N�v : %s\n"
msgid "License :"
msgstr "Licenc :"
-#: src/pacman/package.c:72 src/pacman/package.c:120
+#: src/pacman/package.c:72 src/pacman/package.c:121
msgid "Groups :"
msgstr "Csoportok :"
-#: src/pacman/package.c:73 src/pacman/package.c:121
+#: src/pacman/package.c:73 src/pacman/package.c:122
msgid "Provides :"
msgstr "Szolg�ltatja :"
-#: src/pacman/package.c:74 src/pacman/package.c:122
+#: src/pacman/package.c:74 src/pacman/package.c:123
msgid "Depends On :"
msgstr "F�gg :"
-#: src/pacman/package.c:75 src/pacman/package.c:123
+#: src/pacman/package.c:75 src/pacman/package.c:124
msgid "Removes :"
msgstr "Elt�vol�tja :"
@@ -208,7 +209,7 @@ msgstr "Elt�vol�tja :"
msgid "Required By :"
msgstr "Ig�nyli :"
-#: src/pacman/package.c:80 src/pacman/package.c:124
+#: src/pacman/package.c:80 src/pacman/package.c:125
msgid "Conflicts With :"
msgstr "�tk�zik :"
@@ -260,66 +261,71 @@ msgstr "Igen"
msgid "No"
msgstr "Nem"
-#: src/pacman/package.c:93 src/pacman/package.c:129
+#: src/pacman/package.c:93 src/pacman/package.c:130
#, c-format
msgid "Description : "
msgstr "Le�r�s : "
-#: src/pacman/package.c:117
+#: src/pacman/package.c:118
#, fuzzy, c-format
msgid "Repository : %s\n"
msgstr "Rep� : %s\n"
-#: src/pacman/package.c:125
+#: src/pacman/package.c:126
#, fuzzy
msgid "Replaces :"
msgstr "Lecser�li :"
-#: src/pacman/package.c:126
+#: src/pacman/package.c:127
#, c-format
msgid "Download Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:127
+#: src/pacman/package.c:128
#, fuzzy, c-format
msgid "Installed Size : %6.2f K\n"
msgstr "Telep�t� szkript:%s\n"
-#: src/pacman/package.c:134
+#: src/pacman/package.c:135
#, fuzzy, c-format
msgid "MD5 Sum : %s"
msgstr ""
"\n"
"MD5 Sum : %s"
-#: src/pacman/package.c:137
+#: src/pacman/package.c:138
#, fuzzy, c-format
msgid "SHA1 Sum : %s"
msgstr ""
"\n"
"SHA1 Sum : %s"
-#: src/pacman/package.c:168
+#: src/pacman/package.c:149
+#, c-format
+msgid "Backup Files :\n"
+msgstr ""
+
+#: src/pacman/package.c:169
#, fuzzy, c-format
msgid "error calculating checksums for %s\n"
msgstr "hiba a %s md5 vagy sha1 ellen�rz� �sszeg�nek sz�m�t�sa k�zben\n"
-#: src/pacman/package.c:181
+#: src/pacman/package.c:182
#, fuzzy, c-format
msgid "MODIFIED\t%s\n"
msgstr "%sM�DOS�TVA\t%s\n"
-#: src/pacman/package.c:183
+#: src/pacman/package.c:184
#, c-format
msgid "Not Modified\t%s\n"
msgstr ""
-#: src/pacman/package.c:188
+#: src/pacman/package.c:189
#, c-format
msgid "MISSING\t\t%s\n"
msgstr "HI�NYZIK\t\t%s\n"
-#: src/pacman/package.c:221
+#: src/pacman/package.c:222
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "Nem �ll rendelkez�sre v�ltoz�si napl� a '%s' csomaghoz.\n"
@@ -341,28 +347,28 @@ msgstr " %s {-A --add} [opci�k] <f�jl>\n"
#: src/pacman/pacman.c:91
#, c-format
-msgid " %s {-R --remove} [options] <package>\n"
-msgstr " %s {-R --remove} [opci�k] <csomag>\n"
+msgid " %s {-F --freshen} [options] <file>\n"
+msgstr " %s {-F --freshen} [opci�k] <f�jl>\n"
#: src/pacman/pacman.c:92
#, c-format
-msgid " %s {-U --upgrade} [options] <file>\n"
-msgstr " %s {-U --upgrade} [opci�k] <f�jl>\n"
+msgid " %s {-Q --query} [options] [package]\n"
+msgstr " %s {-Q --query} [opci�k] <csomag>\n"
#: src/pacman/pacman.c:93
#, c-format
-msgid " %s {-F --freshen} [options] <file>\n"
-msgstr " %s {-F --freshen} [opci�k] <f�jl>\n"
+msgid " %s {-R --remove} [options] <package>\n"
+msgstr " %s {-R --remove} [opci�k] <csomag>\n"
#: src/pacman/pacman.c:94
#, c-format
-msgid " %s {-Q --query} [options] [package]\n"
-msgstr " %s {-Q --query} [opci�k] <csomag>\n"
+msgid " %s {-S --sync} [options] [package]\n"
+msgstr " %s {-S --sync} [opci�k] [csomag]\n"
#: src/pacman/pacman.c:95
#, c-format
-msgid " %s {-S --sync} [options] [package]\n"
-msgstr " %s {-S --sync} [opci�k] [csomag]\n"
+msgid " %s {-U --upgrade} [options] <file>\n"
+msgstr " %s {-U --upgrade} [opci�k] <f�jl>\n"
#: src/pacman/pacman.c:96
#, c-format
@@ -386,13 +392,13 @@ msgstr "opci�k:\n"
#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
#: src/pacman/pacman.c:138
-#, c-format
-msgid " -d, --nodeps skip dependency checks\n"
+#, fuzzy, c-format
+msgid " -d, --nodeps skip dependency checks\n"
msgstr " -d, --nodeps f�gg�s�gi ellen�rz�sek kihagy�sa\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"
+#, fuzzy, c-format
+msgid " -f, --force force install, overwrite conflicting files\n"
msgstr ""
" -f, --force a telep�t�s er�ltet�se, �tk�z� f�jlok fel�l�r�sa\n"
@@ -402,28 +408,29 @@ msgid "usage: %s {-R --remove} [options] <package>\n"
msgstr "usage: %s {-R --remove} [opci�k] <csomag>\n"
#: src/pacman/pacman.c:106
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -c, --cascade remove packages and all packages that depend on them\n"
+" -c, --cascade remove packages and all packages that depend on them\n"
msgstr ""
" -c, --cascade a csomagok �s az �ket ig�nyl� csomagok elt�vol�t�sa\n"
#: src/pacman/pacman.c:108
-#, c-format
-msgid " -k, --dbonly only remove database entry, do not remove files\n"
+#, fuzzy, c-format
+msgid ""
+" -k, --dbonly only remove database entry, do not remove files\n"
msgstr ""
" -k, --dbonly csak az adatb�zis-bejegyz�s elt�vol�t�sa, magukat a "
"f�jlokat ne\n"
#: src/pacman/pacman.c:109
-#, c-format
-msgid " -n, --nosave remove configuration files as well\n"
+#, fuzzy, c-format
+msgid " -n, --nosave remove configuration files as well\n"
msgstr " -n, --nosave a be�ll�t�si f�jlokat is t�r�lje\n"
#: src/pacman/pacman.c:110
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -s, --recursive remove dependencies also (that won't break packages)\n"
+" -s, --recursive remove dependencies also (that won't break packages)\n"
msgstr ""
" -s, --recursive a f�gg�s�geket is t�vol�tsa el (nem fogja a csomagokat "
"t�nkretenni)\n"
@@ -444,14 +451,14 @@ msgid "usage: %s {-Q --query} [options] [package]\n"
msgstr "haszn�lat: %s {-Q --query} [opci�k] [csomag]\n"
#: src/pacman/pacman.c:123
-#, c-format
-msgid " -c, --changelog view the changelog of a package\n"
+#, fuzzy, c-format
+msgid " -c, --changelog view the changelog of a package\n"
msgstr " -c, --changelog a v�ltoz�sok napl�j�nak megtekint�se\n"
#: src/pacman/pacman.c:124
#, fuzzy, c-format
msgid ""
-" -e, --orphans list all packages installed as dependencies but no "
+" -e, --orphans list all packages installed as dependencies but no "
"longer\n"
msgstr ""
" -e, --orphans az �sszes olyan csomag list�z�sa amely f�gg�s�gk�nt "
@@ -459,56 +466,56 @@ msgstr ""
#: src/pacman/pacman.c:125
#, fuzzy, c-format
-msgid " required by any package\n"
+msgid " required by any package\n"
msgstr " �s m�r nem ig�nylt m�s csomagok �ltal\n"
#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
-#, c-format
-msgid " -g, --groups view all members of a package group\n"
+#, fuzzy, c-format
+msgid " -g, --groups view all members of a package group\n"
msgstr " -g, --groups egy csoport �sszes tagj�nak megtekint�se\n"
#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
-#, c-format
-msgid " -i, --info view package information\n"
+#, fuzzy, c-format
+msgid " -i, --info view package information\n"
msgstr " -i, --info csomaginform�ci�k megtekint�se\n"
#: src/pacman/pacman.c:128
-#, c-format
-msgid " -l, --list list the contents of the queried package\n"
+#, fuzzy, c-format
+msgid " -l, --list list the contents of the queried package\n"
msgstr " -l, --list a lek�rdezett csomag tartalm�nak list�z�sa\n"
#: src/pacman/pacman.c:129
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -m, --foreign list all packages that were not found in the sync db"
+" -m, --foreign list all packages that were not found in the sync db"
"(s)\n"
msgstr ""
" -m, --foreign az �sszes olyan csomag list�z�sa amely a t�voli "
"adatb�zis(ok)bannem volt megtal�lhat�\n"
#: src/pacman/pacman.c:130
-#, c-format
-msgid " -o, --owns <file> query the package that owns <file>\n"
+#, fuzzy, c-format
+msgid " -o, --owns <file> query the package that owns <file>\n"
msgstr " -o, --owns <f�jl> a <f�jl>-t tartalmaz� csomag lek�rdez�se\n"
#: src/pacman/pacman.c:131
#, fuzzy, c-format
msgid ""
-" -p, --file query the package file [package] instead of the "
+" -p, --file query the package file [package] instead of the "
"database\n"
msgstr ""
" -p, --file a pacman a [csomag] csomagf�jlt k�rdezze le ahelyett,\n"
#: src/pacman/pacman.c:132
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -s, --search search locally-installed packages for matching "
+" -s, --search search locally-installed packages for matching "
"strings\n"
msgstr " -s, --search keres�s a helyileg telep�tett csomagok k�z�tt\n"
#: src/pacman/pacman.c:133
#, fuzzy, c-format
-msgid " -u, --upgrades list all packages that can be upgraded\n"
+msgid " -u, --upgrades list all packages that can be upgraded\n"
msgstr " -u, --sysupgrade az �sszes elavult csomag friss�t�se\n"
#: src/pacman/pacman.c:135
@@ -517,161 +524,175 @@ msgid "usage: %s {-S --sync} [options] [package]\n"
msgstr "haszn�lat: %s {-S --sync} [opci�k] [csomag]\n"
#: src/pacman/pacman.c:137
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -c, --clean remove old packages from cache directory (use -cc for "
+" -c, --clean remove old packages from cache directory (use -cc for "
"all)\n"
msgstr ""
" -c, --clean a r�gi csomagok elt�vol�t�sa a gyors�t�t�r "
"k�nyvt�r�b�l (haszn�lja a '-cc'-t az �sszeshez)\n"
#: src/pacman/pacman.c:139
-#, c-format
-msgid " -e, --dependsonly install dependencies only\n"
+#, fuzzy, c-format
+msgid " -e, --dependsonly install dependencies only\n"
msgstr " -e, --dependsonly csak a f�gg�s�gek telep�t�se\n"
#: src/pacman/pacman.c:143
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -p, --print-uris print out URIs for given packages and their "
+" -p, --print-uris print out URIs for given packages and their "
"dependencies\n"
msgstr ""
" -p, --print-uris kinyomtatja az adott csomagok es f�gg�s�geik URI-it\n"
#: src/pacman/pacman.c:144
-#, c-format
-msgid " -s, --search search remote repositories for matching strings\n"
+#, fuzzy, c-format
+msgid ""
+" -s, --search search remote repositories for matching strings\n"
msgstr " -s, --search keres�s a t�voli csomagadatb�zisban\n"
#: src/pacman/pacman.c:145
-#, c-format
-msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
+#, fuzzy, c-format
+msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
msgstr " -u, --sysupgrade az �sszes elavult csomag friss�t�se\n"
#: src/pacman/pacman.c:146
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -w, --downloadonly download packages but do not install/upgrade anything\n"
+" -w, --downloadonly download packages but do not install/upgrade "
+"anything\n"
msgstr " -w, --downloadonly csak let�lt�s, de semmit nem telep�t/friss�t\n"
#: src/pacman/pacman.c:147
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -y, --refresh download fresh package databases from the server\n"
+" -y, --refresh download fresh package databases from the server\n"
msgstr " -y, --refresh friss csomagadatb�zis let�lt�se a szerverr�l\n"
#: src/pacman/pacman.c:148
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --ignore <pkg> ignore a package upgrade (can be used more than once)\n"
+" --ignore <pkg> ignore a package upgrade (can be used more than "
+"once)\n"
msgstr ""
" --ignore <csomag> egy csomag friss�t�s�nek figyelmen k�v�l hagy�sa "
"(t�bbsz�r is haszn�lhat�)\n"
#: src/pacman/pacman.c:150
-#, c-format
-msgid " --config <path> set an alternate configuration file\n"
+#, fuzzy, c-format
+msgid " --config <path> set an alternate configuration file\n"
msgstr " --config <�tvonal> alternat�v konfigur�ci�s f�jl haszn�lata\n"
#: src/pacman/pacman.c:151
-#, c-format
-msgid " --noconfirm do not ask for anything confirmation\n"
+#, fuzzy, c-format
+msgid " --noconfirm do not ask for anything confirmation\n"
msgstr " --noconfirm ne k�rjen soha meger�s�t�st\n"
#: src/pacman/pacman.c:152
-#, c-format
-msgid " --ask <number> pre-specify answers for questions (see manpage)\n"
+#, fuzzy, c-format
+msgid ""
+" --ask <number> pre-specify answers for questions (see manpage)\n"
msgstr ""
" --ask <sz�m> el�re megadja a v�laszokat k�rd�sekre (ld. man oldal)\n"
#: src/pacman/pacman.c:153
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --noprogressbar do not show a progress bar when downloading files\n"
+" --noprogressbar do not show a progress bar when downloading files\n"
msgstr ""
" --noprogressbar ne mutasson folyamats�vot a f�jlok let�lt�se k�zben\n"
#: src/pacman/pacman.c:154
-#, c-format
+#, fuzzy, c-format
msgid ""
-" --noscriptlet do not execute the install scriptlet if there is any\n"
+" --noscriptlet do not execute the install scriptlet if there is any\n"
msgstr ""
" --noscriptlet ne futtassa le a telep�t�si szkriptet ha van olyan\n"
#: src/pacman/pacman.c:155
-#, c-format
-msgid " -v, --verbose be verbose\n"
+#, fuzzy, c-format
+msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose legyen b�besz�d�\n"
#: src/pacman/pacman.c:156
-#, c-format
-msgid " -r, --root <path> set an alternate installation root\n"
+#, fuzzy, c-format
+msgid " -r, --root <path> set an alternate installation root\n"
msgstr ""
" -r, --root <�tvonal> alternat�v telep�t�si gy�k�rk�nyvt�r be�ll�t�sa\n"
#: src/pacman/pacman.c:157
-#, c-format
-msgid " -b, --dbpath <path> set an alternate database location\n"
+#, fuzzy, c-format
+msgid " -b, --dbpath <path> set an alternate database location\n"
+msgstr " -b, --dbpath <�tvonal> alternat�v adatb�zis hely be�ll�t�sa\n"
+
+#: src/pacman/pacman.c:158
+#, fuzzy, c-format
+msgid " --cachedir <dir> set an alternate database location\n"
msgstr " -b, --dbpath <�tvonal> alternat�v adatb�zis hely be�ll�t�sa\n"
-#: src/pacman/pacman.c:170
+#: src/pacman/pacman.c:171
#, c-format
msgid " This program may be freely redistributed under\n"
msgstr ""
" Ezt a programot b�rki a General Public License-ben\n"
-#: src/pacman/pacman.c:171
+#: src/pacman/pacman.c:172
#, c-format
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:299
#, fuzzy, c-format
-msgid "error: '%s' is not a valid debug level"
+msgid "'%s' is not a valid debug level"
msgstr "%s: nem �rv�nyes regul�ris kifejez�s.\n"
-#: src/pacman/pacman.c:334
-#, c-format
-msgid "error: '%s' is not a valid db path\n"
-msgstr ""
+#: src/pacman/pacman.c:315
+#, 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:364
-#, c-format
-msgid "error: '%s' is not a valid root path\n"
-msgstr ""
+#: src/pacman/pacman.c:341
+#, 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:391
+#: src/pacman/pacman.c:371
+#, 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:398
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:454
+#: src/pacman/pacman.c:461
#, 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:487
+#: src/pacman/pacman.c:494
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:503
+#: src/pacman/pacman.c:510
#, 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:513 src/pacman/remove.c:125 src/pacman/util.c:316
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "C�lok:"
-#: src/pacman/pacman.c:519
+#: src/pacman/pacman.c:526
#, 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:526
+#: src/pacman/pacman.c:533
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:539
+#: src/pacman/pacman.c:546
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"
@@ -689,39 +710,39 @@ msgstr "a %s f�jlt a %s %s tartalmazza\n"
msgid "No package owns %s\n"
msgstr "Egyik csomag sem tartalmazza a k�vetkez�t: %s\n"
-#: src/pacman/query.c:122 src/pacman/sync.c:413
+#: src/pacman/query.c:119 src/pacman/sync.c:409
msgid "no usable package repositories configured.\n"
msgstr "egyetlen haszn�lhat� csomag rep� sincs be�ll�tva.\n"
-#: src/pacman/query.c:128
+#: src/pacman/query.c:125
#, fuzzy
msgid "Checking for package upgrades..."
msgstr "a csomagok integrit�s�nak ellen�rz�se... "
-#: src/pacman/query.c:135
+#: src/pacman/query.c:132
msgid "no upgrades found"
msgstr ""
-#: src/pacman/query.c:173
+#: src/pacman/query.c:170
#, c-format
msgid "group \"%s\" was not found\n"
msgstr "a \"%s\" csoport nem tal�lhat�\n"
-#: src/pacman/query.c:184
+#: src/pacman/query.c:181
msgid "no package file was specified for --file\n"
msgstr "nincs megadva f�jl a --file sz�m�ra\n"
-#: src/pacman/query.c:188
+#: src/pacman/query.c:185
#, c-format
msgid "failed to load package '%s' (%s)\n"
msgstr "nem siker�lt bet�lteni a '%s' csomagot (%s)\n"
-#: src/pacman/query.c:226 src/pacman/query.c:263
+#: src/pacman/query.c:223 src/pacman/query.c:255
#, c-format
msgid "package \"%s\" not found\n"
msgstr "a \"%s\" csomag nem tal�lhat�\n"
-#: src/pacman/remove.c:58 src/pacman/sync.c:528
+#: src/pacman/remove.c:58 src/pacman/sync.c:524
#, c-format
msgid ":: group %s:\n"
msgstr ":: %s csoport:\n"
@@ -735,7 +756,7 @@ msgstr " Elt�vol�tja a teljes tartalmat? [I/n] "
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ":: Elt�vol�tja a %s-t a %s csoportb�l? [I/n] "
-#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
+#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
#, c-format
msgid "failed to init transaction (%s)\n"
msgstr "nem siker�lt inicializ�lni a tranzakci�t (%s)\n"
@@ -801,39 +822,39 @@ msgstr "nem siker�lt friss�teni a k�vetkez�t: %s (%s)\n"
msgid " %s is up to date\n"
msgstr " a %s naprak�sz\n"
-#: src/pacman/sync.c:341
+#: src/pacman/sync.c:337
#, c-format
msgid "package \"%s\" was not found.\n"
msgstr "a \"%s\" csomag nem tal�lhat�.\n"
-#: src/pacman/sync.c:378
+#: src/pacman/sync.c:374
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr "a \"%s\" rep� nem tal�lhat�.\n"
-#: src/pacman/sync.c:450
+#: src/pacman/sync.c:446
msgid ":: Synchronizing package databases...\n"
msgstr ":: A csomagadatb�zisok szinkroniz�l�sa...\n"
-#: src/pacman/sync.c:451
+#: src/pacman/sync.c:447
msgid "synchronizing package lists"
msgstr "a csomaglist�k szinkroniz�l�sa"
-#: src/pacman/sync.c:453
+#: src/pacman/sync.c:449
#, fuzzy
msgid "failed to synchronize any databases"
msgstr "nem siker�lt szinkroniz�lni a k�vetkez�t: %s\n"
-#: src/pacman/sync.c:459
+#: src/pacman/sync.c:455
#, fuzzy
msgid ":: Starting full system upgrade...\n"
msgstr "teljes rendszerfriss�t�s ind�t�sa"
-#: src/pacman/sync.c:460
+#: src/pacman/sync.c:456
msgid "starting full system upgrade"
msgstr "teljes rendszerfriss�t�s ind�t�sa"
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:474
msgid ""
"\n"
":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -841,57 +862,57 @@ msgstr ""
"\n"
":: a pacman egy �jabb verzi�j�t �szlelte a \"pacman\" csomagnak.\n"
-#: src/pacman/sync.c:479
+#: src/pacman/sync.c:475
msgid ":: It is recommended that you allow pacman to upgrade itself\n"
msgstr ":: Aj�nlott, hogy engedje, hogy a pacman el�bb saj�t mag�t\n"
-#: src/pacman/sync.c:480
+#: src/pacman/sync.c:476
msgid ":: first, then you can re-run the operation with the newer version.\n"
msgstr ":: friss�tse, majd �jra futtathatja a m�veletet az �jabb verzi�val.\n"
-#: src/pacman/sync.c:482
+#: src/pacman/sync.c:478
msgid ":: Upgrade pacman first? [Y/n] "
msgstr ":: El�sz�r csak a pacman friss�t�se? [I/n] "
-#: src/pacman/sync.c:497
+#: src/pacman/sync.c:493
#, fuzzy, c-format
msgid "pacman: %s\n"
msgstr "Egyik csomag sem tartalmazza a k�vetkez�t: %s\n"
-#: src/pacman/sync.c:517
+#: src/pacman/sync.c:513
#, c-format
msgid "'%s': %s\n"
msgstr ""
-#: src/pacman/sync.c:532
+#: src/pacman/sync.c:528
msgid ":: Install whole content? [Y/n] "
msgstr ":: A teljes tartalom telep�t�se? [I/n] "
-#: src/pacman/sync.c:539
+#: src/pacman/sync.c:535
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ":: Telep�ti a %s-t a %s csoportb�l? [I/n] "
-#: src/pacman/sync.c:563
+#: src/pacman/sync.c:559
#, fuzzy, c-format
msgid "'%s': not found in sync db\n"
msgstr ""
"nem siker�lt hozz�adni a '%s' c�lt: nem tal�lhat� a t�voli adatb�zisban\n"
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "requires"
msgstr "ig�nyli a k�vetkez�t:"
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "is required by"
msgstr "ig�nyli a"
-#: src/pacman/sync.c:625
+#: src/pacman/sync.c:621
#, fuzzy
msgid "local database is up to date\n"
msgstr " a %s naprak�sz\n"
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:630
msgid ""
"\n"
"Beginning download...\n"
@@ -899,11 +920,11 @@ msgstr ""
"\n"
"A let�lt�s megkezd�se...\n"
-#: src/pacman/sync.c:638
+#: src/pacman/sync.c:634
msgid "Proceed with download? [Y/n] "
msgstr "Kezd�dhet a let�lt�s? [I/n] "
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:642
msgid ""
"\n"
"Beginning upgrade process...\n"
@@ -911,134 +932,127 @@ msgstr ""
"\n"
"A friss�t�si folyamat megkezd�se...\n"
-#: src/pacman/sync.c:650
+#: src/pacman/sync.c:646
#, fuzzy
msgid "Proceed with installation? [Y/n] "
msgstr "Kezd�dhet a let�lt�s? [I/n] "
-#: src/pacman/trans.c:57
-msgid "] 100% LOCAL "
-msgstr "] 100% HELYI "
-
-#: src/pacman/trans.c:68
+#: src/pacman/trans.c:52
msgid "checking dependencies... "
msgstr "f�gg�s�gek vizsg�lata... "
-#: src/pacman/trans.c:72
+#: src/pacman/trans.c:56
msgid "checking for file conflicts... "
msgstr "f�jl�tk�z�sek vizsg�lata... "
-#: src/pacman/trans.c:76
+#: src/pacman/trans.c:60
#, fuzzy
msgid "cleaning up... "
msgstr "%s elt�vol�t�sa... "
-#: src/pacman/trans.c:79
+#: src/pacman/trans.c:63
msgid "resolving dependencies... "
msgstr "f�gg�s�gek felold�sa... "
-#: src/pacman/trans.c:82
+#: src/pacman/trans.c:66
msgid "looking for inter-conflicts... "
msgstr "bels� �tk�z�sek keres�se... "
-#: src/pacman/trans.c:102
+#: src/pacman/trans.c:86
#, c-format
msgid "installing %s... "
msgstr "%s telep�t�se... "
-#: src/pacman/trans.c:109
+#: src/pacman/trans.c:93
#, c-format
msgid "installed %s (%s)"
msgstr "%s telep�tve (%s)"
-#: src/pacman/trans.c:116
+#: src/pacman/trans.c:100
#, c-format
msgid "removing %s... "
msgstr "%s elt�vol�t�sa... "
-#: src/pacman/trans.c:123
+#: src/pacman/trans.c:107
#, c-format
msgid "removed %s (%s)"
msgstr "%s elt�vol�tva (%s)"
-#: src/pacman/trans.c:130
+#: src/pacman/trans.c:114
#, c-format
msgid "upgrading %s... "
msgstr "%s friss�t�se... "
-#: src/pacman/trans.c:137
+#: src/pacman/trans.c:121
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr "%s friss�tve (%s -> %s)"
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:128
msgid "checking package integrity... "
msgstr "a csomagok integrit�s�nak ellen�rz�se... "
-#: src/pacman/trans.c:158
-msgid " done.\n"
-msgstr " k�sz.\n"
-
-#: src/pacman/trans.c:160
-msgid " failed.\n"
+#: src/pacman/trans.c:144
+#, fuzzy
+msgid "failed.\n"
msgstr " sikertelen.\n"
-#: src/pacman/trans.c:167
+#: src/pacman/trans.c:151
#, fuzzy, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ""
"\n"
":: Csomagok let�lt�se a %s-b�l...\n"
-#: src/pacman/trans.c:190
+#: src/pacman/trans.c:171
#, 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:204
+#: src/pacman/trans.c:185
#, 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:217
+#: src/pacman/trans.c:198
#, 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:232
+#: src/pacman/trans.c:213
#, 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:248
+#: src/pacman/trans.c:229
#, 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:266
+#: src/pacman/trans.c:247
#, 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:284
+#: src/pacman/trans.c:265
#, 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:333
+#: src/pacman/trans.c:314
msgid "installing"
msgstr "telep�t�s:"
-#: src/pacman/trans.c:336
+#: src/pacman/trans.c:317
msgid "upgrading"
msgstr "friss�t�s:"
-#: src/pacman/trans.c:339
+#: src/pacman/trans.c:320
msgid "removing"
msgstr "elt�vol��s:"
-#: src/pacman/trans.c:342
+#: src/pacman/trans.c:323
#, fuzzy
msgid "checking for file conflicts"
msgstr "f�jl�tk�z�sek vizsg�lata... "
@@ -1048,14 +1062,14 @@ msgstr "f�jl�tk�z�sek vizsg�lata... "
msgid "None\n"
msgstr "Nincs\n"
-#: src/pacman/util.c:303
+#: src/pacman/util.c:310
#, fuzzy
msgid "Remove:"
msgstr ""
"\n"
"Elt�vol�t�s: "
-#: src/pacman/util.c:311
+#: src/pacman/util.c:318
#, fuzzy, c-format
msgid ""
"\n"
@@ -1064,7 +1078,7 @@ msgstr ""
"\n"
"Teljes csomagm�ret: %.1f MB\n"
-#: src/pacman/util.c:322
+#: src/pacman/util.c:329
#, fuzzy, c-format
msgid ""
"\n"
@@ -1073,13 +1087,19 @@ msgstr ""
"\n"
"Teljes csomagm�ret: %.1f MB\n"
-#: src/pacman/util.c:329
+#: src/pacman/util.c:336
#, fuzzy, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr ""
"\n"
"Teljes csomagm�ret: %.1f MB\n"
+#~ msgid "] 100% LOCAL "
+#~ msgstr "] 100% HELYI "
+
+#~ msgid " done.\n"
+#~ msgstr " k�sz.\n"
+
#~ msgid "done."
#~ msgstr "k�sz."
diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po
index 1e7c0acd..e5035d72 100644
--- a/src/pacman/po/it.po
+++ b/src/pacman/po/it.po
@@ -7,7 +7,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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:17-0500\n"
"PO-Revision-Date: 2007-02-06 20:18-0500\n"
"Last-Translator: Dan McGee <pacman-dev@archlinux.org>\n"
"MIME-Version: 1.0\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/pacman/add.c:69 src/pacman/deptest.c:69 src/pacman/remove.c:79
-#: src/pacman/sync.c:442 src/pacman/sync.c:491
+#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
+#: src/pacman/sync.c:438 src/pacman/sync.c:487
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -32,13 +32,14 @@ msgstr ""
msgid "failed to add target '%s' (%s)"
msgstr ""
-#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:86
-#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
-#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+#: src/pacman/add.c:85 src/pacman/sync.c:194 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
msgid "done.\n"
msgstr ""
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr ""
@@ -48,68 +49,68 @@ msgstr ""
msgid ":: %s: requires %s"
msgstr ""
-#: src/pacman/add.c:118 src/pacman/sync.c:605
+#: src/pacman/add.c:118 src/pacman/sync.c:601
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ""
-#: src/pacman/add.c:127 src/pacman/sync.c:669
+#: src/pacman/add.c:127 src/pacman/sync.c:665
#, c-format
msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
msgstr ""
-#: src/pacman/add.c:134 src/pacman/sync.c:676
+#: src/pacman/add.c:134 src/pacman/sync.c:672
#, c-format
msgid "%s: %s%s exists in filesystem\n"
msgstr ""
-#: src/pacman/add.c:141 src/pacman/sync.c:683 src/pacman/sync.c:689
+#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
msgstr ""
-#: src/pacman/add.c:151 src/pacman/sync.c:612
+#: src/pacman/add.c:151 src/pacman/sync.c:608
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ""
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr ""
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:484
-#: src/pacman/sync.c:705
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
+#: src/pacman/sync.c:701
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr ""
-#: src/pacman/deptest.c:82
+#: src/pacman/deptest.c:70
msgid "memory allocation failure\n"
msgstr ""
-#: src/pacman/deptest.c:93
+#: src/pacman/deptest.c:81
#, c-format
msgid "add target %s\n"
msgstr ""
-#: src/pacman/deptest.c:96
+#: src/pacman/deptest.c:84
#, c-format
msgid "could not add target (%s)\n"
msgstr ""
-#: src/pacman/deptest.c:115
+#: src/pacman/deptest.c:103
#, c-format
msgid "requires: %s"
msgstr ""
-#: src/pacman/deptest.c:139
+#: src/pacman/deptest.c:127
#, c-format
msgid "conflict: %s"
msgstr ""
-#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
+#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
#, c-format
msgid "could not release transaction (%s)"
msgstr ""
@@ -134,11 +135,11 @@ msgstr ""
msgid "function"
msgstr ""
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "Y"
msgstr ""
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "YES"
msgstr ""
@@ -162,12 +163,12 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: src/pacman/package.c:68 src/pacman/package.c:118
+#: src/pacman/package.c:68 src/pacman/package.c:119
#, c-format
msgid "Name : %s\n"
msgstr ""
-#: src/pacman/package.c:69 src/pacman/package.c:119
+#: src/pacman/package.c:69 src/pacman/package.c:120
#, c-format
msgid "Version : %s\n"
msgstr ""
@@ -181,19 +182,19 @@ msgstr ""
msgid "License :"
msgstr ""
-#: src/pacman/package.c:72 src/pacman/package.c:120
+#: src/pacman/package.c:72 src/pacman/package.c:121
msgid "Groups :"
msgstr ""
-#: src/pacman/package.c:73 src/pacman/package.c:121
+#: src/pacman/package.c:73 src/pacman/package.c:122
msgid "Provides :"
msgstr ""
-#: src/pacman/package.c:74 src/pacman/package.c:122
+#: src/pacman/package.c:74 src/pacman/package.c:123
msgid "Depends On :"
msgstr ""
-#: src/pacman/package.c:75 src/pacman/package.c:123
+#: src/pacman/package.c:75 src/pacman/package.c:124
msgid "Removes :"
msgstr ""
@@ -201,7 +202,7 @@ msgstr ""
msgid "Required By :"
msgstr ""
-#: src/pacman/package.c:80 src/pacman/package.c:124
+#: src/pacman/package.c:80 src/pacman/package.c:125
msgid "Conflicts With :"
msgstr ""
@@ -253,61 +254,66 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/pacman/package.c:93 src/pacman/package.c:129
+#: src/pacman/package.c:93 src/pacman/package.c:130
#, c-format
msgid "Description : "
msgstr ""
-#: src/pacman/package.c:117
+#: src/pacman/package.c:118
#, c-format
msgid "Repository : %s\n"
msgstr ""
-#: src/pacman/package.c:125
+#: src/pacman/package.c:126
msgid "Replaces :"
msgstr ""
-#: src/pacman/package.c:126
+#: src/pacman/package.c:127
#, c-format
msgid "Download Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:127
+#: src/pacman/package.c:128
#, c-format
msgid "Installed Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:134
+#: src/pacman/package.c:135
#, c-format
msgid "MD5 Sum : %s"
msgstr ""
-#: src/pacman/package.c:137
+#: src/pacman/package.c:138
#, c-format
msgid "SHA1 Sum : %s"
msgstr ""
-#: src/pacman/package.c:168
+#: src/pacman/package.c:149
+#, c-format
+msgid "Backup Files :\n"
+msgstr ""
+
+#: src/pacman/package.c:169
#, c-format
msgid "error calculating checksums for %s\n"
msgstr ""
-#: src/pacman/package.c:181
+#: src/pacman/package.c:182
#, c-format
msgid "MODIFIED\t%s\n"
msgstr ""
-#: src/pacman/package.c:183
+#: src/pacman/package.c:184
#, c-format
msgid "Not Modified\t%s\n"
msgstr ""
-#: src/pacman/package.c:188
+#: src/pacman/package.c:189
#, c-format
msgid "MISSING\t\t%s\n"
msgstr ""
-#: src/pacman/package.c:221
+#: src/pacman/package.c:222
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr ""
@@ -329,27 +335,27 @@ msgstr ""
#: src/pacman/pacman.c:91
#, c-format
-msgid " %s {-R --remove} [options] <package>\n"
+msgid " %s {-F --freshen} [options] <file>\n"
msgstr ""
#: src/pacman/pacman.c:92
#, c-format
-msgid " %s {-U --upgrade} [options] <file>\n"
+msgid " %s {-Q --query} [options] [package]\n"
msgstr ""
#: src/pacman/pacman.c:93
#, c-format
-msgid " %s {-F --freshen} [options] <file>\n"
+msgid " %s {-R --remove} [options] <package>\n"
msgstr ""
#: src/pacman/pacman.c:94
#, c-format
-msgid " %s {-Q --query} [options] [package]\n"
+msgid " %s {-S --sync} [options] [package]\n"
msgstr ""
#: src/pacman/pacman.c:95
#, c-format
-msgid " %s {-S --sync} [options] [package]\n"
+msgid " %s {-U --upgrade} [options] <file>\n"
msgstr ""
#: src/pacman/pacman.c:96
@@ -373,12 +379,12 @@ msgstr ""
#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
#: src/pacman/pacman.c:138
#, c-format
-msgid " -d, --nodeps skip dependency checks\n"
+msgid " -d, --nodeps skip dependency checks\n"
msgstr ""
#: 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"
+msgid " -f, --force force install, overwrite conflicting files\n"
msgstr ""
#: src/pacman/pacman.c:104
@@ -389,23 +395,24 @@ msgstr ""
#: src/pacman/pacman.c:106
#, c-format
msgid ""
-" -c, --cascade remove packages and all packages that depend on them\n"
+" -c, --cascade remove packages and all packages that depend on them\n"
msgstr ""
#: 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 ""
#: src/pacman/pacman.c:109
#, c-format
-msgid " -n, --nosave remove configuration files as well\n"
+msgid " -n, --nosave remove configuration files as well\n"
msgstr ""
#: src/pacman/pacman.c:110
#, c-format
msgid ""
-" -s, --recursive remove dependencies also (that won't break packages)\n"
+" -s, --recursive remove dependencies also (that won't break packages)\n"
msgstr ""
#: src/pacman/pacman.c:113
@@ -425,65 +432,65 @@ msgstr ""
#: src/pacman/pacman.c:123
#, c-format
-msgid " -c, --changelog view the changelog of a package\n"
+msgid " -c, --changelog view the changelog of a package\n"
msgstr ""
#: src/pacman/pacman.c:124
#, c-format
msgid ""
-" -e, --orphans list all packages installed as dependencies but no "
+" -e, --orphans list all packages installed as dependencies but no "
"longer\n"
msgstr ""
#: src/pacman/pacman.c:125
#, c-format
-msgid " required by any package\n"
+msgid " required by any package\n"
msgstr ""
#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
#, c-format
-msgid " -g, --groups view all members of a package group\n"
+msgid " -g, --groups view all members of a package group\n"
msgstr ""
#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
#, c-format
-msgid " -i, --info view package information\n"
+msgid " -i, --info view package information\n"
msgstr ""
#: src/pacman/pacman.c:128
#, c-format
-msgid " -l, --list list the contents of the queried package\n"
+msgid " -l, --list list the contents of the queried package\n"
msgstr ""
#: src/pacman/pacman.c:129
#, c-format
msgid ""
-" -m, --foreign list all packages that were not found in the sync db"
+" -m, --foreign list all packages that were not found in the sync db"
"(s)\n"
msgstr ""
#: src/pacman/pacman.c:130
#, c-format
-msgid " -o, --owns <file> query the package that owns <file>\n"
+msgid " -o, --owns <file> query the package that owns <file>\n"
msgstr ""
#: src/pacman/pacman.c:131
#, c-format
msgid ""
-" -p, --file query the package file [package] instead of the "
+" -p, --file query the package file [package] instead of the "
"database\n"
msgstr ""
#: src/pacman/pacman.c:132
#, c-format
msgid ""
-" -s, --search search locally-installed packages for matching "
+" -s, --search search locally-installed packages for matching "
"strings\n"
msgstr ""
#: src/pacman/pacman.c:133
#, c-format
-msgid " -u, --upgrades list all packages that can be upgraded\n"
+msgid " -u, --upgrades list all packages that can be upgraded\n"
msgstr ""
#: src/pacman/pacman.c:135
@@ -494,149 +501,163 @@ msgstr ""
#: src/pacman/pacman.c:137
#, c-format
msgid ""
-" -c, --clean remove old packages from cache directory (use -cc for "
+" -c, --clean remove old packages from cache directory (use -cc for "
"all)\n"
msgstr ""
#: src/pacman/pacman.c:139
#, c-format
-msgid " -e, --dependsonly install dependencies only\n"
+msgid " -e, --dependsonly install dependencies only\n"
msgstr ""
#: src/pacman/pacman.c:143
#, c-format
msgid ""
-" -p, --print-uris print out URIs for given packages and their "
+" -p, --print-uris print out URIs for given packages and their "
"dependencies\n"
msgstr ""
#: src/pacman/pacman.c:144
#, c-format
-msgid " -s, --search search remote repositories for matching strings\n"
+msgid ""
+" -s, --search search remote repositories for matching strings\n"
msgstr ""
#: src/pacman/pacman.c:145
#, c-format
-msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
+msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
msgstr ""
#: src/pacman/pacman.c:146
#, c-format
msgid ""
-" -w, --downloadonly download packages but do not install/upgrade anything\n"
+" -w, --downloadonly download packages but do not install/upgrade "
+"anything\n"
msgstr ""
#: src/pacman/pacman.c:147
#, c-format
msgid ""
-" -y, --refresh download fresh package databases from the server\n"
+" -y, --refresh download fresh package databases from the server\n"
msgstr ""
#: src/pacman/pacman.c:148
#, c-format
msgid ""
-" --ignore <pkg> ignore a package upgrade (can be used more than once)\n"
+" --ignore <pkg> ignore a package upgrade (can be used more than "
+"once)\n"
msgstr ""
#: src/pacman/pacman.c:150
#, c-format
-msgid " --config <path> set an alternate configuration file\n"
+msgid " --config <path> set an alternate configuration file\n"
msgstr ""
#: src/pacman/pacman.c:151
#, c-format
-msgid " --noconfirm do not ask for anything confirmation\n"
+msgid " --noconfirm do not ask for anything confirmation\n"
msgstr ""
#: src/pacman/pacman.c:152
#, c-format
-msgid " --ask <number> pre-specify answers for questions (see manpage)\n"
+msgid ""
+" --ask <number> pre-specify answers for questions (see manpage)\n"
msgstr ""
#: src/pacman/pacman.c:153
#, c-format
msgid ""
-" --noprogressbar do not show a progress bar when downloading files\n"
+" --noprogressbar do not show a progress bar when downloading files\n"
msgstr ""
#: src/pacman/pacman.c:154
#, c-format
msgid ""
-" --noscriptlet do not execute the install scriptlet if there is any\n"
+" --noscriptlet do not execute the install scriptlet if there is any\n"
msgstr ""
#: src/pacman/pacman.c:155
#, c-format
-msgid " -v, --verbose be verbose\n"
+msgid " -v, --verbose be verbose\n"
msgstr ""
#: src/pacman/pacman.c:156
#, c-format
-msgid " -r, --root <path> set an alternate installation root\n"
+msgid " -r, --root <path> set an alternate installation root\n"
msgstr ""
#: src/pacman/pacman.c:157
#, c-format
-msgid " -b, --dbpath <path> set an alternate database location\n"
+msgid " -b, --dbpath <path> set an alternate database location\n"
msgstr ""
-#: src/pacman/pacman.c:170
+#: src/pacman/pacman.c:158
#, c-format
-msgid " This program may be freely redistributed under\n"
+msgid " --cachedir <dir> set an alternate database location\n"
msgstr ""
#: src/pacman/pacman.c:171
#, c-format
+msgid " This program may be freely redistributed under\n"
+msgstr ""
+
+#: src/pacman/pacman.c:172
+#, c-format
msgid " the terms of the GNU General Public License\n"
msgstr ""
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:299
+#, c-format
+msgid "'%s' is not a valid debug level"
+msgstr ""
+
+#: src/pacman/pacman.c:315
#, c-format
-msgid "error: '%s' is not a valid debug level"
+msgid "'%s' is not a valid cache directory\n"
msgstr ""
-#: src/pacman/pacman.c:334
+#: src/pacman/pacman.c:341
#, c-format
-msgid "error: '%s' is not a valid db path\n"
+msgid "'%s' is not a valid db path\n"
msgstr ""
-#: src/pacman/pacman.c:364
+#: src/pacman/pacman.c:371
#, c-format
-msgid "error: '%s' is not a valid root path\n"
+msgid "'%s' is not a valid root path\n"
msgstr ""
-#: src/pacman/pacman.c:391
+#: src/pacman/pacman.c:398
msgid "only one operation may be used at a time\n"
msgstr ""
-#: src/pacman/pacman.c:454
+#: src/pacman/pacman.c:461
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:487
+#: src/pacman/pacman.c:494
msgid "you cannot perform this operation unless you are root.\n"
msgstr ""
-#: src/pacman/pacman.c:503
+#: src/pacman/pacman.c:510
#, c-format
msgid "failed to parse config (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr ""
-#: src/pacman/pacman.c:519
+#: src/pacman/pacman.c:526
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:533
msgid "no targets specified (use -h for help)\n"
msgstr ""
-#: src/pacman/pacman.c:539
+#: src/pacman/pacman.c:546
msgid "no operation specified (use -h for help)\n"
msgstr ""
@@ -654,38 +675,38 @@ msgstr ""
msgid "No package owns %s\n"
msgstr ""
-#: src/pacman/query.c:122 src/pacman/sync.c:413
+#: src/pacman/query.c:119 src/pacman/sync.c:409
msgid "no usable package repositories configured.\n"
msgstr ""
-#: src/pacman/query.c:128
+#: src/pacman/query.c:125
msgid "Checking for package upgrades..."
msgstr ""
-#: src/pacman/query.c:135
+#: src/pacman/query.c:132
msgid "no upgrades found"
msgstr ""
-#: src/pacman/query.c:173
+#: src/pacman/query.c:170
#, c-format
msgid "group \"%s\" was not found\n"
msgstr ""
-#: src/pacman/query.c:184
+#: src/pacman/query.c:181
msgid "no package file was specified for --file\n"
msgstr ""
-#: src/pacman/query.c:188
+#: src/pacman/query.c:185
#, c-format
msgid "failed to load package '%s' (%s)\n"
msgstr ""
-#: src/pacman/query.c:226 src/pacman/query.c:263
+#: src/pacman/query.c:223 src/pacman/query.c:255
#, c-format
msgid "package \"%s\" not found\n"
msgstr ""
-#: src/pacman/remove.c:58 src/pacman/sync.c:528
+#: src/pacman/remove.c:58 src/pacman/sync.c:524
#, c-format
msgid ":: group %s:\n"
msgstr ""
@@ -699,7 +720,7 @@ msgstr ""
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ""
-#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
+#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
#, c-format
msgid "failed to init transaction (%s)\n"
msgstr ""
@@ -763,229 +784,221 @@ msgstr ""
msgid " %s is up to date\n"
msgstr ""
-#: src/pacman/sync.c:341
+#: src/pacman/sync.c:337
#, c-format
msgid "package \"%s\" was not found.\n"
msgstr ""
-#: src/pacman/sync.c:378
+#: src/pacman/sync.c:374
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr ""
-#: src/pacman/sync.c:450
+#: src/pacman/sync.c:446
msgid ":: Synchronizing package databases...\n"
msgstr ""
-#: src/pacman/sync.c:451
+#: src/pacman/sync.c:447
msgid "synchronizing package lists"
msgstr ""
-#: src/pacman/sync.c:453
+#: src/pacman/sync.c:449
msgid "failed to synchronize any databases"
msgstr ""
-#: src/pacman/sync.c:459
+#: src/pacman/sync.c:455
msgid ":: Starting full system upgrade...\n"
msgstr ""
-#: src/pacman/sync.c:460
+#: src/pacman/sync.c:456
msgid "starting full system upgrade"
msgstr ""
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:474
msgid ""
"\n"
":: pacman has detected a newer version of the \"pacman\" package.\n"
msgstr ""
-#: src/pacman/sync.c:479
+#: src/pacman/sync.c:475
msgid ":: It is recommended that you allow pacman to upgrade itself\n"
msgstr ""
-#: src/pacman/sync.c:480
+#: src/pacman/sync.c:476
msgid ":: first, then you can re-run the operation with the newer version.\n"
msgstr ""
-#: src/pacman/sync.c:482
+#: src/pacman/sync.c:478
msgid ":: Upgrade pacman first? [Y/n] "
msgstr ""
-#: src/pacman/sync.c:497
+#: src/pacman/sync.c:493
#, c-format
msgid "pacman: %s\n"
msgstr ""
-#: src/pacman/sync.c:517
+#: src/pacman/sync.c:513
#, c-format
msgid "'%s': %s\n"
msgstr ""
-#: src/pacman/sync.c:532
+#: src/pacman/sync.c:528
msgid ":: Install whole content? [Y/n] "
msgstr ""
-#: src/pacman/sync.c:539
+#: src/pacman/sync.c:535
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ""
-#: src/pacman/sync.c:563
+#: src/pacman/sync.c:559
#, c-format
msgid "'%s': not found in sync db\n"
msgstr ""
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "requires"
msgstr ""
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "is required by"
msgstr ""
-#: src/pacman/sync.c:625
+#: src/pacman/sync.c:621
msgid "local database is up to date\n"
msgstr ""
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:630
msgid ""
"\n"
"Beginning download...\n"
msgstr ""
-#: src/pacman/sync.c:638
+#: src/pacman/sync.c:634
msgid "Proceed with download? [Y/n] "
msgstr ""
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:642
msgid ""
"\n"
"Beginning upgrade process...\n"
msgstr ""
-#: src/pacman/sync.c:650
+#: src/pacman/sync.c:646
msgid "Proceed with installation? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:57
-msgid "] 100% LOCAL "
-msgstr ""
-
-#: src/pacman/trans.c:68
+#: src/pacman/trans.c:52
msgid "checking dependencies... "
msgstr ""
-#: src/pacman/trans.c:72
+#: src/pacman/trans.c:56
msgid "checking for file conflicts... "
msgstr ""
-#: src/pacman/trans.c:76
+#: src/pacman/trans.c:60
msgid "cleaning up... "
msgstr ""
-#: src/pacman/trans.c:79
+#: src/pacman/trans.c:63
msgid "resolving dependencies... "
msgstr ""
-#: src/pacman/trans.c:82
+#: src/pacman/trans.c:66
msgid "looking for inter-conflicts... "
msgstr ""
-#: src/pacman/trans.c:102
+#: src/pacman/trans.c:86
#, c-format
msgid "installing %s... "
msgstr ""
-#: src/pacman/trans.c:109
+#: src/pacman/trans.c:93
#, c-format
msgid "installed %s (%s)"
msgstr ""
-#: src/pacman/trans.c:116
+#: src/pacman/trans.c:100
#, c-format
msgid "removing %s... "
msgstr ""
-#: src/pacman/trans.c:123
+#: src/pacman/trans.c:107
#, c-format
msgid "removed %s (%s)"
msgstr ""
-#: src/pacman/trans.c:130
+#: src/pacman/trans.c:114
#, c-format
msgid "upgrading %s... "
msgstr ""
-#: src/pacman/trans.c:137
+#: src/pacman/trans.c:121
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr ""
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:128
msgid "checking package integrity... "
msgstr ""
-#: src/pacman/trans.c:158
-msgid " done.\n"
-msgstr ""
-
-#: src/pacman/trans.c:160
-msgid " failed.\n"
+#: src/pacman/trans.c:144
+msgid "failed.\n"
msgstr ""
-#: src/pacman/trans.c:167
+#: src/pacman/trans.c:151
#, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ""
-#: src/pacman/trans.c:190
+#: src/pacman/trans.c:171
#, c-format
msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:204
+#: src/pacman/trans.c:185
#, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:217
+#: src/pacman/trans.c:198
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:232
+#: src/pacman/trans.c:213
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:248
+#: src/pacman/trans.c:229
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:266
+#: src/pacman/trans.c:247
#, c-format
msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:284
+#: src/pacman/trans.c:265
#, c-format
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:333
+#: src/pacman/trans.c:314
msgid "installing"
msgstr ""
-#: src/pacman/trans.c:336
+#: src/pacman/trans.c:317
msgid "upgrading"
msgstr ""
-#: src/pacman/trans.c:339
+#: src/pacman/trans.c:320
msgid "removing"
msgstr ""
-#: src/pacman/trans.c:342
+#: src/pacman/trans.c:323
msgid "checking for file conflicts"
msgstr ""
@@ -994,25 +1007,25 @@ msgstr ""
msgid "None\n"
msgstr ""
-#: src/pacman/util.c:303
+#: src/pacman/util.c:310
msgid "Remove:"
msgstr ""
-#: src/pacman/util.c:311
+#: src/pacman/util.c:318
#, c-format
msgid ""
"\n"
"Total Removed Size: %.2f MB\n"
msgstr ""
-#: src/pacman/util.c:322
+#: src/pacman/util.c:329
#, c-format
msgid ""
"\n"
"Total Package Size: %.2f MB\n"
msgstr ""
-#: src/pacman/util.c:329
+#: src/pacman/util.c:336
#, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr ""
diff --git a/src/pacman/po/pt_BR.po b/src/pacman/po/pt_BR.po
index 7f019d48..cf307139 100644
--- a/src/pacman/po/pt_BR.po
+++ b/src/pacman/po/pt_BR.po
@@ -7,7 +7,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-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:17-0500\n"
"PO-Revision-Date: 2007-02-06 20:17-0500\n"
"Last-Translator: Dan McGee <pacman-dev@archlinux.org>\n"
"MIME-Version: 1.0\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/pacman/add.c:69 src/pacman/deptest.c:69 src/pacman/remove.c:79
-#: src/pacman/sync.c:442 src/pacman/sync.c:491
+#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
+#: src/pacman/sync.c:438 src/pacman/sync.c:487
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -32,13 +32,14 @@ msgstr ""
msgid "failed to add target '%s' (%s)"
msgstr ""
-#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:86
-#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
-#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+#: src/pacman/add.c:85 src/pacman/sync.c:194 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
msgid "done.\n"
msgstr ""
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr ""
@@ -48,68 +49,68 @@ msgstr ""
msgid ":: %s: requires %s"
msgstr ""
-#: src/pacman/add.c:118 src/pacman/sync.c:605
+#: src/pacman/add.c:118 src/pacman/sync.c:601
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ""
-#: src/pacman/add.c:127 src/pacman/sync.c:669
+#: src/pacman/add.c:127 src/pacman/sync.c:665
#, c-format
msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
msgstr ""
-#: src/pacman/add.c:134 src/pacman/sync.c:676
+#: src/pacman/add.c:134 src/pacman/sync.c:672
#, c-format
msgid "%s: %s%s exists in filesystem\n"
msgstr ""
-#: src/pacman/add.c:141 src/pacman/sync.c:683 src/pacman/sync.c:689
+#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
msgstr ""
-#: src/pacman/add.c:151 src/pacman/sync.c:612
+#: src/pacman/add.c:151 src/pacman/sync.c:608
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ""
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr ""
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:484
-#: src/pacman/sync.c:705
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
+#: src/pacman/sync.c:701
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr ""
-#: src/pacman/deptest.c:82
+#: src/pacman/deptest.c:70
msgid "memory allocation failure\n"
msgstr ""
-#: src/pacman/deptest.c:93
+#: src/pacman/deptest.c:81
#, c-format
msgid "add target %s\n"
msgstr ""
-#: src/pacman/deptest.c:96
+#: src/pacman/deptest.c:84
#, c-format
msgid "could not add target (%s)\n"
msgstr ""
-#: src/pacman/deptest.c:115
+#: src/pacman/deptest.c:103
#, c-format
msgid "requires: %s"
msgstr ""
-#: src/pacman/deptest.c:139
+#: src/pacman/deptest.c:127
#, c-format
msgid "conflict: %s"
msgstr ""
-#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
+#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
#, c-format
msgid "could not release transaction (%s)"
msgstr ""
@@ -134,11 +135,11 @@ msgstr ""
msgid "function"
msgstr ""
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "Y"
msgstr ""
-#: src/pacman/log.c:199
+#: src/pacman/log.c:201
msgid "YES"
msgstr ""
@@ -162,12 +163,12 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: src/pacman/package.c:68 src/pacman/package.c:118
+#: src/pacman/package.c:68 src/pacman/package.c:119
#, c-format
msgid "Name : %s\n"
msgstr ""
-#: src/pacman/package.c:69 src/pacman/package.c:119
+#: src/pacman/package.c:69 src/pacman/package.c:120
#, c-format
msgid "Version : %s\n"
msgstr ""
@@ -181,19 +182,19 @@ msgstr ""
msgid "License :"
msgstr ""
-#: src/pacman/package.c:72 src/pacman/package.c:120
+#: src/pacman/package.c:72 src/pacman/package.c:121
msgid "Groups :"
msgstr ""
-#: src/pacman/package.c:73 src/pacman/package.c:121
+#: src/pacman/package.c:73 src/pacman/package.c:122
msgid "Provides :"
msgstr ""
-#: src/pacman/package.c:74 src/pacman/package.c:122
+#: src/pacman/package.c:74 src/pacman/package.c:123
msgid "Depends On :"
msgstr ""
-#: src/pacman/package.c:75 src/pacman/package.c:123
+#: src/pacman/package.c:75 src/pacman/package.c:124
msgid "Removes :"
msgstr ""
@@ -201,7 +202,7 @@ msgstr ""
msgid "Required By :"
msgstr ""
-#: src/pacman/package.c:80 src/pacman/package.c:124
+#: src/pacman/package.c:80 src/pacman/package.c:125
msgid "Conflicts With :"
msgstr ""
@@ -253,61 +254,66 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/pacman/package.c:93 src/pacman/package.c:129
+#: src/pacman/package.c:93 src/pacman/package.c:130
#, c-format
msgid "Description : "
msgstr ""
-#: src/pacman/package.c:117
+#: src/pacman/package.c:118
#, c-format
msgid "Repository : %s\n"
msgstr ""
-#: src/pacman/package.c:125
+#: src/pacman/package.c:126
msgid "Replaces :"
msgstr ""
-#: src/pacman/package.c:126
+#: src/pacman/package.c:127
#, c-format
msgid "Download Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:127
+#: src/pacman/package.c:128
#, c-format
msgid "Installed Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:134
+#: src/pacman/package.c:135
#, c-format
msgid "MD5 Sum : %s"
msgstr ""
-#: src/pacman/package.c:137
+#: src/pacman/package.c:138
#, c-format
msgid "SHA1 Sum : %s"
msgstr ""
-#: src/pacman/package.c:168
+#: src/pacman/package.c:149
+#, c-format
+msgid "Backup Files :\n"
+msgstr ""
+
+#: src/pacman/package.c:169
#, c-format
msgid "error calculating checksums for %s\n"
msgstr ""
-#: src/pacman/package.c:181
+#: src/pacman/package.c:182
#, c-format
msgid "MODIFIED\t%s\n"
msgstr ""
-#: src/pacman/package.c:183
+#: src/pacman/package.c:184
#, c-format
msgid "Not Modified\t%s\n"
msgstr ""
-#: src/pacman/package.c:188
+#: src/pacman/package.c:189
#, c-format
msgid "MISSING\t\t%s\n"
msgstr ""
-#: src/pacman/package.c:221
+#: src/pacman/package.c:222
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr ""
@@ -329,27 +335,27 @@ msgstr ""
#: src/pacman/pacman.c:91
#, c-format
-msgid " %s {-R --remove} [options] <package>\n"
+msgid " %s {-F --freshen} [options] <file>\n"
msgstr ""
#: src/pacman/pacman.c:92
#, c-format
-msgid " %s {-U --upgrade} [options] <file>\n"
+msgid " %s {-Q --query} [options] [package]\n"
msgstr ""
#: src/pacman/pacman.c:93
#, c-format
-msgid " %s {-F --freshen} [options] <file>\n"
+msgid " %s {-R --remove} [options] <package>\n"
msgstr ""
#: src/pacman/pacman.c:94
#, c-format
-msgid " %s {-Q --query} [options] [package]\n"
+msgid " %s {-S --sync} [options] [package]\n"
msgstr ""
#: src/pacman/pacman.c:95
#, c-format
-msgid " %s {-S --sync} [options] [package]\n"
+msgid " %s {-U --upgrade} [options] <file>\n"
msgstr ""
#: src/pacman/pacman.c:96
@@ -373,12 +379,12 @@ msgstr ""
#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
#: src/pacman/pacman.c:138
#, c-format
-msgid " -d, --nodeps skip dependency checks\n"
+msgid " -d, --nodeps skip dependency checks\n"
msgstr ""
#: 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"
+msgid " -f, --force force install, overwrite conflicting files\n"
msgstr ""
#: src/pacman/pacman.c:104
@@ -389,23 +395,24 @@ msgstr ""
#: src/pacman/pacman.c:106
#, c-format
msgid ""
-" -c, --cascade remove packages and all packages that depend on them\n"
+" -c, --cascade remove packages and all packages that depend on them\n"
msgstr ""
#: 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 ""
#: src/pacman/pacman.c:109
#, c-format
-msgid " -n, --nosave remove configuration files as well\n"
+msgid " -n, --nosave remove configuration files as well\n"
msgstr ""
#: src/pacman/pacman.c:110
#, c-format
msgid ""
-" -s, --recursive remove dependencies also (that won't break packages)\n"
+" -s, --recursive remove dependencies also (that won't break packages)\n"
msgstr ""
#: src/pacman/pacman.c:113
@@ -425,65 +432,65 @@ msgstr ""
#: src/pacman/pacman.c:123
#, c-format
-msgid " -c, --changelog view the changelog of a package\n"
+msgid " -c, --changelog view the changelog of a package\n"
msgstr ""
#: src/pacman/pacman.c:124
#, c-format
msgid ""
-" -e, --orphans list all packages installed as dependencies but no "
+" -e, --orphans list all packages installed as dependencies but no "
"longer\n"
msgstr ""
#: src/pacman/pacman.c:125
#, c-format
-msgid " required by any package\n"
+msgid " required by any package\n"
msgstr ""
#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
#, c-format
-msgid " -g, --groups view all members of a package group\n"
+msgid " -g, --groups view all members of a package group\n"
msgstr ""
#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
#, c-format
-msgid " -i, --info view package information\n"
+msgid " -i, --info view package information\n"
msgstr ""
#: src/pacman/pacman.c:128
#, c-format
-msgid " -l, --list list the contents of the queried package\n"
+msgid " -l, --list list the contents of the queried package\n"
msgstr ""
#: src/pacman/pacman.c:129
#, c-format
msgid ""
-" -m, --foreign list all packages that were not found in the sync db"
+" -m, --foreign list all packages that were not found in the sync db"
"(s)\n"
msgstr ""
#: src/pacman/pacman.c:130
#, c-format
-msgid " -o, --owns <file> query the package that owns <file>\n"
+msgid " -o, --owns <file> query the package that owns <file>\n"
msgstr ""
#: src/pacman/pacman.c:131
#, c-format
msgid ""
-" -p, --file query the package file [package] instead of the "
+" -p, --file query the package file [package] instead of the "
"database\n"
msgstr ""
#: src/pacman/pacman.c:132
#, c-format
msgid ""
-" -s, --search search locally-installed packages for matching "
+" -s, --search search locally-installed packages for matching "
"strings\n"
msgstr ""
#: src/pacman/pacman.c:133
#, c-format
-msgid " -u, --upgrades list all packages that can be upgraded\n"
+msgid " -u, --upgrades list all packages that can be upgraded\n"
msgstr ""
#: src/pacman/pacman.c:135
@@ -494,149 +501,163 @@ msgstr ""
#: src/pacman/pacman.c:137
#, c-format
msgid ""
-" -c, --clean remove old packages from cache directory (use -cc for "
+" -c, --clean remove old packages from cache directory (use -cc for "
"all)\n"
msgstr ""
#: src/pacman/pacman.c:139
#, c-format
-msgid " -e, --dependsonly install dependencies only\n"
+msgid " -e, --dependsonly install dependencies only\n"
msgstr ""
#: src/pacman/pacman.c:143
#, c-format
msgid ""
-" -p, --print-uris print out URIs for given packages and their "
+" -p, --print-uris print out URIs for given packages and their "
"dependencies\n"
msgstr ""
#: src/pacman/pacman.c:144
#, c-format
-msgid " -s, --search search remote repositories for matching strings\n"
+msgid ""
+" -s, --search search remote repositories for matching strings\n"
msgstr ""
#: src/pacman/pacman.c:145
#, c-format
-msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
+msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
msgstr ""
#: src/pacman/pacman.c:146
#, c-format
msgid ""
-" -w, --downloadonly download packages but do not install/upgrade anything\n"
+" -w, --downloadonly download packages but do not install/upgrade "
+"anything\n"
msgstr ""
#: src/pacman/pacman.c:147
#, c-format
msgid ""
-" -y, --refresh download fresh package databases from the server\n"
+" -y, --refresh download fresh package databases from the server\n"
msgstr ""
#: src/pacman/pacman.c:148
#, c-format
msgid ""
-" --ignore <pkg> ignore a package upgrade (can be used more than once)\n"
+" --ignore <pkg> ignore a package upgrade (can be used more than "
+"once)\n"
msgstr ""
#: src/pacman/pacman.c:150
#, c-format
-msgid " --config <path> set an alternate configuration file\n"
+msgid " --config <path> set an alternate configuration file\n"
msgstr ""
#: src/pacman/pacman.c:151
#, c-format
-msgid " --noconfirm do not ask for anything confirmation\n"
+msgid " --noconfirm do not ask for anything confirmation\n"
msgstr ""
#: src/pacman/pacman.c:152
#, c-format
-msgid " --ask <number> pre-specify answers for questions (see manpage)\n"
+msgid ""
+" --ask <number> pre-specify answers for questions (see manpage)\n"
msgstr ""
#: src/pacman/pacman.c:153
#, c-format
msgid ""
-" --noprogressbar do not show a progress bar when downloading files\n"
+" --noprogressbar do not show a progress bar when downloading files\n"
msgstr ""
#: src/pacman/pacman.c:154
#, c-format
msgid ""
-" --noscriptlet do not execute the install scriptlet if there is any\n"
+" --noscriptlet do not execute the install scriptlet if there is any\n"
msgstr ""
#: src/pacman/pacman.c:155
#, c-format
-msgid " -v, --verbose be verbose\n"
+msgid " -v, --verbose be verbose\n"
msgstr ""
#: src/pacman/pacman.c:156
#, c-format
-msgid " -r, --root <path> set an alternate installation root\n"
+msgid " -r, --root <path> set an alternate installation root\n"
msgstr ""
#: src/pacman/pacman.c:157
#, c-format
-msgid " -b, --dbpath <path> set an alternate database location\n"
+msgid " -b, --dbpath <path> set an alternate database location\n"
msgstr ""
-#: src/pacman/pacman.c:170
+#: src/pacman/pacman.c:158
#, c-format
-msgid " This program may be freely redistributed under\n"
+msgid " --cachedir <dir> set an alternate database location\n"
msgstr ""
#: src/pacman/pacman.c:171
#, c-format
+msgid " This program may be freely redistributed under\n"
+msgstr ""
+
+#: src/pacman/pacman.c:172
+#, c-format
msgid " the terms of the GNU General Public License\n"
msgstr ""
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:299
+#, c-format
+msgid "'%s' is not a valid debug level"
+msgstr ""
+
+#: src/pacman/pacman.c:315
#, c-format
-msgid "error: '%s' is not a valid debug level"
+msgid "'%s' is not a valid cache directory\n"
msgstr ""
-#: src/pacman/pacman.c:334
+#: src/pacman/pacman.c:341
#, c-format
-msgid "error: '%s' is not a valid db path\n"
+msgid "'%s' is not a valid db path\n"
msgstr ""
-#: src/pacman/pacman.c:364
+#: src/pacman/pacman.c:371
#, c-format
-msgid "error: '%s' is not a valid root path\n"
+msgid "'%s' is not a valid root path\n"
msgstr ""
-#: src/pacman/pacman.c:391
+#: src/pacman/pacman.c:398
msgid "only one operation may be used at a time\n"
msgstr ""
-#: src/pacman/pacman.c:454
+#: src/pacman/pacman.c:461
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:487
+#: src/pacman/pacman.c:494
msgid "you cannot perform this operation unless you are root.\n"
msgstr ""
-#: src/pacman/pacman.c:503
+#: src/pacman/pacman.c:510
#, c-format
msgid "failed to parse config (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr ""
-#: src/pacman/pacman.c:519
+#: src/pacman/pacman.c:526
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:533
msgid "no targets specified (use -h for help)\n"
msgstr ""
-#: src/pacman/pacman.c:539
+#: src/pacman/pacman.c:546
msgid "no operation specified (use -h for help)\n"
msgstr ""
@@ -654,38 +675,38 @@ msgstr ""
msgid "No package owns %s\n"
msgstr ""
-#: src/pacman/query.c:122 src/pacman/sync.c:413
+#: src/pacman/query.c:119 src/pacman/sync.c:409
msgid "no usable package repositories configured.\n"
msgstr ""
-#: src/pacman/query.c:128
+#: src/pacman/query.c:125
msgid "Checking for package upgrades..."
msgstr ""
-#: src/pacman/query.c:135
+#: src/pacman/query.c:132
msgid "no upgrades found"
msgstr ""
-#: src/pacman/query.c:173
+#: src/pacman/query.c:170
#, c-format
msgid "group \"%s\" was not found\n"
msgstr ""
-#: src/pacman/query.c:184
+#: src/pacman/query.c:181
msgid "no package file was specified for --file\n"
msgstr ""
-#: src/pacman/query.c:188
+#: src/pacman/query.c:185
#, c-format
msgid "failed to load package '%s' (%s)\n"
msgstr ""
-#: src/pacman/query.c:226 src/pacman/query.c:263
+#: src/pacman/query.c:223 src/pacman/query.c:255
#, c-format
msgid "package \"%s\" not found\n"
msgstr ""
-#: src/pacman/remove.c:58 src/pacman/sync.c:528
+#: src/pacman/remove.c:58 src/pacman/sync.c:524
#, c-format
msgid ":: group %s:\n"
msgstr ""
@@ -699,7 +720,7 @@ msgstr ""
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ""
-#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
+#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
#, c-format
msgid "failed to init transaction (%s)\n"
msgstr ""
@@ -763,229 +784,221 @@ msgstr ""
msgid " %s is up to date\n"
msgstr ""
-#: src/pacman/sync.c:341
+#: src/pacman/sync.c:337
#, c-format
msgid "package \"%s\" was not found.\n"
msgstr ""
-#: src/pacman/sync.c:378
+#: src/pacman/sync.c:374
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr ""
-#: src/pacman/sync.c:450
+#: src/pacman/sync.c:446
msgid ":: Synchronizing package databases...\n"
msgstr ""
-#: src/pacman/sync.c:451
+#: src/pacman/sync.c:447
msgid "synchronizing package lists"
msgstr ""
-#: src/pacman/sync.c:453
+#: src/pacman/sync.c:449
msgid "failed to synchronize any databases"
msgstr ""
-#: src/pacman/sync.c:459
+#: src/pacman/sync.c:455
msgid ":: Starting full system upgrade...\n"
msgstr ""
-#: src/pacman/sync.c:460
+#: src/pacman/sync.c:456
msgid "starting full system upgrade"
msgstr ""
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:474
msgid ""
"\n"
":: pacman has detected a newer version of the \"pacman\" package.\n"
msgstr ""
-#: src/pacman/sync.c:479
+#: src/pacman/sync.c:475
msgid ":: It is recommended that you allow pacman to upgrade itself\n"
msgstr ""
-#: src/pacman/sync.c:480
+#: src/pacman/sync.c:476
msgid ":: first, then you can re-run the operation with the newer version.\n"
msgstr ""
-#: src/pacman/sync.c:482
+#: src/pacman/sync.c:478
msgid ":: Upgrade pacman first? [Y/n] "
msgstr ""
-#: src/pacman/sync.c:497
+#: src/pacman/sync.c:493
#, c-format
msgid "pacman: %s\n"
msgstr ""
-#: src/pacman/sync.c:517
+#: src/pacman/sync.c:513
#, c-format
msgid "'%s': %s\n"
msgstr ""
-#: src/pacman/sync.c:532
+#: src/pacman/sync.c:528
msgid ":: Install whole content? [Y/n] "
msgstr ""
-#: src/pacman/sync.c:539
+#: src/pacman/sync.c:535
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ""
-#: src/pacman/sync.c:563
+#: src/pacman/sync.c:559
#, c-format
msgid "'%s': not found in sync db\n"
msgstr ""
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "requires"
msgstr ""
-#: src/pacman/sync.c:583
+#: src/pacman/sync.c:579
msgid "is required by"
msgstr ""
-#: src/pacman/sync.c:625
+#: src/pacman/sync.c:621
msgid "local database is up to date\n"
msgstr ""
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:630
msgid ""
"\n"
"Beginning download...\n"
msgstr ""
-#: src/pacman/sync.c:638
+#: src/pacman/sync.c:634
msgid "Proceed with download? [Y/n] "
msgstr ""
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:642
msgid ""
"\n"
"Beginning upgrade process...\n"
msgstr ""
-#: src/pacman/sync.c:650
+#: src/pacman/sync.c:646
msgid "Proceed with installation? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:57
-msgid "] 100% LOCAL "
-msgstr ""
-
-#: src/pacman/trans.c:68
+#: src/pacman/trans.c:52
msgid "checking dependencies... "
msgstr ""
-#: src/pacman/trans.c:72
+#: src/pacman/trans.c:56
msgid "checking for file conflicts... "
msgstr ""
-#: src/pacman/trans.c:76
+#: src/pacman/trans.c:60
msgid "cleaning up... "
msgstr ""
-#: src/pacman/trans.c:79
+#: src/pacman/trans.c:63
msgid "resolving dependencies... "
msgstr ""
-#: src/pacman/trans.c:82
+#: src/pacman/trans.c:66
msgid "looking for inter-conflicts... "
msgstr ""
-#: src/pacman/trans.c:102
+#: src/pacman/trans.c:86
#, c-format
msgid "installing %s... "
msgstr ""
-#: src/pacman/trans.c:109
+#: src/pacman/trans.c:93
#, c-format
msgid "installed %s (%s)"
msgstr ""
-#: src/pacman/trans.c:116
+#: src/pacman/trans.c:100
#, c-format
msgid "removing %s... "
msgstr ""
-#: src/pacman/trans.c:123
+#: src/pacman/trans.c:107
#, c-format
msgid "removed %s (%s)"
msgstr ""
-#: src/pacman/trans.c:130
+#: src/pacman/trans.c:114
#, c-format
msgid "upgrading %s... "
msgstr ""
-#: src/pacman/trans.c:137
+#: src/pacman/trans.c:121
#, c-format
msgid "upgraded %s (%s -> %s)"
msgstr ""
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:128
msgid "checking package integrity... "
msgstr ""
-#: src/pacman/trans.c:158
-msgid " done.\n"
-msgstr ""
-
-#: src/pacman/trans.c:160
-msgid " failed.\n"
+#: src/pacman/trans.c:144
+msgid "failed.\n"
msgstr ""
-#: src/pacman/trans.c:167
+#: src/pacman/trans.c:151
#, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ""
-#: src/pacman/trans.c:190
+#: src/pacman/trans.c:171
#, c-format
msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:204
+#: src/pacman/trans.c:185
#, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:217
+#: src/pacman/trans.c:198
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:232
+#: src/pacman/trans.c:213
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:248
+#: src/pacman/trans.c:229
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:266
+#: src/pacman/trans.c:247
#, c-format
msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:284
+#: src/pacman/trans.c:265
#, c-format
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ""
-#: src/pacman/trans.c:333
+#: src/pacman/trans.c:314
msgid "installing"
msgstr ""
-#: src/pacman/trans.c:336
+#: src/pacman/trans.c:317
msgid "upgrading"
msgstr ""
-#: src/pacman/trans.c:339
+#: src/pacman/trans.c:320
msgid "removing"
msgstr ""
-#: src/pacman/trans.c:342
+#: src/pacman/trans.c:323
msgid "checking for file conflicts"
msgstr ""
@@ -994,25 +1007,25 @@ msgstr ""
msgid "None\n"
msgstr ""
-#: src/pacman/util.c:303
+#: src/pacman/util.c:310
msgid "Remove:"
msgstr ""
-#: src/pacman/util.c:311
+#: src/pacman/util.c:318
#, c-format
msgid ""
"\n"
"Total Removed Size: %.2f MB\n"
msgstr ""
-#: src/pacman/util.c:322
+#: src/pacman/util.c:329
#, c-format
msgid ""
"\n"
"Total Package Size: %.2f MB\n"
msgstr ""
-#: src/pacman/util.c:329
+#: src/pacman/util.c:336
#, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr ""