summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-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
12 files changed, 1323 insertions, 1135 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);