summaryrefslogtreecommitdiff
path: root/lib/libalpm/po
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-12-02 21:42:41 -0600
committerDan McGee <dan@archlinux.org>2007-12-02 21:44:40 -0600
commit3170106149ce21d3ba5c68fc134672f08ddf793b (patch)
treed72ca18e484307ad2f9d2846f56271e765d4ee14 /lib/libalpm/po
parent594f1fbbb1c6aa64368c01d92ab5d7533e4e9cfa (diff)
downloadpacman-3170106149ce21d3ba5c68fc134672f08ddf793b.tar.xz
Update all translation files in anticipation of 3.1 release
Update all of the pot and po files with the latest messages available. Translators- you are encouraged to do this as well every time you update the translation, and the directions in 'translation-help' should help. Also feel free to delete all the old translations that end up at the bottom of these files and only clutter things up. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/po')
-rw-r--r--lib/libalpm/po/de.po773
-rw-r--r--lib/libalpm/po/en_GB.po326
-rw-r--r--lib/libalpm/po/es.po763
-rw-r--r--lib/libalpm/po/fr.po768
-rw-r--r--lib/libalpm/po/hu.po771
-rw-r--r--lib/libalpm/po/it.po303
-rw-r--r--lib/libalpm/po/libalpm.pot518
-rw-r--r--lib/libalpm/po/pl_PL.po762
-rw-r--r--lib/libalpm/po/pt_BR.po661
-rw-r--r--lib/libalpm/po/ru_RU.po732
10 files changed, 3651 insertions, 2726 deletions
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 2b9eb692..e444ba18 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-07-11 00:26-0400\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-04-17 20:26+0200\n"
"Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
"Language-Team: German <archlinux.de>\n"
@@ -20,609 +20,730 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.4\n"
"X-Generator: KBabel 1.11.4\n"
-#: lib/libalpm/add.c:118
-#, c-format
-msgid "replacing older version %s-%s by %s in target list"
+#: lib/libalpm/add.c:88
+#, fuzzy, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste"
-#: lib/libalpm/add.c:127
-#, c-format
-msgid "newer version %s-%s is in the target list -- skipping"
+#: lib/libalpm/add.c:97
+#, fuzzy, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr "Neuere Version %s-%s ist in der Ziel-Liste -- Überspringe"
-#: lib/libalpm/add.c:201
-msgid "replacing packages with -A and -U is not supported yet"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+
+#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
+#, fuzzy
+msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "Das Ersetzen von Paketen mit -A und -U wird noch nicht unterstützt"
-#: lib/libalpm/add.c:202
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
+
+#: lib/libalpm/add.c:365
#, c-format
-msgid "please remove '%s' first, using -Rd"
-msgstr "Entfernen Sie bitte zuerst '%s' mit -Rd"
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o package: %o\n"
+msgstr ""
-#: lib/libalpm/add.c:428 lib/libalpm/trans.c:609
-msgid "could not get current working directory"
-msgstr "Konnte aktuelles Arbeitsverzeichnis nicht ermitteln"
+#: lib/libalpm/add.c:392
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr ""
-#: lib/libalpm/add.c:619
+#: lib/libalpm/add.c:399
#, c-format
-msgid "could not rename %s (%s)"
-msgstr "Konnte %s nicht umbenennen (%s)"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr ""
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:646
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
#, c-format
-msgid "could not copy tempfile to %s (%s)"
+msgid "could not extract %s (%s)\n"
+msgstr "Konnte %s nicht entpacken (%s)\n"
+
+#: lib/libalpm/add.c:505
+#, fuzzy, c-format
+msgid "could not rename %s (%s)\n"
+msgstr "Konnte %s nicht umbenennen (%s)"
+
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)\n"
msgstr "Konnte temporäre Datei nicht nach %s kopieren (%s)"
-#: lib/libalpm/add.c:631 lib/libalpm/remove.c:241
-#, c-format
-msgid "%s saved as %s"
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#, fuzzy, c-format
+msgid "%s saved as %s\n"
msgstr "%s gespeichert als %s"
-#: lib/libalpm/add.c:670
-#, c-format
-msgid "could not install %s as %s: %s"
+#: lib/libalpm/add.c:556
+#, fuzzy, c-format
+msgid "could not install %s as %s: %s\n"
msgstr "Konnte %s nicht als %s installieren: %s"
-#: lib/libalpm/add.c:673
-#, c-format
-msgid "%s installed as %s"
+#: lib/libalpm/add.c:559
+#, fuzzy, c-format
+msgid "%s installed as %s\n"
msgstr "%s installiert als %s"
-#: lib/libalpm/add.c:689
-#, c-format
-msgid "extracting %s as %s.pacnew"
+#: lib/libalpm/add.c:576
+#, fuzzy, c-format
+msgid "extracting %s as %s.pacnew\n"
msgstr "Entpacke %s als %s.pacnew"
-#: lib/libalpm/add.c:721
-#, c-format
-msgid "could not extract %s (%s)"
-msgstr "Konnte %s nicht entpacken (%s)"
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, fuzzy
+msgid "could not get current working directory\n"
+msgstr "Konnte aktuelles Arbeitsverzeichnis nicht ermitteln"
-#: lib/libalpm/add.c:772
-#, c-format
-msgid "problem occurred while upgrading %s"
+#: lib/libalpm/add.c:765
+#, fuzzy, c-format
+msgid "problem occurred while upgrading %s\n"
msgstr "Fehler traten auf, während %s aktualisiert wurde"
-#: lib/libalpm/add.c:777
-#, c-format
-msgid "problem occurred while installing %s"
+#: lib/libalpm/add.c:770
+#, fuzzy, c-format
+msgid "problem occurred while installing %s\n"
msgstr "Fehler traten auf, während %s installiert wurde"
-#: lib/libalpm/add.c:815
-#, c-format
-msgid "could not update provision '%s' from '%s'"
-msgstr "Konnte Bereitstellung '%s' von '%s' nicht aktualisieren"
-
-#: lib/libalpm/add.c:835
-#, c-format
-msgid "could not update database entry %s-%s"
+#: lib/libalpm/add.c:785
+#, fuzzy, c-format
+msgid "could not update database entry %s-%s\n"
msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren"
-#: lib/libalpm/add.c:843
-#, c-format
-msgid "could not add entry '%s' in cache"
+#: lib/libalpm/add.c:793
+#, fuzzy, c-format
+msgid "could not add entry '%s' in cache\n"
msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen"
-#: lib/libalpm/be_files.c:83
-#, c-format
-msgid "%s: description file is missing"
-msgstr "%s: Beschreibungsdatei fehlt"
-
-#: lib/libalpm/be_files.c:88
-#, c-format
-msgid "%s: dependency file is missing"
-msgstr "%s: Abhängige Datei fehlt"
-
-#: lib/libalpm/be_files.c:93
-#, c-format
-msgid "%s: file list is missing"
-msgstr "%s: Dateiliste fehlt"
-
-#: lib/libalpm/be_files.c:216
-#, c-format
-msgid "invalid name for database entry '%s'"
+#: lib/libalpm/be_files.c:223
+#, fuzzy, c-format
+msgid "invalid name for database entry '%s'\n"
msgstr "Falscher Name für Datenbank-Eintrag '%s'"
-#: lib/libalpm/be_files.c:271
-#, c-format
-msgid "loading package data for %s : level=%d"
+#: lib/libalpm/be_files.c:275
+#, fuzzy, c-format
+msgid "loading package data for %s : level=%d\n"
msgstr "Lade Paket-Daten für %s : level=%d"
-#: lib/libalpm/be_files.c:288 lib/libalpm/be_files.c:434
-#: lib/libalpm/be_files.c:457 lib/libalpm/be_files.c:549
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:419
-#, c-format
-msgid "could not open file %s: %s"
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
+#, fuzzy, c-format
+msgid "could not open file %s: %s\n"
msgstr "Konnte Datei %s nicht öffnen: %s"
-#: lib/libalpm/cache.c:63
-#, c-format
-msgid "adding '%s' to package cache for db '%s'"
+#: lib/libalpm/cache.c:62
+#, fuzzy, c-format
+msgid "adding '%s' to package cache for db '%s'\n"
msgstr "Füge '%s' zum Paketpuffer der Datenbank '%s' hinzu"
-#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:80 lib/libalpm/deps.c:449
-#: lib/libalpm/deps.c:650 lib/libalpm/deps.c:690 lib/libalpm/group.c:44
-#: lib/libalpm/handle.c:50 lib/libalpm/package.c:297 lib/libalpm/sync.c:62
-#: lib/libalpm/sync.c:612 lib/libalpm/sync.c:628 lib/libalpm/trans.c:223
-#, c-format
-msgid "malloc failure: could not allocate %d bytes"
-msgstr "malloc-Fehler: Konnte %d Bytes nicht zuweisen"
-
-#: lib/libalpm/db.c:238
-#, c-format
-msgid "could not remove database entry %s%s"
+#: lib/libalpm/db.c:285
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s\n"
msgstr "Konnte Datenbankeintrag %s%s nicht entfernen"
-#: lib/libalpm/db.c:432 lib/libalpm/sync.c:128
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
-msgstr "%s-%s: Ignoriere zu aktualisierendes Packet (zu ersetzen durch %s-%s)"
-
-#: lib/libalpm/db.c:553 lib/libalpm/db.c:560
-#, c-format
-msgid "malloc failed: could not allocate %d bytes"
-msgstr "malloc fehlgeschlagen: Konnte %d Bytes nicht zuweisen"
-
-#: lib/libalpm/db.c:661
-msgid "attempt to re-register the 'local' DB"
+#: lib/libalpm/db.c:553
+#, fuzzy
+msgid "attempt to re-register the 'local' DB\n"
msgstr "Versuche die lokale Datenbank neu zu registrieren"
-#: lib/libalpm/db.c:680
-msgid "database path is undefined"
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
+#, fuzzy
+msgid "database path is undefined\n"
msgstr "Datenbank-Pfad ist nicht definiert"
-#: lib/libalpm/deps.c:187
-msgid "dependency cycle detected\n"
+#: lib/libalpm/deps.c:173
+#, fuzzy
+msgid "dependency cycle detected:\n"
msgstr "Abhängigkeits-Zyklus entdeckt\n"
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:175
#, c-format
-msgid ""
-"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid "%s will be removed after its %s dependency\n"
msgstr ""
-"Kann Abhängigkeiten für \"%s\" nicht auflösen (\"%s\" ist nicht in "
-"Paketliste enthalten)"
-#: lib/libalpm/deps.c:687
+#: lib/libalpm/deps.c:177
#, c-format
-msgid "cannot resolve dependencies for \"%s\""
+msgid "%s will be installed before its %s dependency\n"
+msgstr ""
+
+#: lib/libalpm/deps.c:573
+#, fuzzy, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "Kann Abhängigkeiten für \"%s\" nicht auflösen"
-#: lib/libalpm/error.c:38
+#: lib/libalpm/error.c:43
msgid "out of memory!"
msgstr "Speicher ist voll!"
-#: lib/libalpm/error.c:40
+#: lib/libalpm/error.c:45
msgid "unexpected system error"
msgstr "Unerwarteter Systemfehler"
-#: lib/libalpm/error.c:42
+#: lib/libalpm/error.c:47
msgid "insufficient privileges"
msgstr "Unzureichende Rechte"
-#: lib/libalpm/error.c:44
+#: lib/libalpm/error.c:49
msgid "could not find or read file"
msgstr "Konnte Datei nicht finden oder lesen"
-#: lib/libalpm/error.c:46
+#: lib/libalpm/error.c:51
+#, fuzzy
+msgid "could not find or read directory"
+msgstr "Konnte Datei nicht finden oder lesen"
+
+#: lib/libalpm/error.c:53
msgid "wrong or NULL argument passed"
msgstr "Falsches oder NULL-Argument übergeben"
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:56
msgid "library not initialized"
msgstr "Bibliothek nicht initialisiert"
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:58
msgid "library already initialized"
msgstr "Bibliothek bereits initialisiert"
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:60
msgid "unable to lock database"
msgstr "Kann Datenbank nicht sperren"
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:63
msgid "could not open database"
msgstr "Konnte Datenbank nicht öffnen"
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:65
msgid "could not create database"
msgstr "Konnte Datenbank nicht erstellen"
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:67
msgid "database not initialized"
msgstr "Datenbank nicht initialisiert"
-#: lib/libalpm/error.c:62
+#: lib/libalpm/error.c:69
msgid "database already registered"
msgstr "Datenbank bereits registriert"
-#: lib/libalpm/error.c:64
+#: lib/libalpm/error.c:71
msgid "could not find database"
msgstr "Konnte Datenbank nicht finden"
-#: lib/libalpm/error.c:66
+#: lib/libalpm/error.c:73
msgid "could not update database"
msgstr "Konnte Datenbank nicht aktualisieren"
-#: lib/libalpm/error.c:68
+#: lib/libalpm/error.c:75
msgid "could not remove database entry"
msgstr "Konnte Datenbank-Eintrag nicht entfernen"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:78
msgid "invalid url for server"
msgstr "Ungültige URL für den Server"
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:85
msgid "could not set parameter"
msgstr "Konnte Parameter nicht setzen"
-#: lib/libalpm/error.c:81
+#: lib/libalpm/error.c:88
msgid "transaction already initialized"
msgstr "Vorgang bereits gestartet"
-#: lib/libalpm/error.c:83 lib/libalpm/error.c:87
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr "Vorgang nicht gestartet"
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:92
msgid "duplicate target"
msgstr "Doppelte Ziele"
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:96
msgid "transaction not prepared"
msgstr "Vorgang nicht vorbereitet"
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "transaction aborted"
msgstr "Vorgang abgebrochen"
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "operation not compatible with the transaction type"
msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel"
-#: lib/libalpm/error.c:95 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:102
msgid "could not commit transaction"
msgstr "Konnte den Vorgang nicht durchführen"
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "could not download all files"
msgstr "Konnte nicht alle Dateien herunterladen"
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:107
msgid "could not find or read package"
msgstr "Konnte Paket nicht finden oder lesen"
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:109
msgid "invalid or corrupted package"
msgstr "Ungültiges oder beschädigtes Paket"
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:111
msgid "cannot open package file"
msgstr "Kann Paketdatei nicht öffnen"
-#: lib/libalpm/error.c:106
+#: lib/libalpm/error.c:113
msgid "cannot load package data"
msgstr "Kann Paketdaten nicht laden"
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:115
msgid "package already installed"
msgstr "Paket ist bereits installiert"
-#: lib/libalpm/error.c:110
+#: lib/libalpm/error.c:117
msgid "package not installed or lesser version"
msgstr "Paket ist nicht installiert oder ältere Version"
-#: lib/libalpm/error.c:112
+#: lib/libalpm/error.c:119
msgid "cannot remove all files for package"
msgstr "Konnte nicht alle Dateien des Paketes entfernen"
-#: lib/libalpm/error.c:114
+#: lib/libalpm/error.c:121
msgid "package name is not valid"
msgstr "Paketname ist nicht gültig"
-#: lib/libalpm/error.c:116
+#: lib/libalpm/error.c:123
msgid "corrupted package"
msgstr "Beschädigtes Paket"
-#: lib/libalpm/error.c:118
+#: lib/libalpm/error.c:125
msgid "no such repository"
msgstr "Kein solches Repositorium"
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:128
+#, fuzzy
+msgid "corrupted delta"
+msgstr "Beschädigtes Paket"
+
+#: lib/libalpm/error.c:130
+msgid "delta patch failed"
+msgstr ""
+
+#: lib/libalpm/error.c:133
msgid "group not found"
msgstr "Gruppe nicht gefunden"
-#: lib/libalpm/error.c:124
+#: lib/libalpm/error.c:136
msgid "could not satisfy dependencies"
msgstr "Kann Abhängigkeiten nicht erfüllen"
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:138
msgid "conflicting dependencies"
msgstr "In Konflikt stehende Abhängigkeiten"
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:140
msgid "conflicting files"
msgstr "In Konflikt stehende Dateien"
-#: lib/libalpm/error.c:131
+#: lib/libalpm/error.c:143
msgid "user aborted the operation"
msgstr "Benutzer brach die Aktion ab"
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:145
msgid "internal error"
msgstr "Interner Fehler"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:147
msgid "libarchive error"
msgstr "libarchive-Fehler"
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:150
msgid "not confirmed"
msgstr "Nicht bestätigt"
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:152
msgid "invalid regular expression"
msgstr "Ungültiger Regulärer Ausdruck"
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:155
msgid "connection to remote host failed"
msgstr "Verbindung zum Server fehlgeschlagen"
-#: lib/libalpm/error.c:146
+#: lib/libalpm/error.c:158
msgid "unexpected error"
msgstr "Unerwarteter Fehler"
-#: lib/libalpm/handle.c:140
-#, c-format
-msgid "cannot canonicalize specified root path '%s'"
-msgstr "Kann das spezifizierte Wurzelverzeichnis '%s' nicht anerkennen"
-
-#: lib/libalpm/md5driver.c:69
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: %s kann nicht geöffnet werden\n"
-
-#: lib/libalpm/package.c:129
-#, c-format
-msgid "could not get sha1sum for package %s-%s"
-msgstr "Konnte SHA1-Prüfsumme für Paket %s-%s nicht ermitteln"
-
-#: lib/libalpm/package.c:138
-#, c-format
-msgid "sha1sums do not match for package %s-%s"
-msgstr "SHA1-Prüfsummen für Paket %s-%s stimmen nicht überein"
-
-#: lib/libalpm/package.c:180
-#, c-format
-msgid "could not get md5sum for package %s-%s"
+#: lib/libalpm/package.c:124
+#, fuzzy, c-format
+msgid "could not get md5sum for package %s-%s\n"
msgstr "Konnte MD5-Prüfsumme für Paket %s-%s nicht ermitteln"
-#: lib/libalpm/package.c:189
-#, c-format
-msgid "md5sums do not match for package %s-%s"
+#: lib/libalpm/package.c:133
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s\n"
msgstr "MD5-Prüfsummen für Paket %s-%s stimmen nicht überein"
-#: lib/libalpm/package.c:360
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
-
-#: lib/libalpm/package.c:369
-#, c-format
-msgid "%s: forcing upgrade to version %s"
+#: lib/libalpm/package.c:737
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s\n"
msgstr "%s: Erzwungene Aktualisierung auf Version %s"
-#: lib/libalpm/package.c:374
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
+#: lib/libalpm/package.c:742
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)"
-#: lib/libalpm/package.c:382
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
+#: lib/libalpm/package.c:750
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)\n"
msgstr "%s-%s: Verzögere die Aktualisierung von Paket (%s)"
-#: lib/libalpm/package.c:564
-msgid "could not parse the package description file"
+#: lib/libalpm/package.c:931
+#, fuzzy, c-format
+msgid "could not parse package description file in %s\n"
msgstr "Konnte Paket-Beschreibungsdatei nicht analysieren"
-#: lib/libalpm/package.c:568
-#, c-format
-msgid "missing package name in %s"
+#: lib/libalpm/package.c:936
+#, fuzzy, c-format
+msgid "missing package name in %s\n"
msgstr "Fehlender Paketname in %s"
-#: lib/libalpm/package.c:572
-#, c-format
-msgid "missing package version in %s"
+#: lib/libalpm/package.c:940
+#, fuzzy, c-format
+msgid "missing package version in %s\n"
msgstr "Fehlende Paketversion in %s"
-#: lib/libalpm/package.c:607
-#, c-format
-msgid "could not remove tempfile %s"
+#: lib/libalpm/package.c:970
+#, fuzzy, c-format
+msgid "could not remove tempfile %s\n"
msgstr "Konnte tempfile %s nicht entfernen"
-#: lib/libalpm/package.c:623 lib/libalpm/package.c:630
-#, c-format
-msgid "error while reading package: %s"
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#, fuzzy, c-format
+msgid "error while reading package %s: %s\n"
msgstr "Fehler beim Lesen des Paketes: %s"
-#: lib/libalpm/package.c:636
-msgid "missing package metadata"
+#: lib/libalpm/package.c:1005
+#, fuzzy, c-format
+msgid "missing package metadata in %s\n"
msgstr "Fehlende Paket-Metadaten"
-#: lib/libalpm/package.c:643
-#, c-format
-msgid "missing package filelist in %s, generating one"
+#: lib/libalpm/package.c:1012
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one\n"
msgstr "Fehlende Paket-Dateiliste in %s, erstelle eine"
-#: lib/libalpm/remove.c:117
-#, c-format
-msgid "could not find %s in database -- skipping"
+#: lib/libalpm/remove.c:121
+#, fuzzy, c-format
+msgid "could not find %s in database -- skipping\n"
msgstr "Konnte %s nicht in Datenbank finden -- Überspringe"
-#: lib/libalpm/remove.c:168
-#, c-format
-msgid "cannot remove file '%s': %s"
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s\n"
msgstr "Kann Datei '%s' nicht entfernen: %s"
-#: lib/libalpm/remove.c:255
-#, c-format
-msgid "cannot remove file %s: %s"
-msgstr "Kann Datei %s nicht entfernen: %s"
-
-#: lib/libalpm/remove.c:338
-#, c-format
-msgid "could not remove database entry %s-%s"
+#: lib/libalpm/remove.c:337
+#, fuzzy, c-format
+msgid "could not remove database entry %s-%s\n"
msgstr "Konnte Datenbank-Eintrag %s-%s nicht entfernen"
-#: lib/libalpm/remove.c:343
-#, c-format
-msgid "could not remove entry '%s' from cache"
+#: lib/libalpm/remove.c:342
+#, fuzzy, c-format
+msgid "could not remove entry '%s' from cache\n"
msgstr "Konnte Eintrag '%s' nicht aus dem Puffer entfernen"
-#: lib/libalpm/sha1.c:409
+#: lib/libalpm/server.c:56
#, c-format
-msgid "sha1: %s can't be opened\n"
-msgstr "sha1: %s kann nicht geöffnet werden\n"
+msgid "url '%s' is invalid, ignoring\n"
+msgstr ""
-#: lib/libalpm/sync.c:294
-#, c-format
-msgid "repository '%s' not found"
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
+msgstr ""
+
+#: lib/libalpm/server.c:241
+msgid "disk"
+msgstr ""
+
+#: lib/libalpm/server.c:245
+#, fuzzy, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "Konnte manche Dateien von %s nicht übertragen\n"
+
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "Kann Datei '%s' nicht entfernen: %s"
+
+#: lib/libalpm/server.c:307
+#, fuzzy, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "Fehler beim Lesen des Paketes: %s"
+
+#: lib/libalpm/server.c:319
+#, fuzzy, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "Kann Datei '%s' nicht entfernen: %s"
+
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "Konnte nicht zu Verzeichnis / wechseln (%s)"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
+#, fuzzy, c-format
+msgid "failed to download %s\n"
+msgstr "Konnte nicht alle Dateien herunterladen"
+
+#: lib/libalpm/sync.c:135
+#, fuzzy, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s: Ignoriere zu aktualisierendes Packet (zu ersetzen durch %s-%s)"
+
+#: lib/libalpm/sync.c:250
+#, fuzzy, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
+
+#: lib/libalpm/sync.c:320
+#, fuzzy, c-format
+msgid "repository '%s' not found\n"
msgstr "Repositorium '%s' nicht gefunden"
-#: lib/libalpm/sync.c:335
-#, c-format
-msgid "%s-%s is up to date -- skipping"
+#: lib/libalpm/sync.c:354
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s ist aktuell -- Überspringe"
-#: lib/libalpm/sync.c:608 lib/libalpm/sync.c:624
-msgid "unresolvable package conflicts detected"
-msgstr "Nicht lösbare Paketkonflikte gefunden"
+#: lib/libalpm/sync.c:358
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s ist aktuell -- Überspringe"
-#: lib/libalpm/sync.c:778
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+#, fuzzy
+msgid "unresolvable package conflicts detected\n"
+msgstr "Nicht lösbare Paketkonflikte gefunden"
-#: lib/libalpm/sync.c:804
-msgid "couldn't create package cache, using /tmp instead"
-msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp"
+#: lib/libalpm/sync.c:628
+#, fuzzy, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "malloc-Fehler: Konnte %d Bytes nicht zuweisen"
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:825
#, c-format
-msgid "failed to retrieve some files from %s\n"
-msgstr "Konnte manche Dateien von %s nicht übertragen\n"
+msgid "command: %s\n"
+msgstr ""
-#: lib/libalpm/sync.c:839 lib/libalpm/sync.c:861
-#, c-format
-msgid "can't get md5 or sha1 checksum for package %s\n"
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#, fuzzy, c-format
+msgid "can't get md5 checksum for file %s\n"
msgstr "Kann MD5- oder SHA1-Prüfsumme für Paket %s nicht ermitteln\n"
-#: lib/libalpm/sync.c:878
-#, c-format
-msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
+#: lib/libalpm/sync.c:910
+#, fuzzy, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr "Archiv %s war beschädigt (falsche MD5- oder SHA1-Prüfsumme)\n"
-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:1056
#, 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"
+msgid "failed to retrieve some files from %s\n"
+msgstr "Konnte manche Dateien von %s nicht übertragen\n"
-#: lib/libalpm/sync.c:901
-msgid "could not create removal transaction"
+#: lib/libalpm/sync.c:1137
+#, fuzzy
+msgid "could not create removal transaction\n"
msgstr "Konnte den Lösch-Vorgang nicht erstellen"
-#: lib/libalpm/sync.c:907
-msgid "could not initialize the removal transaction"
+#: lib/libalpm/sync.c:1143
+#, fuzzy
+msgid "could not initialize the removal transaction\n"
msgstr "Konnte den Lösch-Vorgang nicht beginnen"
-#: lib/libalpm/sync.c:929
-msgid "could not prepare removal transaction"
+#: lib/libalpm/sync.c:1165
+#, fuzzy
+msgid "could not prepare removal transaction\n"
msgstr "Konnte Lösch-Vorgang nicht vorbereiten"
-#: lib/libalpm/sync.c:935
-msgid "could not commit removal transaction"
+#: lib/libalpm/sync.c:1171
+#, fuzzy
+msgid "could not commit removal transaction\n"
msgstr "Konnte Lösch-Vorgang nicht durchführen"
-#: lib/libalpm/sync.c:946
-msgid "could not create transaction"
+#: lib/libalpm/sync.c:1182
+#, fuzzy
+msgid "could not create transaction\n"
msgstr "Konnte den Vorgang nicht erstellen"
-#: lib/libalpm/sync.c:951
-msgid "could not initialize transaction"
+#: lib/libalpm/sync.c:1187
+#, fuzzy
+msgid "could not initialize transaction\n"
msgstr "Konnte den Vorgang nicht beginnen"
-#: lib/libalpm/sync.c:980
-msgid "could not prepare transaction"
+#: lib/libalpm/sync.c:1214
+#, fuzzy
+msgid "could not prepare transaction\n"
msgstr "Konnte den Vorgang nicht vorbereiten"
-#: lib/libalpm/sync.c:1022
-#, c-format
-msgid "could not update requiredby for database entry %s-%s"
-msgstr "Konnte requiredby für Datenbank-Eintrag %s-%s nicht aktualisieren"
-
-#: lib/libalpm/sync.c:1031
-#, c-format
-msgid "could not update new database entry %s-%s"
-msgstr "Konnte neuen Datenbank-Eintrag %s-%s nicht aktualisieren"
+#: lib/libalpm/sync.c:1219
+#, fuzzy
+msgid "could not commit transaction\n"
+msgstr "Konnte den Vorgang nicht durchführen"
-#: lib/libalpm/trans.c:205
-#, c-format
-msgid "could not remove lock file %s"
+#: lib/libalpm/trans.c:214
+#, fuzzy, c-format
+msgid "could not remove lock file %s\n"
msgstr "Konnte Sperrdatei %s nicht entfernen"
-#: lib/libalpm/trans.c:498 lib/libalpm/trans.c:528
+#: lib/libalpm/trans.c:483
#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
-msgstr "Konnte requiredby-Eintrag %s-%s nicht aktualisieren"
+msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
+msgstr ""
-#: lib/libalpm/trans.c:589
-msgid "could not create temp directory"
+#: lib/libalpm/trans.c:494
+#, fuzzy
+msgid "could not create temp directory\n"
msgstr "Konnte temp-Verzeichnis nicht erstellen"
-#: lib/libalpm/trans.c:616
-#, c-format
-msgid "could not change directory to %s (%s)"
+#: lib/libalpm/trans.c:536
+#, fuzzy, c-format
+msgid "could not change directory to %s (%s)\n"
msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)"
-#: lib/libalpm/trans.c:633
-#, c-format
-msgid "could not fork a new process (%s)"
+#: lib/libalpm/trans.c:554
+#, fuzzy, c-format
+msgid "could not fork a new process (%s)\n"
msgstr "Konnte keinen neuen Prozess starten (%s)"
-#: lib/libalpm/trans.c:641
-#, c-format
-msgid "could not change the root directory (%s)"
+#: lib/libalpm/trans.c:564
+#, fuzzy, c-format
+msgid "could not change the root directory (%s)\n"
msgstr "Konnte root-Verzeichnis nicht wechseln (%s)"
-#: lib/libalpm/trans.c:645
-#, c-format
-msgid "could not change directory to / (%s)"
+#: lib/libalpm/trans.c:569
+#, fuzzy, c-format
+msgid "could not change directory to / (%s)\n"
msgstr "Konnte nicht zu Verzeichnis / wechseln (%s)"
-#: lib/libalpm/trans.c:654
-#, c-format
-msgid "call to waitpid failed (%s)"
+#: lib/libalpm/trans.c:578
+#, fuzzy, c-format
+msgid "call to popen failed (%s)"
msgstr "Aufruf von 'waitpid' fehlgeschlagen (%s)"
-#: lib/libalpm/trans.c:663
-#, c-format
-msgid "could not remove tmpdir %s"
+#: lib/libalpm/trans.c:597
+#, fuzzy, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "Aufruf von 'waitpid' fehlgeschlagen (%s)"
+
+#: lib/libalpm/trans.c:606
+msgid "scriptlet failed to execute correctly\n"
+msgstr ""
+
+#: lib/libalpm/trans.c:615
+#, fuzzy, c-format
+msgid "could not remove tmpdir %s\n"
msgstr "Konnte tmpdir %s nicht entfernen"
-#: lib/libalpm/util.c:127
-#, c-format
-msgid "failed to make path '%s' : %s"
+#: lib/libalpm/util.c:204
+#, fuzzy, c-format
+msgid "failed to make path '%s' : %s\n"
msgstr "Konnte Pfad nicht erstellen '%s' : %s"
-#: lib/libalpm/util.c:325
+#: lib/libalpm/util.c:389
#, c-format
msgid "could not open %s: %s\n"
msgstr "Konnte Datei %s nicht öffnen: %s\n"
-#: lib/libalpm/util.c:346
+#: lib/libalpm/util.c:573
#, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "Konnte %s nicht entpacken (%s)\n"
+msgid "no %s cache exists, creating...\n"
+msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
+
+#: lib/libalpm/util.c:593
+#, fuzzy
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp"
+
+#: lib/libalpm/util.c:643
+#, c-format
+msgid "md5: %s can't be opened\n"
+msgstr "md5: %s kann nicht geöffnet werden\n"
+
+#: lib/libalpm/util.c:645
+#, fuzzy, c-format
+msgid "md5: %s can't be read\n"
+msgstr "md5: %s kann nicht geöffnet werden\n"
+
+#~ msgid "please remove '%s' first, using -Rd"
+#~ msgstr "Entfernen Sie bitte zuerst '%s' mit -Rd"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "Konnte %s nicht entpacken (%s)"
+
+#~ msgid "could not update provision '%s' from '%s'"
+#~ msgstr "Konnte Bereitstellung '%s' von '%s' nicht aktualisieren"
+
+#~ msgid "%s: description file is missing"
+#~ msgstr "%s: Beschreibungsdatei fehlt"
+
+#~ msgid "%s: dependency file is missing"
+#~ msgstr "%s: Abhängige Datei fehlt"
+
+#~ msgid "%s: file list is missing"
+#~ msgstr "%s: Dateiliste fehlt"
+
+#~ msgid "malloc failed: could not allocate %d bytes"
+#~ msgstr "malloc fehlgeschlagen: Konnte %d Bytes nicht zuweisen"
+
+#~ msgid ""
+#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+#~ msgstr ""
+#~ "Kann Abhängigkeiten für \"%s\" nicht auflösen (\"%s\" ist nicht in "
+#~ "Paketliste enthalten)"
+
+#~ msgid "cannot canonicalize specified root path '%s'"
+#~ msgstr "Kann das spezifizierte Wurzelverzeichnis '%s' nicht anerkennen"
+
+#~ msgid "could not get sha1sum for package %s-%s"
+#~ msgstr "Konnte SHA1-Prüfsumme für Paket %s-%s nicht ermitteln"
+
+#~ msgid "sha1sums do not match for package %s-%s"
+#~ msgstr "SHA1-Prüfsummen für Paket %s-%s stimmen nicht überein"
+
+#~ msgid "cannot remove file %s: %s"
+#~ msgstr "Kann Datei %s nicht entfernen: %s"
+
+#~ msgid "sha1: %s can't be opened\n"
+#~ msgstr "sha1: %s kann nicht geöffnet werden\n"
+
+#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+#~ msgstr "Archiv %s ist beschädigt (falsche MD5- oder SHA1-Prüfsumme)\n"
+
+#~ msgid "could not update requiredby for database entry %s-%s"
+#~ msgstr "Konnte requiredby für Datenbank-Eintrag %s-%s nicht aktualisieren"
+
+#~ msgid "could not update new database entry %s-%s"
+#~ msgstr "Konnte neuen Datenbank-Eintrag %s-%s nicht aktualisieren"
+#~ msgid "could not update 'requiredby' database entry %s-%s"
+#~ msgstr "Konnte requiredby-Eintrag %s-%s nicht aktualisieren"
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index f0ecd2d8..427f75cc 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.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-11-06 18:03+1100\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-11-06 18:09+1000\n"
"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
"Language-Team: English <en_gb@li.org>\n"
@@ -16,26 +16,33 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/libalpm/add.c:98
+#: lib/libalpm/add.c:88
#, c-format
msgid "replacing older version %s-%s by %s in target list\n"
msgstr "replacing older version %s-%s by %s in target list\n"
-#: lib/libalpm/add.c:107
+#: lib/libalpm/add.c:97
#, c-format
msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr "newer version %s-%s is in the target list -- skipping\n"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+
#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "replacing packages with -A and -U is not supported yet\n"
-#: lib/libalpm/add.c:170
-#, c-format
-msgid "please remove '%s' first, using -Rd\n"
-msgstr "please remove '%s' first, using -Rd\n"
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
-#: lib/libalpm/add.c:396
+#: lib/libalpm/add.c:365
#, c-format
msgid ""
"directory permissions differ on %s\n"
@@ -44,98 +51,89 @@ msgstr ""
"directory permissions differ on %s\n"
"filesystem: %o package: %o\n"
-#: lib/libalpm/add.c:423
+#: lib/libalpm/add.c:392
#, c-format
msgid "extract: symlink %s does not point to dir\n"
msgstr "extract: symlink %s does not point to dir\n"
-#: lib/libalpm/add.c:430
+#: lib/libalpm/add.c:399
#, c-format
msgid "extract: not overwriting dir with file %s\n"
msgstr "extract: not overwriting dir with file %s\n"
-#: lib/libalpm/add.c:483
-#: lib/libalpm/add.c:627
-#: lib/libalpm/util.c:412
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
#, c-format
msgid "could not extract %s (%s)\n"
msgstr "could not extract %s (%s)\n"
-#: lib/libalpm/add.c:534
+#: lib/libalpm/add.c:505
#, c-format
msgid "could not rename %s (%s)\n"
msgstr "could not rename %s (%s)\n"
-#: lib/libalpm/add.c:541
-#: lib/libalpm/add.c:561
-#: lib/libalpm/trans.c:580
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
#, c-format
msgid "could not copy tempfile to %s (%s)\n"
msgstr "could not copy tempfile to %s (%s)\n"
-#: lib/libalpm/add.c:546
-#: lib/libalpm/remove.c:235
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
#, c-format
msgid "%s saved as %s\n"
msgstr "%s saved as %s\n"
-#: lib/libalpm/add.c:585
+#: lib/libalpm/add.c:556
#, c-format
msgid "could not install %s as %s: %s\n"
msgstr "could not install %s as %s: %s\n"
-#: lib/libalpm/add.c:588
+#: lib/libalpm/add.c:559
#, c-format
msgid "%s installed as %s\n"
msgstr "%s installed as %s\n"
-#: lib/libalpm/add.c:605
+#: lib/libalpm/add.c:576
#, c-format
msgid "extracting %s as %s.pacnew\n"
msgstr "extracting %s as %s.pacnew\n"
-#: lib/libalpm/add.c:740
-#: lib/libalpm/trans.c:596
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
msgid "could not get current working directory\n"
msgstr "could not get current working directory\n"
-#: lib/libalpm/add.c:794
+#: lib/libalpm/add.c:765
#, c-format
msgid "problem occurred while upgrading %s\n"
msgstr "problem occurred while upgrading %s\n"
-#: lib/libalpm/add.c:799
+#: lib/libalpm/add.c:770
#, c-format
msgid "problem occurred while installing %s\n"
msgstr "problem occurred while installing %s\n"
-#: lib/libalpm/add.c:818
+#: lib/libalpm/add.c:785
#, c-format
msgid "could not update database entry %s-%s\n"
msgstr "could not update database entry %s-%s\n"
-#: lib/libalpm/add.c:826
+#: lib/libalpm/add.c:793
#, c-format
msgid "could not add entry '%s' in cache\n"
msgstr "could not add entry '%s' in cache\n"
-#: lib/libalpm/be_files.c:221
+#: lib/libalpm/be_files.c:223
#, c-format
msgid "invalid name for database entry '%s'\n"
msgstr "invalid name for database entry '%s'\n"
-#: lib/libalpm/be_files.c:273
+#: lib/libalpm/be_files.c:275
#, c-format
msgid "loading package data for %s : level=%d\n"
msgstr "loading package data for %s : level=%d\n"
-#: lib/libalpm/be_files.c:290
-#: lib/libalpm/be_files.c:419
-#: lib/libalpm/be_files.c:442
-#: lib/libalpm/be_files.c:556
-#: lib/libalpm/be_files.c:634
-#: lib/libalpm/be_files.c:662
-#: lib/libalpm/package.c:820
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
#, c-format
msgid "could not open file %s: %s\n"
msgstr "could not open file %s: %s\n"
@@ -150,42 +148,33 @@ msgstr "adding '%s' to package cache for db '%s'\n"
msgid "could not remove database entry %s%s\n"
msgstr "could not remove database entry %s%s\n"
-#: lib/libalpm/db.c:466
-#: lib/libalpm/sync.c:123
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-
-#: lib/libalpm/db.c:688
+#: lib/libalpm/db.c:553
msgid "attempt to re-register the 'local' DB\n"
msgstr "attempt to re-register the 'local' DB\n"
-#: lib/libalpm/db.c:697
-#: lib/libalpm/db.c:748
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
msgid "database path is undefined\n"
msgstr "database path is undefined\n"
-#: lib/libalpm/deps.c:194
-msgid "dependency cycle detected\n"
+#: lib/libalpm/deps.c:173
+#, fuzzy
+msgid "dependency cycle detected:\n"
msgstr "dependency cycle detected\n"
-#: lib/libalpm/deps.c:713
+#: lib/libalpm/deps.c:175
#, c-format
-msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgid "%s will be removed after its %s dependency\n"
+msgstr ""
-#: lib/libalpm/deps.c:718
-#: lib/libalpm/deps.c:749
-#: lib/libalpm/sync.c:596
-#: lib/libalpm/sync.c:612
+#: lib/libalpm/deps.c:177
#, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc failure: could not allocate %zd bytes\n"
+msgid "%s will be installed before its %s dependency\n"
+msgstr ""
-#: lib/libalpm/deps.c:746
+#: lib/libalpm/deps.c:573
#, c-format
-msgid "cannot resolve dependencies for \"%s\"\n"
-msgstr "cannot resolve dependencies for \"%s\"\n"
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n"
#: lib/libalpm/error.c:43
msgid "out of memory!"
@@ -263,8 +252,7 @@ msgstr "could not set parameter"
msgid "transaction already initialized"
msgstr "transaction already initialised"
-#: lib/libalpm/error.c:90
-#: lib/libalpm/error.c:94
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr "transaction not initialised"
@@ -394,215 +382,266 @@ msgstr "could not get md5sum for package %s-%s\n"
msgid "md5sums do not match for package %s-%s\n"
msgstr "md5sums do not match for package %s-%s\n"
-#: lib/libalpm/package.c:761
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)\n"
-msgstr "%s-%s: ignoring package upgrade (%s)\n"
-
-#: lib/libalpm/package.c:770
+#: lib/libalpm/package.c:737
#, c-format
msgid "%s: forcing upgrade to version %s\n"
msgstr "%s: forcing upgrade to version %s\n"
-#: lib/libalpm/package.c:775
+#: lib/libalpm/package.c:742
#, c-format
msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr "%s: local (%s) is newer than %s (%s)\n"
-#: lib/libalpm/package.c:783
+#: lib/libalpm/package.c:750
#, c-format
msgid "%s-%s: delaying upgrade of package (%s)\n"
msgstr "%s-%s: delaying upgrade of package (%s)\n"
-#: lib/libalpm/package.c:961
+#: lib/libalpm/package.c:931
#, c-format
msgid "could not parse package description file in %s\n"
msgstr "could not parse package description file in %s\n"
-#: lib/libalpm/package.c:966
+#: lib/libalpm/package.c:936
#, c-format
msgid "missing package name in %s\n"
msgstr "missing package name in %s\n"
-#: lib/libalpm/package.c:970
+#: lib/libalpm/package.c:940
#, c-format
msgid "missing package version in %s\n"
msgstr "missing package version in %s\n"
-#: lib/libalpm/package.c:1000
+#: lib/libalpm/package.c:970
#, c-format
msgid "could not remove tempfile %s\n"
msgstr "could not remove tempfile %s\n"
-#: lib/libalpm/package.c:1015
-#: lib/libalpm/package.c:1028
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
#, c-format
msgid "error while reading package %s: %s\n"
msgstr "error while reading package %s: %s\n"
-#: lib/libalpm/package.c:1035
+#: lib/libalpm/package.c:1005
#, c-format
msgid "missing package metadata in %s\n"
msgstr "missing package metadata in %s\n"
-#: lib/libalpm/package.c:1042
+#: lib/libalpm/package.c:1012
#, c-format
msgid "missing package filelist in %s, generating one\n"
msgstr "missing package filelist in %s, generating one\n"
-#: lib/libalpm/remove.c:122
+#: lib/libalpm/remove.c:121
#, c-format
msgid "could not find %s in database -- skipping\n"
msgstr "could not find %s in database -- skipping\n"
-#: lib/libalpm/remove.c:173
-#: lib/libalpm/remove.c:244
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
#, c-format
msgid "cannot remove file '%s': %s\n"
msgstr "cannot remove file '%s': %s\n"
-#: lib/libalpm/remove.c:338
+#: lib/libalpm/remove.c:337
#, c-format
msgid "could not remove database entry %s-%s\n"
msgstr "could not remove database entry %s-%s\n"
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/remove.c:342
#, c-format
msgid "could not remove entry '%s' from cache\n"
msgstr "could not remove entry '%s' from cache\n"
-#: lib/libalpm/sync.c:291
+#: lib/libalpm/server.c:56
+#, c-format
+msgid "url '%s' is invalid, ignoring\n"
+msgstr ""
+
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
+msgstr ""
+
+#: lib/libalpm/server.c:241
+msgid "disk"
+msgstr ""
+
+#: lib/libalpm/server.c:245
+#, fuzzy, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "failed to retrieve some files from %s\n"
+
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "cannot remove file '%s': %s\n"
+
+#: lib/libalpm/server.c:307
+#, fuzzy, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "error while reading package %s: %s\n"
+
+#: lib/libalpm/server.c:319
+#, fuzzy, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "cannot remove file '%s': %s\n"
+
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "could not change directory to / (%s)\n"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
+#, fuzzy, c-format
+msgid "failed to download %s\n"
+msgstr "could not download all files"
+
+#: lib/libalpm/sync.c:135
+#, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+
+#: lib/libalpm/sync.c:250
+#, fuzzy, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s: ignoring package upgrade (%s)\n"
+
+#: lib/libalpm/sync.c:320
#, c-format
msgid "repository '%s' not found\n"
msgstr "repository '%s' not found\n"
-#: lib/libalpm/sync.c:333
+#: lib/libalpm/sync.c:354
#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s is up to date -- skipping\n"
-#: lib/libalpm/sync.c:592
-#: lib/libalpm/sync.c:608
+#: lib/libalpm/sync.c:358
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s is up to date -- skipping\n"
+
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
msgid "unresolvable package conflicts detected\n"
msgstr "unresolvable package conflicts detected\n"
-#: lib/libalpm/sync.c:845
+#: lib/libalpm/sync.c:628
+#, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "malloc failure: could not allocate %zd bytes\n"
+
+#: lib/libalpm/sync.c:825
#, c-format
msgid "command: %s\n"
msgstr "command: %s\n"
-#: lib/libalpm/sync.c:908
-#: lib/libalpm/sync.c:916
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
#, c-format
msgid "can't get md5 checksum for file %s\n"
msgstr "can't get md5 checksum for file %s\n"
-#: lib/libalpm/sync.c:930
+#: lib/libalpm/sync.c:910
#, c-format
msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr "file %s was corrupted (bad MD5 checksum)\n"
-#: lib/libalpm/sync.c:1066
+#: lib/libalpm/sync.c:1056
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr "failed to retrieve some files from %s\n"
-#: lib/libalpm/sync.c:1147
+#: lib/libalpm/sync.c:1137
msgid "could not create removal transaction\n"
msgstr "could not create removal transaction\n"
-#: lib/libalpm/sync.c:1153
+#: lib/libalpm/sync.c:1143
msgid "could not initialize the removal transaction\n"
msgstr "could not initialise the removal transaction\n"
-#: lib/libalpm/sync.c:1175
+#: lib/libalpm/sync.c:1165
msgid "could not prepare removal transaction\n"
msgstr "could not prepare removal transaction\n"
-#: lib/libalpm/sync.c:1181
+#: lib/libalpm/sync.c:1171
msgid "could not commit removal transaction\n"
msgstr "could not commit removal transaction\n"
-#: lib/libalpm/sync.c:1192
+#: lib/libalpm/sync.c:1182
msgid "could not create transaction\n"
msgstr "could not create transaction\n"
-#: lib/libalpm/sync.c:1197
+#: lib/libalpm/sync.c:1187
msgid "could not initialize transaction\n"
msgstr "could not initialise transaction\n"
-#: lib/libalpm/sync.c:1224
+#: lib/libalpm/sync.c:1214
msgid "could not prepare transaction\n"
msgstr "could not prepare transaction\n"
-#: lib/libalpm/sync.c:1229
+#: lib/libalpm/sync.c:1219
msgid "could not commit transaction\n"
msgstr "could not commit transaction\n"
-#: lib/libalpm/sync.c:1266
-#, c-format
-msgid "could not update requiredby for database entry %s-%s\n"
-msgstr "could not update requiredby for database entry %s-%s\n"
-
-#: lib/libalpm/sync.c:1275
-#, c-format
-msgid "could not update new database entry %s-%s\n"
-msgstr "could not update new database entry %s-%s\n"
-
-#: lib/libalpm/trans.c:215
+#: lib/libalpm/trans.c:214
#, c-format
msgid "could not remove lock file %s\n"
msgstr "could not remove lock file %s\n"
-#: lib/libalpm/trans.c:496
-#, c-format
-msgid "could not update 'requiredby' database entry %s-%s\n"
-msgstr "could not update 'requiredby' database entry %s-%s\n"
-
-#: lib/libalpm/trans.c:557
+#: lib/libalpm/trans.c:483
#, c-format
msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
msgstr "No /bin/sh in root dir (%s), aborting scriptlet\n"
-#: lib/libalpm/trans.c:568
+#: lib/libalpm/trans.c:494
msgid "could not create temp directory\n"
msgstr "could not create temp directory\n"
-#: lib/libalpm/trans.c:603
+#: lib/libalpm/trans.c:536
#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "could not change directory to %s (%s)\n"
-#: lib/libalpm/trans.c:621
+#: lib/libalpm/trans.c:554
#, c-format
msgid "could not fork a new process (%s)\n"
msgstr "could not fork a new process (%s)\n"
-#: lib/libalpm/trans.c:631
+#: lib/libalpm/trans.c:564
#, c-format
msgid "could not change the root directory (%s)\n"
msgstr "could not change the root directory (%s)\n"
-#: lib/libalpm/trans.c:636
+#: lib/libalpm/trans.c:569
#, c-format
msgid "could not change directory to / (%s)\n"
msgstr "could not change directory to / (%s)\n"
-#: lib/libalpm/trans.c:645
+#: lib/libalpm/trans.c:578
#, c-format
msgid "call to popen failed (%s)"
msgstr "call to popen failed (%s)"
-#: lib/libalpm/trans.c:664
+#: lib/libalpm/trans.c:597
#, c-format
msgid "call to waitpid failed (%s)\n"
msgstr "call to waitpid failed (%s)\n"
-#: lib/libalpm/trans.c:673
+#: lib/libalpm/trans.c:606
msgid "scriptlet failed to execute correctly\n"
msgstr "scriptlet failed to execute correctly\n"
-#: lib/libalpm/trans.c:682
+#: lib/libalpm/trans.c:615
#, c-format
msgid "could not remove tmpdir %s\n"
msgstr "could not remove tmpdir %s\n"
@@ -612,54 +651,77 @@ msgstr "could not remove tmpdir %s\n"
msgid "failed to make path '%s' : %s\n"
msgstr "failed to make path '%s' : %s\n"
-#: lib/libalpm/util.c:390
+#: lib/libalpm/util.c:389
#, c-format
msgid "could not open %s: %s\n"
msgstr "could not open %s: %s\n"
-#: lib/libalpm/util.c:574
+#: lib/libalpm/util.c:573
#, c-format
msgid "no %s cache exists, creating...\n"
msgstr "no %s cache exists, creating...\n"
-#: lib/libalpm/util.c:594
+#: lib/libalpm/util.c:593
msgid "couldn't create package cache, using /tmp instead\n"
msgstr "couldn't create package cache, using /tmp instead\n"
-#: lib/libalpm/util.c:644
+#: lib/libalpm/util.c:643
#, c-format
msgid "md5: %s can't be opened\n"
msgstr "md5: %s can't be opened\n"
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:645
#, c-format
msgid "md5: %s can't be read\n"
msgstr "md5: %s can't be read\n"
+#~ msgid "please remove '%s' first, using -Rd\n"
+#~ msgstr "please remove '%s' first, using -Rd\n"
+
+#~ msgid "cannot resolve dependencies for \"%s\"\n"
+#~ msgstr "cannot resolve dependencies for \"%s\"\n"
+
+#~ msgid "could not update requiredby for database entry %s-%s\n"
+#~ msgstr "could not update requiredby for database entry %s-%s\n"
+
+#~ msgid "could not update new database entry %s-%s\n"
+#~ msgstr "could not update new database entry %s-%s\n"
+
+#~ msgid "could not update 'requiredby' database entry %s-%s\n"
+#~ msgstr "could not update 'requiredby' database entry %s-%s\n"
+
#~ msgid "could not extract %s (%s)"
#~ msgstr "could not extract %s (%s)"
+
#~ msgid "could not update provision '%s' from '%s'"
#~ msgstr "could not update provision '%s' from '%s'"
#, fuzzy
#~ msgid "%s: description file is missing"
#~ msgstr "%s: syntax error in description file line %d"
+
#~ msgid "malloc failed: could not allocate %d bytes"
#~ msgstr "malloc failed: could not allocate %d bytes"
+
#~ msgid ""
#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
#~ msgstr ""
#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+
#~ msgid "cannot canonicalize specified root path '%s'"
#~ msgstr "cannot canonicalise specified root path '%s'"
+
#~ msgid "could not get sha1sum for package %s-%s"
#~ msgstr "could not get sha1sum for package %s-%s"
+
#~ msgid "sha1sums do not match for package %s-%s"
#~ msgstr "sha1sums do not match for package %s-%s"
+
#~ msgid "cannot remove file %s: %s"
#~ msgstr "cannot remove file %s: %s"
+
#~ msgid "sha1: %s can't be opened\n"
#~ msgstr "sha1: %s can't be opened\n"
+
#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
#~ msgstr "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index f49305c3..10cd8329 100644
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libalpm\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-07-11 00:26-0400\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-04-20 21:19-0300\n"
"Last-Translator: Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>\n"
"Language-Team: juan pablo gonzález tognarelli <lord_jotape@yahoo.com.ar>\n"
@@ -13,616 +13,729 @@ msgstr ""
"X-Poedit-Country: CHILE\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: lib/libalpm/add.c:118
-#, c-format
-msgid "replacing older version %s-%s by %s in target list"
+#: lib/libalpm/add.c:88
+#, fuzzy, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
msgstr "reemplazando la versión antigua %s-%s por %s en la lista de objetivos"
-#: lib/libalpm/add.c:127
-#, c-format
-msgid "newer version %s-%s is in the target list -- skipping"
+#: lib/libalpm/add.c:97
+#, fuzzy, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr ""
"una nueva versión %s-%s esta en la lista de objetivos list -- saltándola"
-#: lib/libalpm/add.c:201
-msgid "replacing packages with -A and -U is not supported yet"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+
+#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
+#, fuzzy
+msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "el reemplazo de paqutes con -A y -U aún no esta soportado"
-#: lib/libalpm/add.c:202
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
+
+#: lib/libalpm/add.c:365
#, c-format
-msgid "please remove '%s' first, using -Rd"
-msgstr "por favor quitar '%s' primero, usando -Rd"
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o package: %o\n"
+msgstr ""
-#: lib/libalpm/add.c:428 lib/libalpm/trans.c:609
-msgid "could not get current working directory"
-msgstr "no se pudo obtener el directorio de trabajo actual"
+#: lib/libalpm/add.c:392
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr ""
-#: lib/libalpm/add.c:619
+#: lib/libalpm/add.c:399
#, c-format
-msgid "could not rename %s (%s)"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr ""
+
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#, fuzzy, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "no se pudo extraer %s (%s)"
+
+#: lib/libalpm/add.c:505
+#, fuzzy, c-format
+msgid "could not rename %s (%s)\n"
msgstr "no se pudo renombrar %s (%s)"
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:646
-#, c-format
-msgid "could not copy tempfile to %s (%s)"
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)\n"
msgstr "no se pudo copiar el archivo temporal a %s (%s)"
-#: lib/libalpm/add.c:631 lib/libalpm/remove.c:241
-#, c-format
-msgid "%s saved as %s"
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#, fuzzy, c-format
+msgid "%s saved as %s\n"
msgstr "%s guardado como %s"
-#: lib/libalpm/add.c:670
-#, c-format
-msgid "could not install %s as %s: %s"
+#: lib/libalpm/add.c:556
+#, fuzzy, c-format
+msgid "could not install %s as %s: %s\n"
msgstr "no se pudo instalar %s como %s: %s"
-#: lib/libalpm/add.c:673
-#, c-format
-msgid "%s installed as %s"
+#: lib/libalpm/add.c:559
+#, fuzzy, c-format
+msgid "%s installed as %s\n"
msgstr "%s instalado como %s"
-#: lib/libalpm/add.c:689
-#, c-format
-msgid "extracting %s as %s.pacnew"
+#: lib/libalpm/add.c:576
+#, fuzzy, c-format
+msgid "extracting %s as %s.pacnew\n"
msgstr "descomprimiendo %s como %s.pacnew"
-#: lib/libalpm/add.c:721
-#, c-format
-msgid "could not extract %s (%s)"
-msgstr "no se pudo extraer %s (%s)"
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, fuzzy
+msgid "could not get current working directory\n"
+msgstr "no se pudo obtener el directorio de trabajo actual"
-#: lib/libalpm/add.c:772
+#: lib/libalpm/add.c:765
#, fuzzy, c-format
-msgid "problem occurred while upgrading %s"
+msgid "problem occurred while upgrading %s\n"
msgstr "ocurrieron errores mientras %s %s"
-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:770
#, fuzzy, c-format
-msgid "problem occurred while installing %s"
+msgid "problem occurred while installing %s\n"
msgstr "ocurrieron errores mientras %s %s"
-#: lib/libalpm/add.c:815
-#, c-format
-msgid "could not update provision '%s' from '%s'"
-msgstr "no se pudo actualizar la provisión '%s' desde '%s'"
-
-#: lib/libalpm/add.c:835
-#, c-format
-msgid "could not update database entry %s-%s"
+#: lib/libalpm/add.c:785
+#, fuzzy, c-format
+msgid "could not update database entry %s-%s\n"
msgstr "no se pudo actualizar en la base de datos la entrada %s-%s"
-#: lib/libalpm/add.c:843
-#, c-format
-msgid "could not add entry '%s' in cache"
+#: lib/libalpm/add.c:793
+#, fuzzy, c-format
+msgid "could not add entry '%s' in cache\n"
msgstr "no se pudo agregar '%s' en la cache"
-#: lib/libalpm/be_files.c:83
+#: lib/libalpm/be_files.c:223
#, fuzzy, c-format
-msgid "%s: description file is missing"
-msgstr "%s: error de sintaxis en la linea de descripción de archivos %d"
-
-#: lib/libalpm/be_files.c:88
-#, c-format
-msgid "%s: dependency file is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:93
-#, c-format
-msgid "%s: file list is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:216
-#, c-format
-msgid "invalid name for database entry '%s'"
+msgid "invalid name for database entry '%s'\n"
msgstr "nombre invalido para la entrada de la base de datos '%s'"
-#: lib/libalpm/be_files.c:271
-#, c-format
-msgid "loading package data for %s : level=%d"
+#: lib/libalpm/be_files.c:275
+#, fuzzy, c-format
+msgid "loading package data for %s : level=%d\n"
msgstr "cargando la información del paquete para %s : nivel=%d"
-#: lib/libalpm/be_files.c:288 lib/libalpm/be_files.c:434
-#: lib/libalpm/be_files.c:457 lib/libalpm/be_files.c:549
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:419
-#, c-format
-msgid "could not open file %s: %s"
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
+#, fuzzy, c-format
+msgid "could not open file %s: %s\n"
msgstr "no se pudo abrir el archivo %s: %s"
-#: lib/libalpm/cache.c:63
-#, c-format
-msgid "adding '%s' to package cache for db '%s'"
+#: lib/libalpm/cache.c:62
+#, fuzzy, c-format
+msgid "adding '%s' to package cache for db '%s'\n"
msgstr "agregando '%s' a la cache de paquetes para la base '%s'"
-#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:80 lib/libalpm/deps.c:449
-#: lib/libalpm/deps.c:650 lib/libalpm/deps.c:690 lib/libalpm/group.c:44
-#: lib/libalpm/handle.c:50 lib/libalpm/package.c:297 lib/libalpm/sync.c:62
-#: lib/libalpm/sync.c:612 lib/libalpm/sync.c:628 lib/libalpm/trans.c:223
-#, c-format
-msgid "malloc failure: could not allocate %d bytes"
-msgstr "falla en malloc: no se pudo alocar %d bytes"
-
-#: lib/libalpm/db.c:238
-#, c-format
-msgid "could not remove database entry %s%s"
+#: lib/libalpm/db.c:285
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s\n"
msgstr "no se pudo quitar la entrada en la base de datos %s%s"
-#: lib/libalpm/db.c:432 lib/libalpm/sync.c:128
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
-msgstr ""
-"%s-%s: ignorando la actualización del paquete(para ser reemplazado por %s-%s)"
-
-#: lib/libalpm/db.c:553 lib/libalpm/db.c:560
-#, c-format
-msgid "malloc failed: could not allocate %d bytes"
-msgstr "malloc falló: no se pudo alocar %d bytes"
-
-#: lib/libalpm/db.c:661
-msgid "attempt to re-register the 'local' DB"
+#: lib/libalpm/db.c:553
+#, fuzzy
+msgid "attempt to re-register the 'local' DB\n"
msgstr "intento para re-registrar la base de datos 'local'"
-#: lib/libalpm/db.c:680
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
#, fuzzy
-msgid "database path is undefined"
+msgid "database path is undefined\n"
msgstr "base de datos no inicializada"
-#: lib/libalpm/deps.c:187
+#: lib/libalpm/deps.c:173
#, fuzzy
-msgid "dependency cycle detected\n"
+msgid "dependency cycle detected:\n"
msgstr "ciclo de dependencias detectado: %s"
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:175
#, c-format
-msgid ""
-"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid "%s will be removed after its %s dependency\n"
msgstr ""
-"no se pudo resolver dependecias para \"%s\" (\"%s\" no está en las listas de "
-"paquetes)"
-#: lib/libalpm/deps.c:687
+#: lib/libalpm/deps.c:177
#, c-format
-msgid "cannot resolve dependencies for \"%s\""
+msgid "%s will be installed before its %s dependency\n"
+msgstr ""
+
+#: lib/libalpm/deps.c:573
+#, fuzzy, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "no se pudo resolver las dependencias para \"%s\""
-#: lib/libalpm/error.c:38
+#: lib/libalpm/error.c:43
msgid "out of memory!"
msgstr "no hay memoria!"
-#: lib/libalpm/error.c:40
+#: lib/libalpm/error.c:45
msgid "unexpected system error"
msgstr "error de sistema inesperado"
-#: lib/libalpm/error.c:42
+#: lib/libalpm/error.c:47
msgid "insufficient privileges"
msgstr "privilegios insuficientes"
-#: lib/libalpm/error.c:44
+#: lib/libalpm/error.c:49
msgid "could not find or read file"
msgstr "no se pudo encontrar o leer el archivo"
-#: lib/libalpm/error.c:46
+#: lib/libalpm/error.c:51
+#, fuzzy
+msgid "could not find or read directory"
+msgstr "no se pudo encontrar o leer el archivo"
+
+#: lib/libalpm/error.c:53
msgid "wrong or NULL argument passed"
msgstr "argumento erroneo o núlo"
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:56
msgid "library not initialized"
msgstr "librería no inicializada"
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:58
msgid "library already initialized"
msgstr "la librería ya fue inicializada"
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:60
msgid "unable to lock database"
msgstr "no se pudo bloquear la base de datos"
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:63
msgid "could not open database"
msgstr "no se pudo abrir la base de datos"
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:65
msgid "could not create database"
msgstr "no se pudo crear la base de datos"
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:67
msgid "database not initialized"
msgstr "base de datos no inicializada"
-#: lib/libalpm/error.c:62
+#: lib/libalpm/error.c:69
msgid "database already registered"
msgstr "base de datos ya registrada"
-#: lib/libalpm/error.c:64
+#: lib/libalpm/error.c:71
msgid "could not find database"
msgstr "no se pudo encontrar la base de datos"
-#: lib/libalpm/error.c:66
+#: lib/libalpm/error.c:73
msgid "could not update database"
msgstr "no se pudo actualizar la base de datos"
-#: lib/libalpm/error.c:68
+#: lib/libalpm/error.c:75
msgid "could not remove database entry"
msgstr "no se pudo quitar la entrada de la base de datos"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:78
msgid "invalid url for server"
msgstr "dirección inválida para el servidor"
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:85
msgid "could not set parameter"
msgstr "no se pudo fijar el parámetro"
-#: lib/libalpm/error.c:81
+#: lib/libalpm/error.c:88
msgid "transaction already initialized"
msgstr "la operación ya se inicializó"
-#: lib/libalpm/error.c:83 lib/libalpm/error.c:87
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr "operación no inicializada"
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:92
msgid "duplicate target"
msgstr "objetivo duplicado"
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:96
msgid "transaction not prepared"
msgstr "operación no lista"
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "transaction aborted"
msgstr "operación abortada"
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "operation not compatible with the transaction type"
msgstr "la operación no es compatible con el tipo de transacción"
-#: lib/libalpm/error.c:95 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:102
msgid "could not commit transaction"
msgstr "no se pudo hacer la transacción"
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "could not download all files"
msgstr "no se pudo descargar todos los archivos"
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:107
msgid "could not find or read package"
msgstr "no se pudo encontrar o leer el paquete"
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:109
msgid "invalid or corrupted package"
msgstr "paquete invalido o corrupto"
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:111
msgid "cannot open package file"
msgstr "no se pudo abrir el archivo de paquetes"
-#: lib/libalpm/error.c:106
+#: lib/libalpm/error.c:113
msgid "cannot load package data"
msgstr "no se pudo cargar la información del paquete"
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:115
msgid "package already installed"
msgstr "el paquete ya está instalado"
-#: lib/libalpm/error.c:110
+#: lib/libalpm/error.c:117
msgid "package not installed or lesser version"
msgstr "el paquete no está instalado o es una versión menor"
-#: lib/libalpm/error.c:112
+#: lib/libalpm/error.c:119
msgid "cannot remove all files for package"
msgstr "no se pudo quitar todos los archivos del paquete"
-#: lib/libalpm/error.c:114
+#: lib/libalpm/error.c:121
msgid "package name is not valid"
msgstr "el nombre del paquete no es válido"
-#: lib/libalpm/error.c:116
+#: lib/libalpm/error.c:123
msgid "corrupted package"
msgstr "paquete corrupto"
-#: lib/libalpm/error.c:118
+#: lib/libalpm/error.c:125
msgid "no such repository"
msgstr "no existe el repositorio"
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:128
+#, fuzzy
+msgid "corrupted delta"
+msgstr "paquete corrupto"
+
+#: lib/libalpm/error.c:130
+msgid "delta patch failed"
+msgstr ""
+
+#: lib/libalpm/error.c:133
msgid "group not found"
msgstr "grupo no encontrado"
-#: lib/libalpm/error.c:124
+#: lib/libalpm/error.c:136
msgid "could not satisfy dependencies"
msgstr "no se pudieron satisfacer las dependencias"
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:138
msgid "conflicting dependencies"
msgstr "dependencias en conflicto"
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:140
msgid "conflicting files"
msgstr "archivos en conflicto"
-#: lib/libalpm/error.c:131
+#: lib/libalpm/error.c:143
msgid "user aborted the operation"
msgstr "el usuario abortó la operación"
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:145
msgid "internal error"
msgstr "error interno"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:147
msgid "libarchive error"
msgstr "error de libarchive"
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:150
msgid "not confirmed"
msgstr "no confirmado"
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:152
msgid "invalid regular expression"
msgstr "expresión regular inválida"
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:155
msgid "connection to remote host failed"
msgstr "falló la conexión con el host remoto"
-#: lib/libalpm/error.c:146
+#: lib/libalpm/error.c:158
msgid "unexpected error"
msgstr "error inesperado"
-# canonicalize.. no supe traducirla bien
-#: lib/libalpm/handle.c:140
-#, c-format
-msgid "cannot canonicalize specified root path '%s'"
-msgstr "no se pudo obtener el la ruta canonica de la raiz especificada '%s'"
-
-#: lib/libalpm/md5driver.c:69
+#: lib/libalpm/package.c:124
#, fuzzy, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "%s no puede ser abierto\n"
-
-#: lib/libalpm/package.c:129
-#, c-format
-msgid "could not get sha1sum for package %s-%s"
-msgstr "no se pudo obtener la verificación sha1 para %s-%s"
-
-#: lib/libalpm/package.c:138
-#, c-format
-msgid "sha1sums do not match for package %s-%s"
-msgstr "la verificación sha1 no coincide para %s-%s"
-
-#: lib/libalpm/package.c:180
-#, c-format
-msgid "could not get md5sum for package %s-%s"
+msgid "could not get md5sum for package %s-%s\n"
msgstr "no se pudo obtener la verificación md5 para %s-%s"
-#: lib/libalpm/package.c:189
-#, c-format
-msgid "md5sums do not match for package %s-%s"
+#: lib/libalpm/package.c:133
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s\n"
msgstr "la verificación md5 para el paquete %s-%s no concuerda"
-#: lib/libalpm/package.c:360
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: ignorando la actualización del paquete (%s)"
-
-#: lib/libalpm/package.c:369
-#, c-format
-msgid "%s: forcing upgrade to version %s"
+#: lib/libalpm/package.c:737
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s\n"
msgstr "%s: forzando la actualización a la versión %s"
-#: lib/libalpm/package.c:374
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
+#: lib/libalpm/package.c:742
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr "%s: local (%s) es más nuevo que %s (%s)"
-#: lib/libalpm/package.c:382
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
+#: lib/libalpm/package.c:750
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)\n"
msgstr "%s-%s: aplazando la actualización del paquete (%s)"
-#: lib/libalpm/package.c:564
-msgid "could not parse the package description file"
+#: lib/libalpm/package.c:931
+#, fuzzy, c-format
+msgid "could not parse package description file in %s\n"
msgstr "no se pudo interpretar el archivo de descripción"
-#: lib/libalpm/package.c:568
-#, c-format
-msgid "missing package name in %s"
+#: lib/libalpm/package.c:936
+#, fuzzy, c-format
+msgid "missing package name in %s\n"
msgstr "nombre de paquete perdido en %s"
-#: lib/libalpm/package.c:572
-#, c-format
-msgid "missing package version in %s"
+#: lib/libalpm/package.c:940
+#, fuzzy, c-format
+msgid "missing package version in %s\n"
msgstr "versión de paquete perdida en %s"
-#: lib/libalpm/package.c:607
-#, c-format
-msgid "could not remove tempfile %s"
+#: lib/libalpm/package.c:970
+#, fuzzy, c-format
+msgid "could not remove tempfile %s\n"
msgstr "no se pudo quitar el archivo temporal %s"
-#: lib/libalpm/package.c:623 lib/libalpm/package.c:630
-#, c-format
-msgid "error while reading package: %s"
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#, fuzzy, c-format
+msgid "error while reading package %s: %s\n"
msgstr "error mientras se leía el paquete : %s"
-#: lib/libalpm/package.c:636
-msgid "missing package metadata"
+#: lib/libalpm/package.c:1005
+#, fuzzy, c-format
+msgid "missing package metadata in %s\n"
msgstr "falta la metadata del paquete "
-#: lib/libalpm/package.c:643
-#, c-format
-msgid "missing package filelist in %s, generating one"
+#: lib/libalpm/package.c:1012
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one\n"
msgstr "falta la lita de paquetes en %s. generando una"
-#: lib/libalpm/remove.c:117
-#, c-format
-msgid "could not find %s in database -- skipping"
+#: lib/libalpm/remove.c:121
+#, fuzzy, c-format
+msgid "could not find %s in database -- skipping\n"
msgstr "no se pudo encontrar %s en la base de datos -- saltando"
-#: lib/libalpm/remove.c:168
-#, c-format
-msgid "cannot remove file '%s': %s"
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s\n"
msgstr "no se pudo quitar el archivo '%s': %s"
-#: lib/libalpm/remove.c:255
-#, c-format
-msgid "cannot remove file %s: %s"
-msgstr "no se pudo quitar el archivo %s: %s"
-
-#: lib/libalpm/remove.c:338
-#, c-format
-msgid "could not remove database entry %s-%s"
+#: lib/libalpm/remove.c:337
+#, fuzzy, c-format
+msgid "could not remove database entry %s-%s\n"
msgstr "no se pudo quitar de la base de datos %s-%s"
-#: lib/libalpm/remove.c:343
-#, c-format
-msgid "could not remove entry '%s' from cache"
+#: lib/libalpm/remove.c:342
+#, fuzzy, c-format
+msgid "could not remove entry '%s' from cache\n"
msgstr "no se pudo quitar la entrada '%s' de la cache"
-#: lib/libalpm/sha1.c:409
+#: lib/libalpm/server.c:56
#, c-format
-msgid "sha1: %s can't be opened\n"
-msgstr "sha1: %s no puede ser abierto\n"
+msgid "url '%s' is invalid, ignoring\n"
+msgstr ""
-#: lib/libalpm/sync.c:294
-#, c-format
-msgid "repository '%s' not found"
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
+msgstr ""
+
+#: lib/libalpm/server.c:241
+msgid "disk"
+msgstr ""
+
+#: lib/libalpm/server.c:245
+#, fuzzy, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "fallo al descargar algunos archivos desde %s\n"
+
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "no se pudo quitar el archivo '%s': %s"
+
+#: lib/libalpm/server.c:307
+#, fuzzy, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "error mientras se leía el paquete : %s"
+
+#: lib/libalpm/server.c:319
+#, fuzzy, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "no se pudo quitar el archivo '%s': %s"
+
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "no se pudo cambiar el directorio a / (%s)"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
+#, fuzzy, c-format
+msgid "failed to download %s\n"
+msgstr "no se pudo descargar todos los archivos"
+
+#: lib/libalpm/sync.c:135
+#, fuzzy, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr ""
+"%s-%s: ignorando la actualización del paquete(para ser reemplazado por %s-%s)"
+
+#: lib/libalpm/sync.c:250
+#, fuzzy, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s: ignorando la actualización del paquete (%s)"
+
+#: lib/libalpm/sync.c:320
+#, fuzzy, c-format
+msgid "repository '%s' not found\n"
msgstr "repositorio '%s' no encontrado"
-#: lib/libalpm/sync.c:335
-#, c-format
-msgid "%s-%s is up to date -- skipping"
+#: lib/libalpm/sync.c:354
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s esta al día -- saltando"
-#: lib/libalpm/sync.c:608 lib/libalpm/sync.c:624
-msgid "unresolvable package conflicts detected"
-msgstr "se han detectado paquetes con conflictos no resueltos"
-
-#: lib/libalpm/sync.c:778
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr "no existe la cache %s, creando...\n"
+#: lib/libalpm/sync.c:358
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s esta al día -- saltando"
-#: lib/libalpm/sync.c:804
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
#, fuzzy
-msgid "couldn't create package cache, using /tmp instead"
-msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n"
+msgid "unresolvable package conflicts detected\n"
+msgstr "se han detectado paquetes con conflictos no resueltos"
-#: lib/libalpm/sync.c:808
-#, c-format
-msgid "failed to retrieve some files from %s\n"
-msgstr "fallo al descargar algunos archivos desde %s\n"
+#: lib/libalpm/sync.c:628
+#, fuzzy, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "falla en malloc: no se pudo alocar %d bytes"
-#: lib/libalpm/sync.c:839 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:825
#, c-format
-msgid "can't get md5 or sha1 checksum for package %s\n"
+msgid "command: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#, fuzzy, c-format
+msgid "can't get md5 checksum for file %s\n"
msgstr "no se pudo verificar md5 o sha1 para el paquete %s\n"
-#: lib/libalpm/sync.c:878
-#, c-format
-msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
+#: lib/libalpm/sync.c:910
+#, fuzzy, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr ""
"el archivo %s estaba corrupto (no coincidió la verificación MD5 o SHA1)\n"
-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:1056
#, c-format
-msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-msgstr "el archivo %s esta corrupto (verificación MD5 o SHA1 errónea)\n"
+msgid "failed to retrieve some files from %s\n"
+msgstr "fallo al descargar algunos archivos desde %s\n"
-#: lib/libalpm/sync.c:901
-msgid "could not create removal transaction"
+#: lib/libalpm/sync.c:1137
+#, fuzzy
+msgid "could not create removal transaction\n"
msgstr "no se pudo crear la operación de eliminación"
-#: lib/libalpm/sync.c:907
-msgid "could not initialize the removal transaction"
+#: lib/libalpm/sync.c:1143
+#, fuzzy
+msgid "could not initialize the removal transaction\n"
msgstr "no se pudo iniciar la operación de eliminación"
-#: lib/libalpm/sync.c:929
-msgid "could not prepare removal transaction"
+#: lib/libalpm/sync.c:1165
+#, fuzzy
+msgid "could not prepare removal transaction\n"
msgstr "no se pudo preparar la operación de eliminación"
-#: lib/libalpm/sync.c:935
-msgid "could not commit removal transaction"
+#: lib/libalpm/sync.c:1171
+#, fuzzy
+msgid "could not commit removal transaction\n"
msgstr "no se pudo asignar la operación de quitado"
-#: lib/libalpm/sync.c:946
-msgid "could not create transaction"
+#: lib/libalpm/sync.c:1182
+#, fuzzy
+msgid "could not create transaction\n"
msgstr "no se pudo crear la operación"
-#: lib/libalpm/sync.c:951
-msgid "could not initialize transaction"
+#: lib/libalpm/sync.c:1187
+#, fuzzy
+msgid "could not initialize transaction\n"
msgstr "no se pudo iniciar la operación"
-#: lib/libalpm/sync.c:980
-msgid "could not prepare transaction"
+#: lib/libalpm/sync.c:1214
+#, fuzzy
+msgid "could not prepare transaction\n"
msgstr "no se pudo preparar la transacción"
-#: lib/libalpm/sync.c:1022
-#, c-format
-msgid "could not update requiredby for database entry %s-%s"
-msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s"
-
-#: lib/libalpm/sync.c:1031
-#, c-format
-msgid "could not update new database entry %s-%s"
-msgstr "no se pudo actualizar la nueva entrada a la base de datos %s-%s"
+#: lib/libalpm/sync.c:1219
+#, fuzzy
+msgid "could not commit transaction\n"
+msgstr "no se pudo hacer la transacción"
-#: lib/libalpm/trans.c:205
-#, c-format
-msgid "could not remove lock file %s"
+#: lib/libalpm/trans.c:214
+#, fuzzy, c-format
+msgid "could not remove lock file %s\n"
msgstr "no se pudo quitar el archivo de bloqueo %s"
-#: lib/libalpm/trans.c:498 lib/libalpm/trans.c:528
+#: lib/libalpm/trans.c:483
#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
-msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s"
+msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
+msgstr ""
-#: lib/libalpm/trans.c:589
-msgid "could not create temp directory"
+#: lib/libalpm/trans.c:494
+#, fuzzy
+msgid "could not create temp directory\n"
msgstr "no se puede crear el directorio temporal "
-#: lib/libalpm/trans.c:616
-#, c-format
-msgid "could not change directory to %s (%s)"
+#: lib/libalpm/trans.c:536
+#, fuzzy, c-format
+msgid "could not change directory to %s (%s)\n"
msgstr "no se pudo cambiar el directorio a %s (%s)"
-#: lib/libalpm/trans.c:633
-#, c-format
-msgid "could not fork a new process (%s)"
+#: lib/libalpm/trans.c:554
+#, fuzzy, c-format
+msgid "could not fork a new process (%s)\n"
msgstr "no se pudo crear un nuevo proceso (%s)"
-#: lib/libalpm/trans.c:641
-#, c-format
-msgid "could not change the root directory (%s)"
+#: lib/libalpm/trans.c:564
+#, fuzzy, c-format
+msgid "could not change the root directory (%s)\n"
msgstr "no se pudo cambiar el directorio raíz (%s)"
-#: lib/libalpm/trans.c:645
-#, c-format
-msgid "could not change directory to / (%s)"
+#: lib/libalpm/trans.c:569
+#, fuzzy, c-format
+msgid "could not change directory to / (%s)\n"
msgstr "no se pudo cambiar el directorio a / (%s)"
-#: lib/libalpm/trans.c:654
-#, c-format
-msgid "call to waitpid failed (%s)"
+#: lib/libalpm/trans.c:578
+#, fuzzy, c-format
+msgid "call to popen failed (%s)"
msgstr "llamada a waitpid fallida (%s)"
-#: lib/libalpm/trans.c:663
-#, c-format
-msgid "could not remove tmpdir %s"
+#: lib/libalpm/trans.c:597
+#, fuzzy, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "llamada a waitpid fallida (%s)"
+
+#: lib/libalpm/trans.c:606
+msgid "scriptlet failed to execute correctly\n"
+msgstr ""
+
+#: lib/libalpm/trans.c:615
+#, fuzzy, c-format
+msgid "could not remove tmpdir %s\n"
msgstr "no se pudo quitar el directorio temporal %s"
-#: lib/libalpm/util.c:127
-#, c-format
-msgid "failed to make path '%s' : %s"
+#: lib/libalpm/util.c:204
+#, fuzzy, c-format
+msgid "failed to make path '%s' : %s\n"
msgstr "fallo al crear la ruta '%s' : %s"
-#: lib/libalpm/util.c:325
+#: lib/libalpm/util.c:389
#, c-format
msgid "could not open %s: %s\n"
msgstr "no se pudo abrir %s: %s\n"
-#: lib/libalpm/util.c:346
+#: lib/libalpm/util.c:573
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "no existe la cache %s, creando...\n"
+
+#: lib/libalpm/util.c:593
+#, fuzzy
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n"
+
+#: lib/libalpm/util.c:643
#, fuzzy, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "no se pudo extraer %s (%s)"
+msgid "md5: %s can't be opened\n"
+msgstr "%s no puede ser abierto\n"
+
+#: lib/libalpm/util.c:645
+#, fuzzy, c-format
+msgid "md5: %s can't be read\n"
+msgstr "%s no puede ser abierto\n"
+
+#~ msgid "please remove '%s' first, using -Rd"
+#~ msgstr "por favor quitar '%s' primero, usando -Rd"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "no se pudo extraer %s (%s)"
+
+#~ msgid "could not update provision '%s' from '%s'"
+#~ msgstr "no se pudo actualizar la provisión '%s' desde '%s'"
+
+#, fuzzy
+#~ msgid "%s: description file is missing"
+#~ msgstr "%s: error de sintaxis en la linea de descripción de archivos %d"
+
+#~ msgid "malloc failed: could not allocate %d bytes"
+#~ msgstr "malloc falló: no se pudo alocar %d bytes"
+
+#~ msgid ""
+#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+#~ msgstr ""
+#~ "no se pudo resolver dependecias para \"%s\" (\"%s\" no está en las listas "
+#~ "de paquetes)"
+
+# canonicalize.. no supe traducirla bien
+#~ msgid "cannot canonicalize specified root path '%s'"
+#~ msgstr "no se pudo obtener el la ruta canonica de la raiz especificada '%s'"
+
+#~ msgid "could not get sha1sum for package %s-%s"
+#~ msgstr "no se pudo obtener la verificación sha1 para %s-%s"
+
+#~ msgid "sha1sums do not match for package %s-%s"
+#~ msgstr "la verificación sha1 no coincide para %s-%s"
+
+#~ msgid "cannot remove file %s: %s"
+#~ msgstr "no se pudo quitar el archivo %s: %s"
+
+#~ msgid "sha1: %s can't be opened\n"
+#~ msgstr "sha1: %s no puede ser abierto\n"
+
+#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+#~ msgstr "el archivo %s esta corrupto (verificación MD5 o SHA1 errónea)\n"
+
+#~ msgid "could not update requiredby for database entry %s-%s"
+#~ msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s"
+
+#~ msgid "could not update new database entry %s-%s"
+#~ msgstr "no se pudo actualizar la nueva entrada a la base de datos %s-%s"
+#~ msgid "could not update 'requiredby' database entry %s-%s"
+#~ msgstr "no se pudo actualizar \"requiredby\" para la entrada %s-%s"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index c912acdc..3ae1dff0 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-07-11 00:26-0400\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-04-17 12:45+0100\n"
"Last-Translator: nam <37ii11@altern.org>\n"
"Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
@@ -15,619 +15,733 @@ msgstr ""
"X-Poedit-Language: French\n"
"X-Poedit-Country: FRANCE\n"
-#: lib/libalpm/add.c:118
-#, c-format
-msgid "replacing older version %s-%s by %s in target list"
+#: lib/libalpm/add.c:88
+#, fuzzy, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
msgstr ""
"remplacement de l'ancienne version %s-%s par %s dans la liste des cibles"
-#: lib/libalpm/add.c:127
-#, c-format
-msgid "newer version %s-%s is in the target list -- skipping"
+#: lib/libalpm/add.c:97
+#, fuzzy, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr ""
"une version plus récente %s-%s est dans la liste des cibles -- paquet ignoré"
-#: lib/libalpm/add.c:201
-msgid "replacing packages with -A and -U is not supported yet"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+
+#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
+#, fuzzy
+msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "remplacer un paquet avec -A ou -U n'est pas encore possible"
-#: lib/libalpm/add.c:202
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
+
+#: lib/libalpm/add.c:365
#, c-format
-msgid "please remove '%s' first, using -Rd"
-msgstr "veuillez supprimer '%s' d'abord, en utilisant -Rd"
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o package: %o\n"
+msgstr ""
-# j'ai traduit chaque fois "could not" par "a échoué"
-#: lib/libalpm/add.c:428 lib/libalpm/trans.c:609
-msgid "could not get current working directory"
-msgstr "déterminer le répertoire courant a échoué"
+#: lib/libalpm/add.c:392
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr ""
-#: lib/libalpm/add.c:619
+#: lib/libalpm/add.c:399
#, c-format
-msgid "could not rename %s (%s)"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr ""
+
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#, fuzzy, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "l'extraction de %s (%s) a échoué"
+
+#: lib/libalpm/add.c:505
+#, fuzzy, c-format
+msgid "could not rename %s (%s)\n"
msgstr "renommer %s (%s) a échoué"
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:646
-#, c-format
-msgid "could not copy tempfile to %s (%s)"
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)\n"
msgstr "la copie du fichier temporaire vers %s (%s) a échoué"
-#: lib/libalpm/add.c:631 lib/libalpm/remove.c:241
-#, c-format
-msgid "%s saved as %s"
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#, fuzzy, c-format
+msgid "%s saved as %s\n"
msgstr "%s enregistré en tant que %s"
-#: lib/libalpm/add.c:670
-#, c-format
-msgid "could not install %s as %s: %s"
+#: lib/libalpm/add.c:556
+#, fuzzy, c-format
+msgid "could not install %s as %s: %s\n"
msgstr "l'installation de %s en tant que %s: %s a échoué"
-#: lib/libalpm/add.c:673
-#, c-format
-msgid "%s installed as %s"
+#: lib/libalpm/add.c:559
+#, fuzzy, c-format
+msgid "%s installed as %s\n"
msgstr "%s installé en tant que %s"
-#: lib/libalpm/add.c:689
-#, c-format
-msgid "extracting %s as %s.pacnew"
+#: lib/libalpm/add.c:576
+#, fuzzy, c-format
+msgid "extracting %s as %s.pacnew\n"
msgstr "extraction de %s comme %s.pacnew"
-#: lib/libalpm/add.c:721
-#, c-format
-msgid "could not extract %s (%s)"
-msgstr "l'extraction de %s (%s) a échoué"
+# j'ai traduit chaque fois "could not" par "a échoué"
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, fuzzy
+msgid "could not get current working directory\n"
+msgstr "déterminer le répertoire courant a échoué"
-#: lib/libalpm/add.c:772
+#: lib/libalpm/add.c:765
#, fuzzy, c-format
-msgid "problem occurred while upgrading %s"
+msgid "problem occurred while upgrading %s\n"
msgstr "des erreurs sont survenues pendant %s %s"
-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:770
#, fuzzy, c-format
-msgid "problem occurred while installing %s"
+msgid "problem occurred while installing %s\n"
msgstr "des erreurs sont survenues pendant %s %s"
-#: lib/libalpm/add.c:815
-#, c-format
-msgid "could not update provision '%s' from '%s'"
-msgstr "la mise à jour du contenu '%s' dans '%s' a échoué"
-
-#: lib/libalpm/add.c:835
-#, c-format
-msgid "could not update database entry %s-%s"
+#: lib/libalpm/add.c:785
+#, fuzzy, c-format
+msgid "could not update database entry %s-%s\n"
msgstr "la mise à jour l'entrée de base de données %s-%s a échoué"
-#: lib/libalpm/add.c:843
-#, c-format
-msgid "could not add entry '%s' in cache"
+#: lib/libalpm/add.c:793
+#, fuzzy, c-format
+msgid "could not add entry '%s' in cache\n"
msgstr "l'ajout au cache de l'entrée '%s' a échoué"
-#: lib/libalpm/be_files.c:83
+#: lib/libalpm/be_files.c:223
#, fuzzy, c-format
-msgid "%s: description file is missing"
-msgstr "%s: erreur de syntaxe dans le fichier de description à la ligne %d"
-
-#: lib/libalpm/be_files.c:88
-#, c-format
-msgid "%s: dependency file is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:93
-#, c-format
-msgid "%s: file list is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:216
-#, c-format
-msgid "invalid name for database entry '%s'"
+msgid "invalid name for database entry '%s'\n"
msgstr "nom invalide pour l'entrée de base de données '%s'"
-#: lib/libalpm/be_files.c:271
-#, c-format
-msgid "loading package data for %s : level=%d"
+#: lib/libalpm/be_files.c:275
+#, fuzzy, c-format
+msgid "loading package data for %s : level=%d\n"
msgstr "chargement des données du paquet %s : niveau=%d"
-#: lib/libalpm/be_files.c:288 lib/libalpm/be_files.c:434
-#: lib/libalpm/be_files.c:457 lib/libalpm/be_files.c:549
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:419
-#, c-format
-msgid "could not open file %s: %s"
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
+#, fuzzy, c-format
+msgid "could not open file %s: %s\n"
msgstr "l'ouverture du fichier %s: %s a échoué"
-#: lib/libalpm/cache.c:63
-#, c-format
-msgid "adding '%s' to package cache for db '%s'"
+#: lib/libalpm/cache.c:62
+#, fuzzy, c-format
+msgid "adding '%s' to package cache for db '%s'\n"
msgstr "ajout de '%s' au cache de paquets pour la base de données '%s'"
-#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:80 lib/libalpm/deps.c:449
-#: lib/libalpm/deps.c:650 lib/libalpm/deps.c:690 lib/libalpm/group.c:44
-#: lib/libalpm/handle.c:50 lib/libalpm/package.c:297 lib/libalpm/sync.c:62
-#: lib/libalpm/sync.c:612 lib/libalpm/sync.c:628 lib/libalpm/trans.c:223
-#, c-format
-msgid "malloc failure: could not allocate %d bytes"
-msgstr "erreur malloc: n'a pas pu allouer %d bytes"
-
-#: lib/libalpm/db.c:238
-#, c-format
-msgid "could not remove database entry %s%s"
+#: lib/libalpm/db.c:285
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s\n"
msgstr "la suppression de l'entrée de base de données %s%s a échoué"
-#: lib/libalpm/db.c:432 lib/libalpm/sync.c:128
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
-msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)"
-
-#: lib/libalpm/db.c:553 lib/libalpm/db.c:560
-#, c-format
-msgid "malloc failed: could not allocate %d bytes"
-msgstr "malloc a echoué: n'a pas pu allouer %d bytes"
-
-#: lib/libalpm/db.c:661
-msgid "attempt to re-register the 'local' DB"
+#: lib/libalpm/db.c:553
+#, fuzzy
+msgid "attempt to re-register the 'local' DB\n"
msgstr "tentative de ré-enregistrer la base de données locale"
-#: lib/libalpm/db.c:680
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
#, fuzzy
-msgid "database path is undefined"
+msgid "database path is undefined\n"
msgstr "base de données non initialisée"
-#: lib/libalpm/deps.c:187
+#: lib/libalpm/deps.c:173
#, fuzzy
-msgid "dependency cycle detected\n"
+msgid "dependency cycle detected:\n"
msgstr "cycle de dépendances détecté: %s"
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:175
#, c-format
-msgid ""
-"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid "%s will be removed after its %s dependency\n"
msgstr ""
-"résolution des dépendances impossible pour \"%s\" (\"%s\" n'est pas parmi "
-"les paquets)"
-#: lib/libalpm/deps.c:687
+#: lib/libalpm/deps.c:177
#, c-format
-msgid "cannot resolve dependencies for \"%s\""
+msgid "%s will be installed before its %s dependency\n"
+msgstr ""
+
+#: lib/libalpm/deps.c:573
+#, fuzzy, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "résolution des dépendances impossible pour \"%s\""
-#: lib/libalpm/error.c:38
+#: lib/libalpm/error.c:43
msgid "out of memory!"
msgstr "dépassement de mémoire!"
-#: lib/libalpm/error.c:40
+#: lib/libalpm/error.c:45
msgid "unexpected system error"
msgstr "erreur système non prévue"
-#: lib/libalpm/error.c:42
+#: lib/libalpm/error.c:47
msgid "insufficient privileges"
msgstr "autorisation insuffisante"
-#: lib/libalpm/error.c:44
+#: lib/libalpm/error.c:49
msgid "could not find or read file"
msgstr "trouver ou lire le fichier a échoué"
-#: lib/libalpm/error.c:46
+#: lib/libalpm/error.c:51
+#, fuzzy
+msgid "could not find or read directory"
+msgstr "trouver ou lire le fichier a échoué"
+
+#: lib/libalpm/error.c:53
msgid "wrong or NULL argument passed"
msgstr "un argument erroné ou nul a été fourni"
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:56
msgid "library not initialized"
msgstr "librairie non initialisée"
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:58
msgid "library already initialized"
msgstr "librairie déjà initialisée"
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:60
msgid "unable to lock database"
msgstr "verrouillage de la base de données impossible"
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:63
msgid "could not open database"
msgstr "l'ouverture de la base de données a échoué"
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:65
msgid "could not create database"
msgstr "la création de la base de données a échoué"
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:67
msgid "database not initialized"
msgstr "base de données non initialisée"
-#: lib/libalpm/error.c:62
+#: lib/libalpm/error.c:69
msgid "database already registered"
msgstr "base de données déjà enregistrée"
-#: lib/libalpm/error.c:64
+#: lib/libalpm/error.c:71
msgid "could not find database"
msgstr "trouver la base de données a échoué"
-#: lib/libalpm/error.c:66
+#: lib/libalpm/error.c:73
msgid "could not update database"
msgstr "la mise à jour de la base de données a échoué"
-#: lib/libalpm/error.c:68
+#: lib/libalpm/error.c:75
msgid "could not remove database entry"
msgstr "la suppression de l'entrée de base de données a échoué"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:78
msgid "invalid url for server"
msgstr "URL invalide pour le serveur"
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:85
msgid "could not set parameter"
msgstr "définir le paramètre a échoué"
-#: lib/libalpm/error.c:81
+#: lib/libalpm/error.c:88
msgid "transaction already initialized"
msgstr "transaction déjà initialisée"
-#: lib/libalpm/error.c:83 lib/libalpm/error.c:87
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr "transaction non initialisée"
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:92
msgid "duplicate target"
msgstr "cible répétée"
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:96
msgid "transaction not prepared"
msgstr "transaction non préparée"
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "transaction aborted"
msgstr "transaction annulée"
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "operation not compatible with the transaction type"
msgstr "opération incompatible avec le type de transaction"
-#: lib/libalpm/error.c:95 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:102
msgid "could not commit transaction"
msgstr "appliquer la transaction a échoué"
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "could not download all files"
msgstr "tous les fichiers n'ont pas pu être téléchargés"
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:107
msgid "could not find or read package"
msgstr "trouver ou de lire le paquet a échoué"
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:109
msgid "invalid or corrupted package"
msgstr "paquet invalide ou corrompu"
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:111
msgid "cannot open package file"
msgstr "ouverture du fichier paquet impossible"
-#: lib/libalpm/error.c:106
+#: lib/libalpm/error.c:113
msgid "cannot load package data"
msgstr "chargement des données du paquet impossible"
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:115
msgid "package already installed"
msgstr "paquet déjà installé"
-#: lib/libalpm/error.c:110
+#: lib/libalpm/error.c:117
msgid "package not installed or lesser version"
msgstr "paquet non installé ou version plus ancienne"
-#: lib/libalpm/error.c:112
+#: lib/libalpm/error.c:119
msgid "cannot remove all files for package"
msgstr "suppression de certains fichiers du paquet impossible"
-#: lib/libalpm/error.c:114
+#: lib/libalpm/error.c:121
msgid "package name is not valid"
msgstr "nom de paquet invalide"
-#: lib/libalpm/error.c:116
+#: lib/libalpm/error.c:123
msgid "corrupted package"
msgstr "paquet corrompu"
-#: lib/libalpm/error.c:118
+#: lib/libalpm/error.c:125
msgid "no such repository"
msgstr "ce dépôt n'existe pas"
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:128
+#, fuzzy
+msgid "corrupted delta"
+msgstr "paquet corrompu"
+
+#: lib/libalpm/error.c:130
+msgid "delta patch failed"
+msgstr ""
+
+#: lib/libalpm/error.c:133
msgid "group not found"
msgstr "groupe non trouvé"
-#: lib/libalpm/error.c:124
+#: lib/libalpm/error.c:136
msgid "could not satisfy dependencies"
msgstr "la satisfaction des dépendances a échoué"
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:138
msgid "conflicting dependencies"
msgstr "conflit de dépendances"
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:140
msgid "conflicting files"
msgstr "conflit de fichiers"
-#: lib/libalpm/error.c:131
+#: lib/libalpm/error.c:143
msgid "user aborted the operation"
msgstr "opération annulée par l'utilisateur"
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:145
msgid "internal error"
msgstr "erreur interne"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:147
msgid "libarchive error"
msgstr "erreur de libarchive"
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:150
msgid "not confirmed"
msgstr "non confirmé"
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:152
msgid "invalid regular expression"
msgstr "expression régulière incorrecte"
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:155
msgid "connection to remote host failed"
msgstr "échec de connexion à l'hôte distant "
-#: lib/libalpm/error.c:146
+#: lib/libalpm/error.c:158
msgid "unexpected error"
msgstr "erreur non prévue"
-#: lib/libalpm/handle.c:140
-#, c-format
-msgid "cannot canonicalize specified root path '%s'"
-msgstr "normalisation du chemin root '%s' impossible"
-
-#: lib/libalpm/md5driver.c:69
+#: lib/libalpm/package.c:124
#, fuzzy, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "l'ouverture de %s a échoué\n"
-
-#: lib/libalpm/package.c:129
-#, c-format
-msgid "could not get sha1sum for package %s-%s"
-msgstr "l'obtention de la 'signature' sha1 pour le paquet %s-%s a échoué"
-
-#: lib/libalpm/package.c:138
-#, c-format
-msgid "sha1sums do not match for package %s-%s"
-msgstr "les 'signatures' sha1 ne correspondent pas pour le paquet %s-%s"
-
-#: lib/libalpm/package.c:180
-#, c-format
-msgid "could not get md5sum for package %s-%s"
+msgid "could not get md5sum for package %s-%s\n"
msgstr "l'obtention de la 'signature' md5 pour le paquet %s-%s a échoué"
-#: lib/libalpm/package.c:189
-#, c-format
-msgid "md5sums do not match for package %s-%s"
+#: lib/libalpm/package.c:133
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s\n"
msgstr "les 'signatures' md5 ne correspondent pas pour le paquet %s-%s"
-#: lib/libalpm/package.c:360
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: ignore la mise à jour du paquet (%s)"
-
-#: lib/libalpm/package.c:369
-#, c-format
-msgid "%s: forcing upgrade to version %s"
+#: lib/libalpm/package.c:737
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s\n"
msgstr "%s: force la mise à jour à la version %s"
-#: lib/libalpm/package.c:374
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
+#: lib/libalpm/package.c:742
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr "%s: la version locale (%s) est plus récente que %s (%s)"
-#: lib/libalpm/package.c:382
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
+#: lib/libalpm/package.c:750
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)\n"
msgstr "%s-%s: retarde la mise à jour du paquet (%s)"
-#: lib/libalpm/package.c:564
-msgid "could not parse the package description file"
+#: lib/libalpm/package.c:931
+#, fuzzy, c-format
+msgid "could not parse package description file in %s\n"
msgstr "l'analyse du fichier de description a échoué"
-#: lib/libalpm/package.c:568
-#, c-format
-msgid "missing package name in %s"
+#: lib/libalpm/package.c:936
+#, fuzzy, c-format
+msgid "missing package name in %s\n"
msgstr "nom de paquet manquant dans %s"
-#: lib/libalpm/package.c:572
-#, c-format
-msgid "missing package version in %s"
+#: lib/libalpm/package.c:940
+#, fuzzy, c-format
+msgid "missing package version in %s\n"
msgstr "version de paquet manquante dans %s"
-#: lib/libalpm/package.c:607
-#, c-format
-msgid "could not remove tempfile %s"
+#: lib/libalpm/package.c:970
+#, fuzzy, c-format
+msgid "could not remove tempfile %s\n"
msgstr "la suppression du fichier temporaire %s a échoué"
-#: lib/libalpm/package.c:623 lib/libalpm/package.c:630
-#, c-format
-msgid "error while reading package: %s"
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#, fuzzy, c-format
+msgid "error while reading package %s: %s\n"
msgstr "erreur lors de la lecture du paquet: %s"
-#: lib/libalpm/package.c:636
-msgid "missing package metadata"
+#: lib/libalpm/package.c:1005
+#, fuzzy, c-format
+msgid "missing package metadata in %s\n"
msgstr "méta-données du paquet manquantes"
-#: lib/libalpm/package.c:643
-#, c-format
-msgid "missing package filelist in %s, generating one"
+#: lib/libalpm/package.c:1012
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one\n"
msgstr "liste de fichiers absente du paquet %s, création"
-#: lib/libalpm/remove.c:117
-#, c-format
-msgid "could not find %s in database -- skipping"
+#: lib/libalpm/remove.c:121
+#, fuzzy, c-format
+msgid "could not find %s in database -- skipping\n"
msgstr "trouver %s dans la base de données a échoué -- ignoré"
-#: lib/libalpm/remove.c:168
-#, c-format
-msgid "cannot remove file '%s': %s"
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s\n"
msgstr "suppression du fichier '%s': %s impossible"
-#: lib/libalpm/remove.c:255
-#, c-format
-msgid "cannot remove file %s: %s"
-msgstr "suppression du fichier %s: %s impossible"
-
-#: lib/libalpm/remove.c:338
-#, c-format
-msgid "could not remove database entry %s-%s"
+#: lib/libalpm/remove.c:337
+#, fuzzy, c-format
+msgid "could not remove database entry %s-%s\n"
msgstr "la suppression de l'entrée de base de données %s-%s a échoué"
-#: lib/libalpm/remove.c:343
-#, c-format
-msgid "could not remove entry '%s' from cache"
+#: lib/libalpm/remove.c:342
+#, fuzzy, c-format
+msgid "could not remove entry '%s' from cache\n"
msgstr "la suppression du cache de l'entrée '%s' a échoué"
-#: lib/libalpm/sha1.c:409
+#: lib/libalpm/server.c:56
#, c-format
-msgid "sha1: %s can't be opened\n"
-msgstr "sha1: %s ne peut être ouvert\n"
+msgid "url '%s' is invalid, ignoring\n"
+msgstr ""
-#: lib/libalpm/sync.c:294
-#, c-format
-msgid "repository '%s' not found"
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
+msgstr ""
+
+#: lib/libalpm/server.c:241
+msgid "disk"
+msgstr ""
+
+#: lib/libalpm/server.c:245
+#, fuzzy, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "échec de récupération de certains fichiers depuis %s\n"
+
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "suppression du fichier '%s': %s impossible"
+
+#: lib/libalpm/server.c:307
+#, fuzzy, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "erreur lors de la lecture du paquet: %s"
+
+#: lib/libalpm/server.c:319
+#, fuzzy, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "suppression du fichier '%s': %s impossible"
+
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "changer de répertoire vers / (%s) a échoué"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
+#, fuzzy, c-format
+msgid "failed to download %s\n"
+msgstr "tous les fichiers n'ont pas pu être téléchargés"
+
+#: lib/libalpm/sync.c:135
+#, fuzzy, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)"
+
+#: lib/libalpm/sync.c:250
+#, fuzzy, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s: ignore la mise à jour du paquet (%s)"
+
+#: lib/libalpm/sync.c:320
+#, fuzzy, c-format
+msgid "repository '%s' not found\n"
msgstr "dépôt '%s' non trouvé"
-#: lib/libalpm/sync.c:335
-#, c-format
-msgid "%s-%s is up to date -- skipping"
+#: lib/libalpm/sync.c:354
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s est à jour -- ignoré"
-#: lib/libalpm/sync.c:608 lib/libalpm/sync.c:624
-msgid "unresolvable package conflicts detected"
-msgstr "un conflit de paquets impossible à résoudre a été détecté"
-
-#: lib/libalpm/sync.c:778
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr "le cache %s n'existe pas, création...\n"
+#: lib/libalpm/sync.c:358
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s est à jour -- ignoré"
-#: lib/libalpm/sync.c:804
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
#, fuzzy
-msgid "couldn't create package cache, using /tmp instead"
-msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n"
+msgid "unresolvable package conflicts detected\n"
+msgstr "un conflit de paquets impossible à résoudre a été détecté"
-#: lib/libalpm/sync.c:808
-#, c-format
-msgid "failed to retrieve some files from %s\n"
-msgstr "échec de récupération de certains fichiers depuis %s\n"
+#: lib/libalpm/sync.c:628
+#, fuzzy, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "erreur malloc: n'a pas pu allouer %d bytes"
-#: lib/libalpm/sync.c:839 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:825
#, c-format
-msgid "can't get md5 or sha1 checksum for package %s\n"
+msgid "command: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#, fuzzy, c-format
+msgid "can't get md5 checksum for file %s\n"
msgstr "ne peut obtenir la 'signature' md5 ou sha1 pour le paquet %s\n"
-#: lib/libalpm/sync.c:878
-#, c-format
-msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
+#: lib/libalpm/sync.c:910
+#, fuzzy, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr "l'archive %s était corrompue (mauvaise somme MD5 ou SHA1)\n"
-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:1056
#, 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"
+msgid "failed to retrieve some files from %s\n"
+msgstr "échec de récupération de certains fichiers depuis %s\n"
-#: lib/libalpm/sync.c:901
-msgid "could not create removal transaction"
+#: lib/libalpm/sync.c:1137
+#, fuzzy
+msgid "could not create removal transaction\n"
msgstr "la création de la transaction de suppression a échoué"
-#: lib/libalpm/sync.c:907
-msgid "could not initialize the removal transaction"
+#: lib/libalpm/sync.c:1143
+#, fuzzy
+msgid "could not initialize the removal transaction\n"
msgstr "l'initialisation de la transaction de suppression a échoué"
-#: lib/libalpm/sync.c:929
-msgid "could not prepare removal transaction"
+#: lib/libalpm/sync.c:1165
+#, fuzzy
+msgid "could not prepare removal transaction\n"
msgstr "la préparation de la transaction de suppression a échoué"
-#: lib/libalpm/sync.c:935
-msgid "could not commit removal transaction"
+#: lib/libalpm/sync.c:1171
+#, fuzzy
+msgid "could not commit removal transaction\n"
msgstr "appliquer la transaction de suppression a échoué"
-#: lib/libalpm/sync.c:946
-msgid "could not create transaction"
+#: lib/libalpm/sync.c:1182
+#, fuzzy
+msgid "could not create transaction\n"
msgstr "la création de la transaction a échoué"
-#: lib/libalpm/sync.c:951
-msgid "could not initialize transaction"
+#: lib/libalpm/sync.c:1187
+#, fuzzy
+msgid "could not initialize transaction\n"
msgstr "l'initialisation de la transaction a échoué"
-#: lib/libalpm/sync.c:980
-msgid "could not prepare transaction"
+#: lib/libalpm/sync.c:1214
+#, fuzzy
+msgid "could not prepare transaction\n"
msgstr "la préparation de la transaction a échoué"
-#: lib/libalpm/sync.c:1022
-#, c-format
-msgid "could not update requiredby for database entry %s-%s"
-msgstr ""
-"la mise à jour du champ requiredby pour l'entrée de base de données %s-%s a "
-"échoué"
-
-#: lib/libalpm/sync.c:1031
-#, c-format
-msgid "could not update new database entry %s-%s"
-msgstr "la mise à jour de la nouvelle entrée de base de données %s-%s a échoué"
+#: lib/libalpm/sync.c:1219
+#, fuzzy
+msgid "could not commit transaction\n"
+msgstr "appliquer la transaction a échoué"
-#: lib/libalpm/trans.c:205
-#, c-format
-msgid "could not remove lock file %s"
+#: lib/libalpm/trans.c:214
+#, fuzzy, c-format
+msgid "could not remove lock file %s\n"
msgstr "la suppression du fichier de verrouillage %s a échoué"
-#: lib/libalpm/trans.c:498 lib/libalpm/trans.c:528
+#: lib/libalpm/trans.c:483
#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
+msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
msgstr ""
-"la mise à jour du champ 'requiredby' de l'entrée de base de données %s-%s a "
-"échoué"
-#: lib/libalpm/trans.c:589
-msgid "could not create temp directory"
+#: lib/libalpm/trans.c:494
+#, fuzzy
+msgid "could not create temp directory\n"
msgstr "la création du répertoire temporaire a échoué"
-#: lib/libalpm/trans.c:616
-#, c-format
-msgid "could not change directory to %s (%s)"
+#: lib/libalpm/trans.c:536
+#, fuzzy, c-format
+msgid "could not change directory to %s (%s)\n"
msgstr "changer de répertoire vers %s (%s) a échoué"
-#: lib/libalpm/trans.c:633
-#, c-format
-msgid "could not fork a new process (%s)"
+#: lib/libalpm/trans.c:554
+#, fuzzy, c-format
+msgid "could not fork a new process (%s)\n"
msgstr "la génération d'un nouveau processus (%s) a échoué"
-#: lib/libalpm/trans.c:641
-#, c-format
-msgid "could not change the root directory (%s)"
+#: lib/libalpm/trans.c:564
+#, fuzzy, c-format
+msgid "could not change the root directory (%s)\n"
msgstr "changer le répertoire racine (%s) a échoué"
-#: lib/libalpm/trans.c:645
-#, c-format
-msgid "could not change directory to / (%s)"
+#: lib/libalpm/trans.c:569
+#, fuzzy, c-format
+msgid "could not change directory to / (%s)\n"
msgstr "changer de répertoire vers / (%s) a échoué"
-#: lib/libalpm/trans.c:654
-#, c-format
-msgid "call to waitpid failed (%s)"
+#: lib/libalpm/trans.c:578
+#, fuzzy, c-format
+msgid "call to popen failed (%s)"
msgstr "call to waitpid failed (%s)"
-#: lib/libalpm/trans.c:663
-#, c-format
-msgid "could not remove tmpdir %s"
+#: lib/libalpm/trans.c:597
+#, fuzzy, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "call to waitpid failed (%s)"
+
+#: lib/libalpm/trans.c:606
+msgid "scriptlet failed to execute correctly\n"
+msgstr ""
+
+#: lib/libalpm/trans.c:615
+#, fuzzy, c-format
+msgid "could not remove tmpdir %s\n"
msgstr "la suppression du répertoire temporaire %s a échoué"
-#: lib/libalpm/util.c:127
-#, c-format
-msgid "failed to make path '%s' : %s"
+#: lib/libalpm/util.c:204
+#, fuzzy, c-format
+msgid "failed to make path '%s' : %s\n"
msgstr "échec de la création du chemin '%s' : %s"
-#: lib/libalpm/util.c:325
+#: lib/libalpm/util.c:389
#, c-format
msgid "could not open %s: %s\n"
msgstr "l'ouverture de %s: %s a échoué\n"
-#: lib/libalpm/util.c:346
+#: lib/libalpm/util.c:573
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "le cache %s n'existe pas, création...\n"
+
+#: lib/libalpm/util.c:593
+#, fuzzy
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n"
+
+#: lib/libalpm/util.c:643
#, fuzzy, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "l'extraction de %s (%s) a échoué"
+msgid "md5: %s can't be opened\n"
+msgstr "l'ouverture de %s a échoué\n"
+
+#: lib/libalpm/util.c:645
+#, fuzzy, c-format
+msgid "md5: %s can't be read\n"
+msgstr "l'ouverture de %s a échoué\n"
+
+#~ msgid "please remove '%s' first, using -Rd"
+#~ msgstr "veuillez supprimer '%s' d'abord, en utilisant -Rd"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "l'extraction de %s (%s) a échoué"
+
+#~ msgid "could not update provision '%s' from '%s'"
+#~ msgstr "la mise à jour du contenu '%s' dans '%s' a échoué"
+
+#, fuzzy
+#~ msgid "%s: description file is missing"
+#~ msgstr "%s: erreur de syntaxe dans le fichier de description à la ligne %d"
+
+#~ msgid "malloc failed: could not allocate %d bytes"
+#~ msgstr "malloc a echoué: n'a pas pu allouer %d bytes"
+
+#~ msgid ""
+#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+#~ msgstr ""
+#~ "résolution des dépendances impossible pour \"%s\" (\"%s\" n'est pas parmi "
+#~ "les paquets)"
+
+#~ msgid "cannot canonicalize specified root path '%s'"
+#~ msgstr "normalisation du chemin root '%s' impossible"
+
+#~ msgid "could not get sha1sum for package %s-%s"
+#~ msgstr "l'obtention de la 'signature' sha1 pour le paquet %s-%s a échoué"
+
+#~ msgid "sha1sums do not match for package %s-%s"
+#~ msgstr "les 'signatures' sha1 ne correspondent pas pour le paquet %s-%s"
+
+#~ msgid "cannot remove file %s: %s"
+#~ msgstr "suppression du fichier %s: %s impossible"
+
+#~ msgid "sha1: %s can't be opened\n"
+#~ msgstr "sha1: %s ne peut être ouvert\n"
+
+#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+#~ msgstr "l'archive %s est corrompue (mauvaise somme MD5 ou SHA1)\n"
+
+#~ msgid "could not update requiredby for database entry %s-%s"
+#~ msgstr ""
+#~ "la mise à jour du champ requiredby pour l'entrée de base de données %s-%s "
+#~ "a échoué"
+
+#~ msgid "could not update new database entry %s-%s"
+#~ msgstr ""
+#~ "la mise à jour de la nouvelle entrée de base de données %s-%s a échoué"
+#~ msgid "could not update 'requiredby' database entry %s-%s"
+#~ msgstr ""
+#~ "la mise à jour du champ 'requiredby' de l'entrée de base de données %s-%s "
+#~ "a échoué"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index c22f3c77..cd0555fe 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-07-13 14:54+0200\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-03-14 13:45+0100\n"
"Last-Translator: Nagy Gabor <ngaba@petra.hos.u-szeged.hu>\n"
"Language-Team: <hu@li.org>\n"
@@ -17,609 +17,728 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: lib/libalpm/add.c:118
-#, c-format
-msgid "replacing older version %s-%s by %s in target list"
+#: lib/libalpm/add.c:88
+#, fuzzy, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
msgstr "a %s-%s-t lecser�li a %s a c�l list�ban"
-#: lib/libalpm/add.c:127
-#, c-format
-msgid "newer version %s-%s is in the target list -- skipping"
+#: lib/libalpm/add.c:97
+#, fuzzy, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr "az �jabb verzi� (%s-%s) m�r el�rhet� a c�l list�ban -- kihagy�s"
-#: lib/libalpm/add.c:201
-msgid "replacing packages with -A and -U is not supported yet"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+
+#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
+#, fuzzy
+msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "csomagok lecser�l�se m�g nem t�mogatott -A �s -U eset�n"
-#: lib/libalpm/add.c:202
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
+
+#: lib/libalpm/add.c:365
#, c-format
-msgid "please remove '%s' first, using -Rd"
-msgstr "k�rem el�sz�r t�vol�tsa el '%s'-t a -Rd kapcsol�t haszn�lva"
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o package: %o\n"
+msgstr ""
-#: lib/libalpm/add.c:428 lib/libalpm/trans.c:609
-msgid "could not get current working directory"
-msgstr "a jelenlegi munkak�nyvt�r nem kaphat� meg"
+#: lib/libalpm/add.c:392
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr ""
-#: lib/libalpm/add.c:619
+#: lib/libalpm/add.c:399
#, c-format
-msgid "could not rename %s (%s)"
-msgstr "nem siker�lt �tnevezni: %s (%s)"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr ""
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:646
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
#, c-format
-msgid "could not copy tempfile to %s (%s)"
+msgid "could not extract %s (%s)\n"
+msgstr "nem siker�lt kit�m�r�teni: %s (%s)\n"
+
+#: lib/libalpm/add.c:505
+#, fuzzy, c-format
+msgid "could not rename %s (%s)\n"
+msgstr "nem siker�lt �tnevezni: %s (%s)"
+
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)\n"
msgstr "nem siker�lt az ideiglenes f�jlt ide m�solni: %s (%s)"
-#: lib/libalpm/add.c:631 lib/libalpm/remove.c:241
-#, c-format
-msgid "%s saved as %s"
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#, fuzzy, c-format
+msgid "%s saved as %s\n"
msgstr "a %s elmentve %s n�ven"
-#: lib/libalpm/add.c:670
-#, c-format
-msgid "could not install %s as %s: %s"
+#: lib/libalpm/add.c:556
+#, fuzzy, c-format
+msgid "could not install %s as %s: %s\n"
msgstr "nem siker�lt telep�teni a %s-t %s-k�nt: %s"
-#: lib/libalpm/add.c:673
-#, c-format
-msgid "%s installed as %s"
+#: lib/libalpm/add.c:559
+#, fuzzy, c-format
+msgid "%s installed as %s\n"
msgstr "a %s %s n�ven lett telep�tve"
-#: lib/libalpm/add.c:689
-#, c-format
-msgid "extracting %s as %s.pacnew"
+#: lib/libalpm/add.c:576
+#, fuzzy, c-format
+msgid "extracting %s as %s.pacnew\n"
msgstr "%s kit�m�r�t�se %s.pacnew n�ven"
-#: lib/libalpm/add.c:721
-#, c-format
-msgid "could not extract %s (%s)"
-msgstr "nem siker�lt kit�m�r�teni: %s (%s)"
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, fuzzy
+msgid "could not get current working directory\n"
+msgstr "a jelenlegi munkak�nyvt�r nem kaphat� meg"
-#: lib/libalpm/add.c:772
-#, c-format
-msgid "problem occurred while upgrading %s"
+#: lib/libalpm/add.c:765
+#, fuzzy, c-format
+msgid "problem occurred while upgrading %s\n"
msgstr "hiba t�rt�nt a(z) %s friss�t�se k�zben"
-#: lib/libalpm/add.c:777
-#, c-format
-msgid "problem occurred while installing %s"
+#: lib/libalpm/add.c:770
+#, fuzzy, c-format
+msgid "problem occurred while installing %s\n"
msgstr "hiba t�rt�nt a(z) %s telep�t�se k�zben"
-#: lib/libalpm/add.c:815
-#, c-format
-msgid "could not update provision '%s' from '%s'"
-msgstr ""
-
-#: lib/libalpm/add.c:835
-#, c-format
-msgid "could not update database entry %s-%s"
+#: lib/libalpm/add.c:785
+#, fuzzy, c-format
+msgid "could not update database entry %s-%s\n"
msgstr "sikertelen a '%s-%s' adatb�zis-bejegyz�s friss�t�se"
-#: lib/libalpm/add.c:843
-#, c-format
-msgid "could not add entry '%s' in cache"
+#: lib/libalpm/add.c:793
+#, fuzzy, c-format
+msgid "could not add entry '%s' in cache\n"
msgstr "sikertelen a '%s' bejegyz�s hozz�ad�sa a gyors�t�t�rhoz"
-#: lib/libalpm/be_files.c:83
-#, c-format
-msgid "%s: description file is missing"
-msgstr "%s: hi�nyz� csomagle�r� f�jl"
-
-#: lib/libalpm/be_files.c:88
-#, c-format
-msgid "%s: dependency file is missing"
-msgstr "%s: hi�nyz� csomagf�gg�s�g f�jl"
-
-#: lib/libalpm/be_files.c:93
-#, c-format
-msgid "%s: file list is missing"
-msgstr "%s: hi�nyz� f�jllista"
-
-#: lib/libalpm/be_files.c:216
-#, c-format
-msgid "invalid name for database entry '%s'"
+#: lib/libalpm/be_files.c:223
+#, fuzzy, c-format
+msgid "invalid name for database entry '%s'\n"
msgstr "�rv�nytelen n�v a '%s' adatb�zis-bejegyz�s sz�m�ra"
-#: lib/libalpm/be_files.c:271
-#, c-format
-msgid "loading package data for %s : level=%d"
+#: lib/libalpm/be_files.c:275
+#, fuzzy, c-format
+msgid "loading package data for %s : level=%d\n"
msgstr "a(z) %s csomag adatainak bet�lt�se : szint=%d"
-#: lib/libalpm/be_files.c:288 lib/libalpm/be_files.c:434
-#: lib/libalpm/be_files.c:457 lib/libalpm/be_files.c:549
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:419
-#, c-format
-msgid "could not open file %s: %s"
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
+#, fuzzy, c-format
+msgid "could not open file %s: %s\n"
msgstr "nem siker�lt megnyitni a %s f�jlt: %s"
-#: lib/libalpm/cache.c:63
-#, c-format
-msgid "adding '%s' to package cache for db '%s'"
+#: lib/libalpm/cache.c:62
+#, fuzzy, c-format
+msgid "adding '%s' to package cache for db '%s'\n"
msgstr "a(z) '%s' csomag hozz�ad�sa a(z) '%s' adatb�zis csomaggyors�t�t�r�hoz"
-#: lib/libalpm/conflict.c:339 lib/libalpm/deps.c:80 lib/libalpm/deps.c:449
-#: lib/libalpm/deps.c:650 lib/libalpm/deps.c:690 lib/libalpm/group.c:44
-#: lib/libalpm/handle.c:50 lib/libalpm/package.c:297 lib/libalpm/sync.c:62
-#: lib/libalpm/sync.c:612 lib/libalpm/sync.c:628 lib/libalpm/trans.c:223
-#, c-format
-msgid "malloc failure: could not allocate %d bytes"
-msgstr "malloc probl�ma: nem siker�lt allok�lni %d byte-ot"
-
-#: lib/libalpm/db.c:238
-#, c-format
-msgid "could not remove database entry %s%s"
+#: lib/libalpm/db.c:285
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s\n"
msgstr "sikertelen a %s%s adatb�zis-bejegyz�s elt�vol�t�sa"
-#: lib/libalpm/db.c:432 lib/libalpm/sync.c:128
-#, 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/db.c:553 lib/libalpm/db.c:560
-#, c-format
-msgid "malloc failed: could not allocate %d bytes"
-msgstr "malloc probl�ma: nem siker�lt allok�lni %d byte-ot"
-
-#: lib/libalpm/db.c:661
-msgid "attempt to re-register the 'local' DB"
+#: lib/libalpm/db.c:553
+#, fuzzy
+msgid "attempt to re-register the 'local' DB\n"
msgstr "k�s�rlet a 'local' adatb�zis �jraregisztr�l�s�ra"
-#: lib/libalpm/db.c:680
-msgid "database path is undefined"
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
+#, fuzzy
+msgid "database path is undefined\n"
msgstr "az adatb�zis-�tvonal nincs megadva"
-#: lib/libalpm/deps.c:187
-msgid "dependency cycle detected\n"
+#: lib/libalpm/deps.c:173
+#, fuzzy
+msgid "dependency cycle detected:\n"
msgstr "k�rk�r�s f�gg�s�g �szlelve\n"
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:175
#, c-format
-msgid ""
-"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid "%s will be removed after its %s dependency\n"
msgstr ""
-"nem siker�lt a f�gg�s�gek felold�sa a \"%s\" sz�m�ra (nem tal�lhat� a \"%s\" "
-"a csomagok k�z�tt)"
-#: lib/libalpm/deps.c:687
+#: lib/libalpm/deps.c:177
#, c-format
-msgid "cannot resolve dependencies for \"%s\""
+msgid "%s will be installed before its %s dependency\n"
+msgstr ""
+
+#: lib/libalpm/deps.c:573
+#, fuzzy, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "nem siker�lt feloldani a f�gg�s�geket a \"%s\" sz�m�ra"
-#: lib/libalpm/error.c:38
+#: lib/libalpm/error.c:43
msgid "out of memory!"
msgstr "elfogyott a mem�ria!"
-#: lib/libalpm/error.c:40
+#: lib/libalpm/error.c:45
msgid "unexpected system error"
msgstr "nemv�rt hiba"
-#: lib/libalpm/error.c:42
+#: lib/libalpm/error.c:47
msgid "insufficient privileges"
msgstr "el�gtelen jogosults�gok"
-#: lib/libalpm/error.c:44
+#: lib/libalpm/error.c:49
msgid "could not find or read file"
msgstr "nem tal�lhat� vagy nem olvashat� a f�jl"
-#: lib/libalpm/error.c:46
+#: lib/libalpm/error.c:51
+#, fuzzy
+msgid "could not find or read directory"
+msgstr "nem tal�lhat� vagy nem olvashat� a f�jl"
+
+#: lib/libalpm/error.c:53
msgid "wrong or NULL argument passed"
msgstr "rossz vagy NULL argumentum �rkezett"
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:56
msgid "library not initialized"
msgstr "a k�nyvt�r nem inicializ�lt"
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:58
msgid "library already initialized"
msgstr "a k�nyvt�r m�r inicializ�lt"
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:60
msgid "unable to lock database"
msgstr "nem siker�lt z�rolni az adatb�zist"
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:63
msgid "could not open database"
msgstr "nem siker�lt megnyitni az adatb�zist"
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:65
msgid "could not create database"
msgstr "nem siker�lt l�trehozni az adatb�zist"
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:67
msgid "database not initialized"
msgstr "az adatb�zis nem inicializ�lt"
-#: lib/libalpm/error.c:62
+#: lib/libalpm/error.c:69
msgid "database already registered"
msgstr "az adatb�zis m�r regisztr�lt"
-#: lib/libalpm/error.c:64
+#: lib/libalpm/error.c:71
msgid "could not find database"
msgstr "nem tal�lhat� az adatb�zis"
-#: lib/libalpm/error.c:66
+#: lib/libalpm/error.c:73
msgid "could not update database"
msgstr "nem siker�lt megnyitni az adatb�zist"
-#: lib/libalpm/error.c:68
+#: lib/libalpm/error.c:75
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:78
msgid "invalid url for server"
msgstr "�rv�nytelen url"
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:85
msgid "could not set parameter"
msgstr "nem siker�lt be�ll�tani a param�tert"
-#: lib/libalpm/error.c:81
+#: lib/libalpm/error.c:88
msgid "transaction already initialized"
msgstr "a tranzakci� m�r inicializ�lt"
-#: lib/libalpm/error.c:83 lib/libalpm/error.c:87
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr "a tranzakci� nem inicializ�lt"
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:92
msgid "duplicate target"
msgstr "k�t azonos c�lcsomag"
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:96
msgid "transaction not prepared"
msgstr "a tranzakci� nincs el�k�sz�tve"
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "transaction aborted"
msgstr "a tranzakci� f�lbeszak�tva"
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "operation not compatible with the transaction type"
msgstr "a m�velet nem egyeztethet� �ssze a jelenlegi tranzakci�t�pussal"
-#: lib/libalpm/error.c:95 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:102
msgid "could not commit transaction"
msgstr "nem siker�lt commitolni a tranzakci�t"
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "could not download all files"
msgstr "nem siker�lt let�lteni az �sszes f�jlt"
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:107
msgid "could not find or read package"
msgstr "nem tal�lhat� vagy nem olvashat� a csomag"
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:109
msgid "invalid or corrupted package"
msgstr "nem �rv�nyes vagy s�r�lt csomag"
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:111
msgid "cannot open package file"
msgstr "nem siker�lt megnyitni a csomagf�jlt"
-#: lib/libalpm/error.c:106
+#: lib/libalpm/error.c:113
msgid "cannot load package data"
msgstr "nem siker�lt bet�lteni a csomagadatokat"
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:115
msgid "package already installed"
msgstr "a csomag m�r telep�tve van"
-#: lib/libalpm/error.c:110
+#: lib/libalpm/error.c:117
msgid "package not installed or lesser version"
msgstr "a csomag nincs telep�tve vagy kisebb verzi�j�"
-#: lib/libalpm/error.c:112
+#: lib/libalpm/error.c:119
msgid "cannot remove all files for package"
msgstr "nem siker�lt elt�vol�tani a csomag �sszes f�jlj�t"
-#: lib/libalpm/error.c:114
+#: lib/libalpm/error.c:121
msgid "package name is not valid"
msgstr "nem �rv�nyes a csomagn�v"
-#: lib/libalpm/error.c:116
+#: lib/libalpm/error.c:123
msgid "corrupted package"
msgstr "s�r�lt csomag"
-#: lib/libalpm/error.c:118
+#: lib/libalpm/error.c:125
msgid "no such repository"
msgstr "nincs ilyen rep�"
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:128
+#, fuzzy
+msgid "corrupted delta"
+msgstr "s�r�lt csomag"
+
+#: lib/libalpm/error.c:130
+msgid "delta patch failed"
+msgstr ""
+
+#: lib/libalpm/error.c:133
msgid "group not found"
msgstr "a csoport nem tal�lhat�"
-#: lib/libalpm/error.c:124
+#: lib/libalpm/error.c:136
msgid "could not satisfy dependencies"
msgstr "nem siker�lt kiel�g�teni a f�gg�s�geket"
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:138
msgid "conflicting dependencies"
msgstr "�tk�z� f�gg�s�gek"
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:140
msgid "conflicting files"
msgstr "�tk�z� f�jlok"
-#: lib/libalpm/error.c:131
+#: lib/libalpm/error.c:143
msgid "user aborted the operation"
msgstr "felhaszn�l�i megszak�t�s"
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:145
msgid "internal error"
msgstr "bels� hiba"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:147
msgid "libarchive error"
msgstr "libarchive hiba"
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:150
msgid "not confirmed"
msgstr "nem meger�s�tett"
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:152
msgid "invalid regular expression"
msgstr "�rv�nytelen regul�ris kifejez�s"
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:155
msgid "connection to remote host failed"
msgstr "nem siker�lt csatlakozni a t�voli g�phez"
-#: lib/libalpm/error.c:146
+#: lib/libalpm/error.c:158
msgid "unexpected error"
msgstr "nemv�rt hiba"
-#: lib/libalpm/handle.c:140
-#, c-format
-msgid "cannot canonicalize specified root path '%s'"
-msgstr "nem siker�lt �rtelmezni a megadott gy�k�rk�nyvt�r-�tvonalat: '%s'"
-
-#: lib/libalpm/md5driver.c:69
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5: nem siker�lt megnyitni a k�vetkez�t: %s\n"
-
-#: lib/libalpm/package.c:129
-#, c-format
-msgid "could not get sha1sum for package %s-%s"
-msgstr "sikertelen az sha1 ellen�rz� �sszeg el�r�se a %s-%s csomag sz�m�ra"
-
-#: lib/libalpm/package.c:138
-#, c-format
-msgid "sha1sums do not match for package %s-%s"
-msgstr "%s-%s csomag sha1 ellen�rz� �sszegei nem egyeznek meg"
-
-#: lib/libalpm/package.c:180
-#, c-format
-msgid "could not get md5sum for package %s-%s"
+#: lib/libalpm/package.c:124
+#, fuzzy, c-format
+msgid "could not get md5sum for package %s-%s\n"
msgstr "sikertelen az md5 ellen�rz� �sszeg el�r�se a %s-%s csomag sz�m�ra"
-#: lib/libalpm/package.c:189
-#, c-format
-msgid "md5sums do not match for package %s-%s"
+#: lib/libalpm/package.c:133
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s\n"
msgstr "%s-%s csomag md5 ellen�rz� �sszegei nem egyeznek meg"
-#: lib/libalpm/package.c:360
-#, 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:369
-#, c-format
-msgid "%s: forcing upgrade to version %s"
+#: lib/libalpm/package.c:737
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s\n"
msgstr "%s: er�ltetett friss�t�s a %s verzi�ra"
-#: lib/libalpm/package.c:374
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
+#: lib/libalpm/package.c:742
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr "%s: a helyi (%s) �jabb, mint %s (%s)"
-#: lib/libalpm/package.c:382
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
+#: lib/libalpm/package.c:750
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)\n"
msgstr "%s-%s: a csomag friss�t�s�nek k�sleltet�se (%s)"
-#: lib/libalpm/package.c:564
-msgid "could not parse the package description file"
+#: lib/libalpm/package.c:931
+#, fuzzy, c-format
+msgid "could not parse package description file in %s\n"
msgstr "nem siker�lt �rtelmezni a csomagle�r� f�jlt"
-#: lib/libalpm/package.c:568
-#, c-format
-msgid "missing package name in %s"
+#: lib/libalpm/package.c:936
+#, fuzzy, c-format
+msgid "missing package name in %s\n"
msgstr "hi�nyz� csomagn�v itt: %s"
-#: lib/libalpm/package.c:572
-#, c-format
-msgid "missing package version in %s"
+#: lib/libalpm/package.c:940
+#, fuzzy, c-format
+msgid "missing package version in %s\n"
msgstr "hi�nyz� csomagverzi� itt: %s"
-#: lib/libalpm/package.c:607
-#, c-format
-msgid "could not remove tempfile %s"
+#: lib/libalpm/package.c:970
+#, fuzzy, c-format
+msgid "could not remove tempfile %s\n"
msgstr "nem siker�lt elt�vol�tani a %s ideiglenes f�jlt"
-#: lib/libalpm/package.c:623 lib/libalpm/package.c:630
-#, c-format
-msgid "error while reading package: %s"
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#, fuzzy, c-format
+msgid "error while reading package %s: %s\n"
msgstr "hiba a csomag olvas�sa k�zben: %s"
-#: lib/libalpm/package.c:636
-msgid "missing package metadata"
+#: lib/libalpm/package.c:1005
+#, fuzzy, c-format
+msgid "missing package metadata in %s\n"
msgstr "hi�nyz� csomaginform�ci�s f�jl"
-#: lib/libalpm/package.c:643
-#, c-format
-msgid "missing package filelist in %s, generating one"
+#: lib/libalpm/package.c:1012
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one\n"
msgstr "hi�nyzik a(z) %s csomag f�jllist�ja, gener�l�s"
-#: lib/libalpm/remove.c:117
-#, c-format
-msgid "could not find %s in database -- skipping"
+#: lib/libalpm/remove.c:121
+#, fuzzy, c-format
+msgid "could not find %s in database -- skipping\n"
msgstr "nem tal�lhat� a %s az adatb�zisban -- kihagy�s"
-#: lib/libalpm/remove.c:168
-#, c-format
-msgid "cannot remove file '%s': %s"
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s\n"
msgstr "nem siker�lt elt�vol�tani a '%s' f�jlt : %s"
-#: lib/libalpm/remove.c:255
-#, c-format
-msgid "cannot remove file %s: %s"
-msgstr "nem siker�lt elt�vol�tani a %s f�jlt: %s"
-
-#: lib/libalpm/remove.c:338
-#, c-format
-msgid "could not remove database entry %s-%s"
+#: lib/libalpm/remove.c:337
+#, fuzzy, c-format
+msgid "could not remove database entry %s-%s\n"
msgstr "nem siker�lt elt�vol�tani a %s-%s adatb�zis-bejegyz�st"
-#: lib/libalpm/remove.c:343
-#, c-format
-msgid "could not remove entry '%s' from cache"
+#: lib/libalpm/remove.c:342
+#, fuzzy, c-format
+msgid "could not remove entry '%s' from cache\n"
msgstr "nem siker�lt elt�vol�tani a '%s' bejegyz�st a gyors�t�t�rb�l"
-#: lib/libalpm/sha1.c:409
+#: lib/libalpm/server.c:56
#, c-format
-msgid "sha1: %s can't be opened\n"
-msgstr "sha2: nem siker�lt megnyitni a k�vetkez�t: %s\n"
+msgid "url '%s' is invalid, ignoring\n"
+msgstr ""
-#: lib/libalpm/sync.c:294
-#, c-format
-msgid "repository '%s' not found"
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
+msgstr ""
+
+#: lib/libalpm/server.c:241
+msgid "disk"
+msgstr ""
+
+#: lib/libalpm/server.c:245
+#, fuzzy, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "nem siker�lt n�h�ny f�jlt let�lteni innen: %s\n"
+
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "nem siker�lt elt�vol�tani a '%s' f�jlt : %s"
+
+#: lib/libalpm/server.c:307
+#, fuzzy, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "hiba a csomag olvas�sa k�zben: %s"
+
+#: lib/libalpm/server.c:319
+#, fuzzy, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "nem siker�lt elt�vol�tani a '%s' f�jlt : %s"
+
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "nem siker�lt a k�nyvt�rat a /-re v�ltani (%s)"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
+#, fuzzy, c-format
+msgid "failed to download %s\n"
+msgstr "nem siker�lt let�lteni az �sszes f�jlt"
+
+#: lib/libalpm/sync.c:135
+#, fuzzy, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s: friss�t�s figyelmen k�v�l hagy�sa (a %s-%s fogja lecser�lni)"
+
+#: lib/libalpm/sync.c:250
+#, fuzzy, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s: a csomagfriss�t�s figyelmen k�v�l hagy�sa (%s)"
+
+#: lib/libalpm/sync.c:320
+#, fuzzy, c-format
+msgid "repository '%s' not found\n"
msgstr "a(z) '%s' rep� nem tal�lhat�"
-#: lib/libalpm/sync.c:335
-#, c-format
-msgid "%s-%s is up to date -- skipping"
+#: lib/libalpm/sync.c:354
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- skipping\n"
msgstr "a(z) %s-%s naprak�sz -- kihagy�s"
-#: lib/libalpm/sync.c:608 lib/libalpm/sync.c:624
-msgid "unresolvable package conflicts detected"
-msgstr "feloldhatatlan csomag�tk�z�sek"
+#: lib/libalpm/sync.c:358
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "a(z) %s-%s naprak�sz -- kihagy�s"
-#: lib/libalpm/sync.c:778
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr "nem l�tezik a(z) %s gyors�t�t�r. l�trehoz�s...\n"
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+#, fuzzy
+msgid "unresolvable package conflicts detected\n"
+msgstr "feloldhatatlan csomag�tk�z�sek"
-#: lib/libalpm/sync.c:804
-msgid "couldn't create package cache, using /tmp instead"
-msgstr "nem siker�lt l�trehozni a csomag gyors�t�t�rat, a /tmp haszn�lata"
+#: lib/libalpm/sync.c:628
+#, fuzzy, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "malloc probl�ma: nem siker�lt allok�lni %d byte-ot"
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:825
#, c-format
-msgid "failed to retrieve some files from %s\n"
-msgstr "nem siker�lt n�h�ny f�jlt let�lteni innen: %s\n"
+msgid "command: %s\n"
+msgstr ""
-#: lib/libalpm/sync.c:839 lib/libalpm/sync.c:861
-#, c-format
-msgid "can't get md5 or sha1 checksum for package %s\n"
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#, fuzzy, c-format
+msgid "can't get md5 checksum for file %s\n"
msgstr ""
"sikertelen az md5 vagy sha1 ellen�rz� �sszeg el�r�se a %s csomag sz�m�ra\n"
-#: lib/libalpm/sync.c:878
-#, c-format
-msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
+#: lib/libalpm/sync.c:910
+#, fuzzy, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr "a(z) %s arch�vum s�r�lt volt (rossz MD5 vagy SHA1 szumma)\n"
-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:1056
#, c-format
-msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-msgstr "a(z) %s arch�vum s�r�lt (rossz MD5 vagy SHA1 szumma)\n"
+msgid "failed to retrieve some files from %s\n"
+msgstr "nem siker�lt n�h�ny f�jlt let�lteni innen: %s\n"
-#: lib/libalpm/sync.c:901
-msgid "could not create removal transaction"
+#: lib/libalpm/sync.c:1137
+#, fuzzy
+msgid "could not create removal transaction\n"
msgstr "nem siker�lt l�trehozni az elt�vol�t�si tranzakci�t"
-#: lib/libalpm/sync.c:907
-msgid "could not initialize the removal transaction"
+#: lib/libalpm/sync.c:1143
+#, fuzzy
+msgid "could not initialize the removal transaction\n"
msgstr "nem siker�lt inicializ�lni az elt�vol�t�si tranzakci�t"
-#: lib/libalpm/sync.c:929
-msgid "could not prepare removal transaction"
+#: lib/libalpm/sync.c:1165
+#, fuzzy
+msgid "could not prepare removal transaction\n"
msgstr "nem siker�lt l�trehozni az elt�vol�t�si tranzakci�t"
-#: lib/libalpm/sync.c:935
-msgid "could not commit removal transaction"
+#: lib/libalpm/sync.c:1171
+#, fuzzy
+msgid "could not commit removal transaction\n"
msgstr "nem siker�lt commitolni az elt�vol�t� tranzakci�t"
-#: lib/libalpm/sync.c:946
-msgid "could not create transaction"
+#: lib/libalpm/sync.c:1182
+#, fuzzy
+msgid "could not create transaction\n"
msgstr "nem siker�lt l�trehozni a tranzakci�t"
-#: lib/libalpm/sync.c:951
-msgid "could not initialize transaction"
+#: lib/libalpm/sync.c:1187
+#, fuzzy
+msgid "could not initialize transaction\n"
msgstr "nem siker�lt inicializ�lni a tranzakci�t"
-#: lib/libalpm/sync.c:980
-msgid "could not prepare transaction"
+#: lib/libalpm/sync.c:1214
+#, fuzzy
+msgid "could not prepare transaction\n"
msgstr "nem siker�lt el�k�sz�teni a tranzakci�t"
-#: lib/libalpm/sync.c:1022
-#, 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:1031
-#, c-format
-msgid "could not update new database entry %s-%s"
-msgstr "sikertelen a '%s-%s' adatb�zis-bejegyz�s friss�t�se"
+#: lib/libalpm/sync.c:1219
+#, fuzzy
+msgid "could not commit transaction\n"
+msgstr "nem siker�lt commitolni a tranzakci�t"
-#: lib/libalpm/trans.c:205
-#, c-format
-msgid "could not remove lock file %s"
+#: lib/libalpm/trans.c:214
+#, fuzzy, c-format
+msgid "could not remove lock file %s\n"
msgstr "nem siker�lt a z�rol� f�jl (%s) elt�vol�t�sa"
-#: lib/libalpm/trans.c:498 lib/libalpm/trans.c:528
+#: lib/libalpm/trans.c:483
#, 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"
+msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
+msgstr ""
-#: lib/libalpm/trans.c:589
-msgid "could not create temp directory"
+#: lib/libalpm/trans.c:494
+#, fuzzy
+msgid "could not create temp directory\n"
msgstr "nem siker�lt l�trehozni az ideiglenes k�nyvt�rat"
-#: lib/libalpm/trans.c:616
-#, c-format
-msgid "could not change directory to %s (%s)"
+#: lib/libalpm/trans.c:536
+#, fuzzy, c-format
+msgid "could not change directory to %s (%s)\n"
msgstr "nem siker�lt a(z) %s k�nyvt�rba v�ltani (%s)"
-#: lib/libalpm/trans.c:633
-#, c-format
-msgid "could not fork a new process (%s)"
+#: lib/libalpm/trans.c:554
+#, fuzzy, c-format
+msgid "could not fork a new process (%s)\n"
msgstr "nem siker�lt forkolni egy �j folyamatot (%s)"
-#: lib/libalpm/trans.c:641
-#, c-format
-msgid "could not change the root directory (%s)"
+#: lib/libalpm/trans.c:564
+#, fuzzy, c-format
+msgid "could not change the root directory (%s)\n"
msgstr "nem siker�lt a gy�k�rk�nyvt�rba v�ltani (%s)"
-#: lib/libalpm/trans.c:645
-#, c-format
-msgid "could not change directory to / (%s)"
+#: lib/libalpm/trans.c:569
+#, fuzzy, c-format
+msgid "could not change directory to / (%s)\n"
msgstr "nem siker�lt a k�nyvt�rat a /-re v�ltani (%s)"
-#: lib/libalpm/trans.c:654
-#, c-format
-msgid "call to waitpid failed (%s)"
+#: lib/libalpm/trans.c:578
+#, fuzzy, c-format
+msgid "call to popen failed (%s)"
msgstr "a waitpid h�v�s sikertelen (%s)"
-#: lib/libalpm/trans.c:663
-#, c-format
-msgid "could not remove tmpdir %s"
+#: lib/libalpm/trans.c:597
+#, fuzzy, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "a waitpid h�v�s sikertelen (%s)"
+
+#: lib/libalpm/trans.c:606
+msgid "scriptlet failed to execute correctly\n"
+msgstr ""
+
+#: lib/libalpm/trans.c:615
+#, fuzzy, c-format
+msgid "could not remove tmpdir %s\n"
msgstr "nem siker�lt elt�vol�tani a %s ideiglenes k�nyvt�rat"
-#: lib/libalpm/util.c:127
-#, c-format
-msgid "failed to make path '%s' : %s"
+#: lib/libalpm/util.c:204
+#, fuzzy, c-format
+msgid "failed to make path '%s' : %s\n"
msgstr "nem siker�lt a '%s' �tvonal l�trehoz�sa: %s"
-#: lib/libalpm/util.c:325
+#: lib/libalpm/util.c:389
#, c-format
msgid "could not open %s: %s\n"
msgstr "nem siker�lt megnyitni a %s f�jlt: %s\n"
-#: lib/libalpm/util.c:346
+#: lib/libalpm/util.c:573
#, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "nem siker�lt kit�m�r�teni: %s (%s)\n"
+msgid "no %s cache exists, creating...\n"
+msgstr "nem l�tezik a(z) %s gyors�t�t�r. l�trehoz�s...\n"
+
+#: lib/libalpm/util.c:593
+#, fuzzy
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "nem siker�lt l�trehozni a csomag gyors�t�t�rat, a /tmp haszn�lata"
+
+#: lib/libalpm/util.c:643
+#, c-format
+msgid "md5: %s can't be opened\n"
+msgstr "md5: nem siker�lt megnyitni a k�vetkez�t: %s\n"
+
+#: lib/libalpm/util.c:645
+#, fuzzy, c-format
+msgid "md5: %s can't be read\n"
+msgstr "md5: nem siker�lt megnyitni a k�vetkez�t: %s\n"
+
+#~ msgid "please remove '%s' first, using -Rd"
+#~ msgstr "k�rem el�sz�r t�vol�tsa el '%s'-t a -Rd kapcsol�t haszn�lva"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "nem siker�lt kit�m�r�teni: %s (%s)"
+
+#~ msgid "%s: description file is missing"
+#~ msgstr "%s: hi�nyz� csomagle�r� f�jl"
+
+#~ msgid "%s: dependency file is missing"
+#~ msgstr "%s: hi�nyz� csomagf�gg�s�g f�jl"
+
+#~ msgid "%s: file list is missing"
+#~ msgstr "%s: hi�nyz� f�jllista"
+
+#~ msgid "malloc failed: could not allocate %d bytes"
+#~ msgstr "malloc probl�ma: nem siker�lt allok�lni %d byte-ot"
+
+#~ msgid ""
+#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+#~ msgstr ""
+#~ "nem siker�lt a f�gg�s�gek felold�sa a \"%s\" sz�m�ra (nem tal�lhat� a \"%s"
+#~ "\" a csomagok k�z�tt)"
+
+#~ msgid "cannot canonicalize specified root path '%s'"
+#~ msgstr "nem siker�lt �rtelmezni a megadott gy�k�rk�nyvt�r-�tvonalat: '%s'"
+
+#~ msgid "could not get sha1sum for package %s-%s"
+#~ msgstr "sikertelen az sha1 ellen�rz� �sszeg el�r�se a %s-%s csomag sz�m�ra"
+
+#~ msgid "sha1sums do not match for package %s-%s"
+#~ msgstr "%s-%s csomag sha1 ellen�rz� �sszegei nem egyeznek meg"
+
+#~ msgid "cannot remove file %s: %s"
+#~ msgstr "nem siker�lt elt�vol�tani a %s f�jlt: %s"
+
+#~ msgid "sha1: %s can't be opened\n"
+#~ msgstr "sha2: nem siker�lt megnyitni a k�vetkez�t: %s\n"
+
+#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+#~ msgstr "a(z) %s arch�vum s�r�lt (rossz MD5 vagy SHA1 szumma)\n"
+
+#~ 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"
+
+#~ msgid "could not update new database entry %s-%s"
+#~ msgstr "sikertelen a '%s-%s' adatb�zis-bejegyz�s friss�t�se"
+
+#~ 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"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index dfff87a8..aaf85633 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libalpm VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-11-08 18:24+0100\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-11-08 20:30+0100\n"
"Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
"Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
@@ -17,26 +17,33 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bitPlural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/libalpm/add.c:98
+#: lib/libalpm/add.c:88
#, c-format
msgid "replacing older version %s-%s by %s in target list\n"
msgstr "sostituzione in corso della vecchia versione di %s-%s con %s\n"
-#: lib/libalpm/add.c:107
+#: lib/libalpm/add.c:97
#, c-format
msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr "la versione di %s-%s è più recente e sarà ignorata\n"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+
#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "la sostituzione dei pacchetti con -A e -U non è ancora supportata\n"
-#: lib/libalpm/add.c:170
-#, c-format
-msgid "please remove '%s' first, using -Rd\n"
-msgstr "Si consiglia di rimuovere prima '%s', usando l'opzione -Rd\n"
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
-#: lib/libalpm/add.c:396
+#: lib/libalpm/add.c:365
#, c-format
msgid ""
"directory permissions differ on %s\n"
@@ -45,89 +52,89 @@ msgstr ""
"i permessi delle directory differiscono su %s\n"
"filesystem: %o pacchetto: %o\n"
-#: lib/libalpm/add.c:423
+#: lib/libalpm/add.c:392
#, c-format
msgid "extract: symlink %s does not point to dir\n"
msgstr "estrazione: il link simbolico %s non punta alla directory\n"
-#: lib/libalpm/add.c:430
+#: lib/libalpm/add.c:399
#, c-format
msgid "extract: not overwriting dir with file %s\n"
msgstr "estrazione: non sovrascrivere la directory con il file %s\n"
-#: lib/libalpm/add.c:483 lib/libalpm/add.c:627 lib/libalpm/util.c:412
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
#, c-format
msgid "could not extract %s (%s)\n"
msgstr "impossibile estrarre %s (%s)\n"
-#: lib/libalpm/add.c:534
+#: lib/libalpm/add.c:505
#, c-format
msgid "could not rename %s (%s)\n"
msgstr "impossibile rinominare %s (%s)\n"
-#: lib/libalpm/add.c:541 lib/libalpm/add.c:561 lib/libalpm/trans.c:580
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
#, c-format
msgid "could not copy tempfile to %s (%s)\n"
msgstr "impossibile copiare il file temporaneo in %s (%s)\n"
-#: lib/libalpm/add.c:546 lib/libalpm/remove.c:235
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
#, c-format
msgid "%s saved as %s\n"
msgstr "%s salvato come %s\n"
-#: lib/libalpm/add.c:585
+#: lib/libalpm/add.c:556
#, c-format
msgid "could not install %s as %s: %s\n"
msgstr "impossibile installare %s come %s: %s\n"
-#: lib/libalpm/add.c:588
+#: lib/libalpm/add.c:559
#, c-format
msgid "%s installed as %s\n"
msgstr "%s installato come %s\n"
-#: lib/libalpm/add.c:605
+#: lib/libalpm/add.c:576
#, c-format
msgid "extracting %s as %s.pacnew\n"
msgstr "estrazione di %s come %s.pacnew\n"
-#: lib/libalpm/add.c:740 lib/libalpm/trans.c:596
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
msgid "could not get current working directory\n"
msgstr "impossibile ottenere la directory corrente\n"
-#: lib/libalpm/add.c:794
+#: lib/libalpm/add.c:765
#, c-format
msgid "problem occurred while upgrading %s\n"
msgstr "si sono verificati degli errori durante l'aggiornamento di %s\n"
-#: lib/libalpm/add.c:799
+#: lib/libalpm/add.c:770
#, c-format
msgid "problem occurred while installing %s\n"
msgstr "si sono verificati degli errori durante l'installazione di %s\n"
-#: lib/libalpm/add.c:818
+#: lib/libalpm/add.c:785
#, c-format
msgid "could not update database entry %s-%s\n"
msgstr "impossibile aggiornare la voce %s-%s nel database\n"
-#: lib/libalpm/add.c:826
+#: lib/libalpm/add.c:793
#, c-format
msgid "could not add entry '%s' in cache\n"
msgstr "impossible includere la voce '%s' nella cache\n"
-#: lib/libalpm/be_files.c:221
+#: lib/libalpm/be_files.c:223
#, c-format
msgid "invalid name for database entry '%s'\n"
msgstr "nome non valido per la voce del database '%s'\n"
-#: lib/libalpm/be_files.c:273
+#: lib/libalpm/be_files.c:275
#, c-format
msgid "loading package data for %s : level=%d\n"
msgstr "caricamento in corso dei dati del pacchetto %s : livello=%d\n"
-#: lib/libalpm/be_files.c:290 lib/libalpm/be_files.c:419
-#: lib/libalpm/be_files.c:442 lib/libalpm/be_files.c:556
-#: lib/libalpm/be_files.c:634 lib/libalpm/be_files.c:662
-#: lib/libalpm/package.c:820
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
#, c-format
msgid "could not open file %s: %s\n"
msgstr "impossibile aprire il file %s: %s\n"
@@ -142,40 +149,33 @@ msgstr "aggiunta di '%s' alla cache del pacchetto per il database '%s'\n"
msgid "could not remove database entry %s%s\n"
msgstr "impossibile rimuovere la voce %s%s dal database\n"
-#: lib/libalpm/db.c:466 lib/libalpm/sync.c:123
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr ""
-"%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%"
-"s)\n"
-
-#: lib/libalpm/db.c:688
+#: lib/libalpm/db.c:553
msgid "attempt to re-register the 'local' DB\n"
msgstr "tentativo in corso di registrare di nuovo il database 'locale'\n"
-#: lib/libalpm/db.c:697 lib/libalpm/db.c:748
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
msgid "database path is undefined\n"
msgstr "il percorso del database non è definito\n"
-#: lib/libalpm/deps.c:194
-msgid "dependency cycle detected\n"
+#: lib/libalpm/deps.c:173
+#, fuzzy
+msgid "dependency cycle detected:\n"
msgstr "individuato un possibile ciclo di dipendenze\n"
-#: lib/libalpm/deps.c:713
+#: lib/libalpm/deps.c:175
#, c-format
-msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
+msgid "%s will be removed after its %s dependency\n"
+msgstr ""
-#: lib/libalpm/deps.c:718 lib/libalpm/deps.c:749 lib/libalpm/sync.c:596
-#: lib/libalpm/sync.c:612
+#: lib/libalpm/deps.c:177
#, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc failure: impossibile allocare %zd byte\n"
+msgid "%s will be installed before its %s dependency\n"
+msgstr ""
-#: lib/libalpm/deps.c:746
+#: lib/libalpm/deps.c:573
#, c-format
-msgid "cannot resolve dependencies for \"%s\"\n"
-msgstr "impossibile risolvere le dipendenze per \"%s\"\n"
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
#: lib/libalpm/error.c:43
msgid "out of memory!"
@@ -383,214 +383,270 @@ msgstr "impossibile recuperare la somma md5 del pacchetto %s-%s\n"
msgid "md5sums do not match for package %s-%s\n"
msgstr "la somma md5 del pacchetto %s-%s non corrisponde\n"
-#: lib/libalpm/package.c:761
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)\n"
-msgstr "%s-%s: aggiornamento del pacchetto (%s) ignorato\n"
-
-#: lib/libalpm/package.c:770
+#: lib/libalpm/package.c:737
#, c-format
msgid "%s: forcing upgrade to version %s\n"
msgstr "%s: aggiornamento forzato alla versione %s\n"
-#: lib/libalpm/package.c:775
+#: lib/libalpm/package.c:742
#, c-format
msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr "%s: la versione installata (%s) è più recente di %s (%s)\n"
-#: lib/libalpm/package.c:783
+#: lib/libalpm/package.c:750
#, c-format
msgid "%s-%s: delaying upgrade of package (%s)\n"
msgstr "%s-%s: ritardo durante l'aggiornamento del pacchetto (%s)\n"
-#: lib/libalpm/package.c:961
+#: lib/libalpm/package.c:931
#, c-format
msgid "could not parse package description file in %s\n"
msgstr "impossibile analizzare il file di descrizione del pacchetto in %s\n"
-#: lib/libalpm/package.c:966
+#: lib/libalpm/package.c:936
#, c-format
msgid "missing package name in %s\n"
msgstr "manca il nome del pacchetto in %s\n"
-#: lib/libalpm/package.c:970
+#: lib/libalpm/package.c:940
#, c-format
msgid "missing package version in %s\n"
msgstr "manca la versione del pacchetto in %s\n"
-#: lib/libalpm/package.c:1000
+#: lib/libalpm/package.c:970
#, c-format
msgid "could not remove tempfile %s\n"
msgstr "impossibile rimuovere il file temporaneo %s\n"
-#: lib/libalpm/package.c:1015 lib/libalpm/package.c:1028
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
#, c-format
msgid "error while reading package %s: %s\n"
msgstr "si è verificato un errore durante la lettura del pacchetto %s: %s\n"
-#: lib/libalpm/package.c:1035
+#: lib/libalpm/package.c:1005
#, c-format
msgid "missing package metadata in %s\n"
msgstr "manca il metadata del pacchetto in %s\n"
-#: lib/libalpm/package.c:1042
+#: lib/libalpm/package.c:1012
#, c-format
msgid "missing package filelist in %s, generating one\n"
msgstr "manca il filelist nel pacchetto %s, creazione in corso\n"
-#: lib/libalpm/remove.c:122
+#: lib/libalpm/remove.c:121
#, c-format
msgid "could not find %s in database -- skipping\n"
msgstr "impossibile trovare %s nel database, sarà ignorato\n"
-#: lib/libalpm/remove.c:173 lib/libalpm/remove.c:244
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
#, c-format
msgid "cannot remove file '%s': %s\n"
msgstr "impossibile rimuovere il file '%s': %s\n"
-#: lib/libalpm/remove.c:339
+#: lib/libalpm/remove.c:337
#, c-format
msgid "could not remove database entry %s-%s\n"
msgstr "impossibile rimuovere la voce %s-%s dal database\n"
-#: lib/libalpm/remove.c:344
+#: lib/libalpm/remove.c:342
#, c-format
msgid "could not remove entry '%s' from cache\n"
msgstr "impossibile rimuovere la voce '%s' dalla cache\n"
-#: lib/libalpm/sync.c:291
+#: lib/libalpm/server.c:56
+#, c-format
+msgid "url '%s' is invalid, ignoring\n"
+msgstr ""
+
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
+msgstr ""
+
+#: lib/libalpm/server.c:241
+msgid "disk"
+msgstr ""
+
+#: lib/libalpm/server.c:245
+#, fuzzy, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "impossibile recuperare alcuni file da %s\n"
+
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "impossibile rimuovere il file '%s': %s\n"
+
+#: lib/libalpm/server.c:307
+#, fuzzy, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "si è verificato un errore durante la lettura del pacchetto %s: %s\n"
+
+#: lib/libalpm/server.c:319
+#, fuzzy, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "impossibile rimuovere il file '%s': %s\n"
+
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "impossibile spostarsi nella directory / (%s)\n"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
+#, fuzzy, c-format
+msgid "failed to download %s\n"
+msgstr "impossibile prelevare tutti i file"
+
+#: lib/libalpm/sync.c:135
+#, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr ""
+"%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%"
+"s)\n"
+
+#: lib/libalpm/sync.c:250
+#, fuzzy, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s: aggiornamento del pacchetto (%s) ignorato\n"
+
+#: lib/libalpm/sync.c:320
#, c-format
msgid "repository '%s' not found\n"
msgstr "impossibile trovare il repository '%s'\n"
-#: lib/libalpm/sync.c:333
+#: lib/libalpm/sync.c:354
#, c-format
msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s è aggiornato, sarà ignorato\n"
-#: lib/libalpm/sync.c:592 lib/libalpm/sync.c:608
+#: lib/libalpm/sync.c:358
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s è aggiornato, sarà ignorato\n"
+
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
msgid "unresolvable package conflicts detected\n"
msgstr "sono stati rilevati dei conflitti irrisolvibili\n"
-#: lib/libalpm/sync.c:845
+#: lib/libalpm/sync.c:628
+#, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "malloc failure: impossibile allocare %zd byte\n"
+
+#: lib/libalpm/sync.c:825
#, c-format
msgid "command: %s\n"
msgstr "comando: %s\n"
-#: lib/libalpm/sync.c:908 lib/libalpm/sync.c:916
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
#, c-format
msgid "can't get md5 checksum for file %s\n"
msgstr "impossibile recuperare il checksum md5 del file %s\n"
-#: lib/libalpm/sync.c:930
+#: lib/libalpm/sync.c:910
#, c-format
msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr "il file %s è corrotto (MD5 errato)\n"
-#: lib/libalpm/sync.c:1066
+#: lib/libalpm/sync.c:1056
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr "impossibile recuperare alcuni file da %s\n"
-#: lib/libalpm/sync.c:1147
+#: lib/libalpm/sync.c:1137
msgid "could not create removal transaction\n"
msgstr "impossibile avviare l'operazione di rimozione\n"
-#: lib/libalpm/sync.c:1153
+#: lib/libalpm/sync.c:1143
msgid "could not initialize the removal transaction\n"
msgstr "impossibile inizializzare l'operazione di rimozione\n"
-#: lib/libalpm/sync.c:1175
+#: lib/libalpm/sync.c:1165
msgid "could not prepare removal transaction\n"
msgstr "impossibile preparare l'operazione di rimozione\n"
-#: lib/libalpm/sync.c:1181
+#: lib/libalpm/sync.c:1171
msgid "could not commit removal transaction\n"
msgstr "impossibile eseguire l'operazione di rimozione\n"
-#: lib/libalpm/sync.c:1192
+#: lib/libalpm/sync.c:1182
msgid "could not create transaction\n"
msgstr "impossibile avviare l'operazione\n"
-#: lib/libalpm/sync.c:1197
+#: lib/libalpm/sync.c:1187
msgid "could not initialize transaction\n"
msgstr "impossibile inizializzare l'operazione\n"
-#: lib/libalpm/sync.c:1224
+#: lib/libalpm/sync.c:1214
msgid "could not prepare transaction\n"
msgstr "impossibile preparare l'operazione\n"
-#: lib/libalpm/sync.c:1229
+#: lib/libalpm/sync.c:1219
msgid "could not commit transaction\n"
msgstr "impossibile eseguire l'operazione\n"
-#: lib/libalpm/sync.c:1266
-#, c-format
-msgid "could not update requiredby for database entry %s-%s\n"
-msgstr ""
-"impossibile aggiornare il campo richiesto da per la voce del database %s-%s\n"
-
-#: lib/libalpm/sync.c:1275
-#, c-format
-msgid "could not update new database entry %s-%s\n"
-msgstr "impossibile aggiornare la nuova voce del database %s-%s\n"
-
-#: lib/libalpm/trans.c:215
+#: lib/libalpm/trans.c:214
#, c-format
msgid "could not remove lock file %s\n"
msgstr "impossibile rimuovere il file di lock %s\n"
-#: lib/libalpm/trans.c:496
-#, c-format
-msgid "could not update 'requiredby' database entry %s-%s\n"
-msgstr "impossibile aggiornare la voce 'richiesto da' del database %s-%s\n"
-
-#: lib/libalpm/trans.c:557
+#: lib/libalpm/trans.c:483
#, c-format
msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
msgstr ""
"/bin/sh non è presente nella root directory (%s), lo scriptlet sarà "
"interrotto\n"
-#: lib/libalpm/trans.c:568
+#: lib/libalpm/trans.c:494
msgid "could not create temp directory\n"
msgstr "impossibile creare la directory temporanea\n"
-#: lib/libalpm/trans.c:603
+#: lib/libalpm/trans.c:536
#, c-format
msgid "could not change directory to %s (%s)\n"
msgstr "impossibile spostarsi nella directory %s (%s)\n"
-#: lib/libalpm/trans.c:621
+#: lib/libalpm/trans.c:554
#, c-format
msgid "could not fork a new process (%s)\n"
msgstr "impossibile effettuare il fork di un nuovo processo (%s)\n"
-#: lib/libalpm/trans.c:631
+#: lib/libalpm/trans.c:564
#, c-format
msgid "could not change the root directory (%s)\n"
msgstr "impossibile cambiare la root directory (%s)\n"
-#: lib/libalpm/trans.c:636
+#: lib/libalpm/trans.c:569
#, c-format
msgid "could not change directory to / (%s)\n"
msgstr "impossibile spostarsi nella directory / (%s)\n"
-#: lib/libalpm/trans.c:645
+#: lib/libalpm/trans.c:578
#, c-format
msgid "call to popen failed (%s)"
msgstr "chiamata a popen non riuscita (%s)"
-#: lib/libalpm/trans.c:664
+#: lib/libalpm/trans.c:597
#, c-format
msgid "call to waitpid failed (%s)\n"
msgstr "chiamata a waitpid non riuscita (%s)\n"
-#: lib/libalpm/trans.c:673
+#: lib/libalpm/trans.c:606
msgid "scriptlet failed to execute correctly\n"
msgstr "L'esecuzione dello scriptlet non è riuscita correttamente\n"
-#: lib/libalpm/trans.c:682
+#: lib/libalpm/trans.c:615
#, c-format
msgid "could not remove tmpdir %s\n"
msgstr "impossibile rimuovere la directory temporanea %s\n"
@@ -600,27 +656,44 @@ msgstr "impossibile rimuovere la directory temporanea %s\n"
msgid "failed to make path '%s' : %s\n"
msgstr "impossibile seguire il percorso '%s' : %s\n"
-#: lib/libalpm/util.c:390
+#: lib/libalpm/util.c:389
#, c-format
msgid "could not open %s: %s\n"
msgstr "impossibile aprire %s: %s\n"
-#: lib/libalpm/util.c:574
+#: lib/libalpm/util.c:573
#, c-format
msgid "no %s cache exists, creating...\n"
msgstr "la cache di %s non esiste, creazione in corso...\n"
-#: lib/libalpm/util.c:594
+#: lib/libalpm/util.c:593
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
"impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n"
-#: lib/libalpm/util.c:644
+#: lib/libalpm/util.c:643
#, c-format
msgid "md5: %s can't be opened\n"
msgstr "md5: impossibile aprire %s\n"
-#: lib/libalpm/util.c:646
+#: lib/libalpm/util.c:645
#, c-format
msgid "md5: %s can't be read\n"
msgstr "md5: impossibile leggere %s\n"
+
+#~ msgid "please remove '%s' first, using -Rd\n"
+#~ msgstr "Si consiglia di rimuovere prima '%s', usando l'opzione -Rd\n"
+
+#~ msgid "cannot resolve dependencies for \"%s\"\n"
+#~ msgstr "impossibile risolvere le dipendenze per \"%s\"\n"
+
+#~ msgid "could not update requiredby for database entry %s-%s\n"
+#~ msgstr ""
+#~ "impossibile aggiornare il campo richiesto da per la voce del database %s-%"
+#~ "s\n"
+
+#~ msgid "could not update new database entry %s-%s\n"
+#~ msgstr "impossibile aggiornare la nuova voce del database %s-%s\n"
+
+#~ msgid "could not update 'requiredby' database entry %s-%s\n"
+#~ msgstr "impossibile aggiornare la voce 'richiesto da' del database %s-%s\n"
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 3aad50a0..9e0f1829 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-07-11 00:26-0400\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,606 +16,658 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/libalpm/add.c:118
+#: lib/libalpm/add.c:88
#, c-format
-msgid "replacing older version %s-%s by %s in target list"
+msgid "replacing older version %s-%s by %s in target list\n"
msgstr ""
-#: lib/libalpm/add.c:127
+#: lib/libalpm/add.c:97
#, c-format
-msgid "newer version %s-%s is in the target list -- skipping"
+msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr ""
-#: lib/libalpm/add.c:201
-msgid "replacing packages with -A and -U is not supported yet"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
msgstr ""
-#: lib/libalpm/add.c:202
-#, c-format
-msgid "please remove '%s' first, using -Rd"
-msgstr ""
-
-#: lib/libalpm/add.c:428 lib/libalpm/trans.c:609
-msgid "could not get current working directory"
+#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
msgstr ""
-#: lib/libalpm/add.c:619
-#, c-format
-msgid "could not rename %s (%s)"
+#: lib/libalpm/add.c:172
+msgid "replacing packages with -A and -U is not supported yet\n"
msgstr ""
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:646
-#, c-format
-msgid "could not copy tempfile to %s (%s)"
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
msgstr ""
-#: lib/libalpm/add.c:631 lib/libalpm/remove.c:241
+#: lib/libalpm/add.c:365
#, c-format
-msgid "%s saved as %s"
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o package: %o\n"
msgstr ""
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:392
#, c-format
-msgid "could not install %s as %s: %s"
+msgid "extract: symlink %s does not point to dir\n"
msgstr ""
-#: lib/libalpm/add.c:673
+#: lib/libalpm/add.c:399
#, c-format
-msgid "%s installed as %s"
+msgid "extract: not overwriting dir with file %s\n"
msgstr ""
-#: lib/libalpm/add.c:689
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
#, c-format
-msgid "extracting %s as %s.pacnew"
+msgid "could not extract %s (%s)\n"
msgstr ""
-#: lib/libalpm/add.c:721
+#: lib/libalpm/add.c:505
#, c-format
-msgid "could not extract %s (%s)"
+msgid "could not rename %s (%s)\n"
msgstr ""
-#: lib/libalpm/add.c:772
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
#, c-format
-msgid "problem occurred while upgrading %s"
+msgid "could not copy tempfile to %s (%s)\n"
msgstr ""
-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
#, c-format
-msgid "problem occurred while installing %s"
+msgid "%s saved as %s\n"
msgstr ""
-#: lib/libalpm/add.c:815
+#: lib/libalpm/add.c:556
#, c-format
-msgid "could not update provision '%s' from '%s'"
+msgid "could not install %s as %s: %s\n"
msgstr ""
-#: lib/libalpm/add.c:835
+#: lib/libalpm/add.c:559
#, c-format
-msgid "could not update database entry %s-%s"
+msgid "%s installed as %s\n"
msgstr ""
-#: lib/libalpm/add.c:843
+#: lib/libalpm/add.c:576
#, c-format
-msgid "could not add entry '%s' in cache"
+msgid "extracting %s as %s.pacnew\n"
msgstr ""
-#: lib/libalpm/be_files.c:83
-#, c-format
-msgid "%s: description file is missing"
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+msgid "could not get current working directory\n"
msgstr ""
-#: lib/libalpm/be_files.c:88
+#: lib/libalpm/add.c:765
#, c-format
-msgid "%s: dependency file is missing"
+msgid "problem occurred while upgrading %s\n"
msgstr ""
-#: lib/libalpm/be_files.c:93
+#: lib/libalpm/add.c:770
#, c-format
-msgid "%s: file list is missing"
+msgid "problem occurred while installing %s\n"
msgstr ""
-#: lib/libalpm/be_files.c:216
+#: lib/libalpm/add.c:785
#, c-format
-msgid "invalid name for database entry '%s'"
+msgid "could not update database entry %s-%s\n"
msgstr ""
-#: lib/libalpm/be_files.c:271
+#: lib/libalpm/add.c:793
#, c-format
-msgid "loading package data for %s : level=%d"
+msgid "could not add entry '%s' in cache\n"
msgstr ""
-#: lib/libalpm/be_files.c:288 lib/libalpm/be_files.c:434
-#: lib/libalpm/be_files.c:457 lib/libalpm/be_files.c:549
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:419
+#: lib/libalpm/be_files.c:223
#, c-format
-msgid "could not open file %s: %s"
+msgid "invalid name for database entry '%s'\n"
msgstr ""
-#: lib/libalpm/cache.c:63
+#: lib/libalpm/be_files.c:275
#, c-format
-msgid "adding '%s' to package cache for db '%s'"
+msgid "loading package data for %s : level=%d\n"
msgstr ""
-#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:80 lib/libalpm/deps.c:449
-#: lib/libalpm/deps.c:650 lib/libalpm/deps.c:690 lib/libalpm/group.c:44
-#: lib/libalpm/handle.c:50 lib/libalpm/package.c:297 lib/libalpm/sync.c:62
-#: lib/libalpm/sync.c:612 lib/libalpm/sync.c:628 lib/libalpm/trans.c:223
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
#, c-format
-msgid "malloc failure: could not allocate %d bytes"
+msgid "could not open file %s: %s\n"
msgstr ""
-#: lib/libalpm/db.c:238
+#: lib/libalpm/cache.c:62
#, c-format
-msgid "could not remove database entry %s%s"
+msgid "adding '%s' to package cache for db '%s'\n"
msgstr ""
-#: lib/libalpm/db.c:432 lib/libalpm/sync.c:128
+#: lib/libalpm/db.c:285
#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
+msgid "could not remove database entry %s%s\n"
msgstr ""
-#: lib/libalpm/db.c:553 lib/libalpm/db.c:560
-#, c-format
-msgid "malloc failed: could not allocate %d bytes"
+#: lib/libalpm/db.c:553
+msgid "attempt to re-register the 'local' DB\n"
msgstr ""
-#: lib/libalpm/db.c:661
-msgid "attempt to re-register the 'local' DB"
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
+msgid "database path is undefined\n"
msgstr ""
-#: lib/libalpm/db.c:680
-msgid "database path is undefined"
+#: lib/libalpm/deps.c:173
+msgid "dependency cycle detected:\n"
msgstr ""
-#: lib/libalpm/deps.c:187
-msgid "dependency cycle detected\n"
+#: lib/libalpm/deps.c:175
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
msgstr ""
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:177
#, c-format
-msgid ""
-"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid "%s will be installed before its %s dependency\n"
msgstr ""
-#: lib/libalpm/deps.c:687
+#: lib/libalpm/deps.c:573
#, c-format
-msgid "cannot resolve dependencies for \"%s\""
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr ""
-#: lib/libalpm/error.c:38
+#: lib/libalpm/error.c:43
msgid "out of memory!"
msgstr ""
-#: lib/libalpm/error.c:40
+#: lib/libalpm/error.c:45
msgid "unexpected system error"
msgstr ""
-#: lib/libalpm/error.c:42
+#: lib/libalpm/error.c:47
msgid "insufficient privileges"
msgstr ""
-#: lib/libalpm/error.c:44
+#: lib/libalpm/error.c:49
msgid "could not find or read file"
msgstr ""
-#: lib/libalpm/error.c:46
+#: lib/libalpm/error.c:51
+msgid "could not find or read directory"
+msgstr ""
+
+#: lib/libalpm/error.c:53
msgid "wrong or NULL argument passed"
msgstr ""
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:56
msgid "library not initialized"
msgstr ""
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:58
msgid "library already initialized"
msgstr ""
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:60
msgid "unable to lock database"
msgstr ""
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:63
msgid "could not open database"
msgstr ""
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:65
msgid "could not create database"
msgstr ""
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:67
msgid "database not initialized"
msgstr ""
-#: lib/libalpm/error.c:62
+#: lib/libalpm/error.c:69
msgid "database already registered"
msgstr ""
-#: lib/libalpm/error.c:64
+#: lib/libalpm/error.c:71
msgid "could not find database"
msgstr ""
-#: lib/libalpm/error.c:66
+#: lib/libalpm/error.c:73
msgid "could not update database"
msgstr ""
-#: lib/libalpm/error.c:68
+#: lib/libalpm/error.c:75
msgid "could not remove database entry"
msgstr ""
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:78
msgid "invalid url for server"
msgstr ""
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:85
msgid "could not set parameter"
msgstr ""
-#: lib/libalpm/error.c:81
+#: lib/libalpm/error.c:88
msgid "transaction already initialized"
msgstr ""
-#: lib/libalpm/error.c:83 lib/libalpm/error.c:87
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr ""
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:92
msgid "duplicate target"
msgstr ""
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:96
msgid "transaction not prepared"
msgstr ""
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "transaction aborted"
msgstr ""
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "operation not compatible with the transaction type"
msgstr ""
-#: lib/libalpm/error.c:95 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:102
msgid "could not commit transaction"
msgstr ""
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "could not download all files"
msgstr ""
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:107
msgid "could not find or read package"
msgstr ""
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:109
msgid "invalid or corrupted package"
msgstr ""
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:111
msgid "cannot open package file"
msgstr ""
-#: lib/libalpm/error.c:106
+#: lib/libalpm/error.c:113
msgid "cannot load package data"
msgstr ""
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:115
msgid "package already installed"
msgstr ""
-#: lib/libalpm/error.c:110
+#: lib/libalpm/error.c:117
msgid "package not installed or lesser version"
msgstr ""
-#: lib/libalpm/error.c:112
+#: lib/libalpm/error.c:119
msgid "cannot remove all files for package"
msgstr ""
-#: lib/libalpm/error.c:114
+#: lib/libalpm/error.c:121
msgid "package name is not valid"
msgstr ""
-#: lib/libalpm/error.c:116
+#: lib/libalpm/error.c:123
msgid "corrupted package"
msgstr ""
-#: lib/libalpm/error.c:118
+#: lib/libalpm/error.c:125
msgid "no such repository"
msgstr ""
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:128
+msgid "corrupted delta"
+msgstr ""
+
+#: lib/libalpm/error.c:130
+msgid "delta patch failed"
+msgstr ""
+
+#: lib/libalpm/error.c:133
msgid "group not found"
msgstr ""
-#: lib/libalpm/error.c:124
+#: lib/libalpm/error.c:136
msgid "could not satisfy dependencies"
msgstr ""
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:138
msgid "conflicting dependencies"
msgstr ""
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:140
msgid "conflicting files"
msgstr ""
-#: lib/libalpm/error.c:131
+#: lib/libalpm/error.c:143
msgid "user aborted the operation"
msgstr ""
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:145
msgid "internal error"
msgstr ""
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:147
msgid "libarchive error"
msgstr ""
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:150
msgid "not confirmed"
msgstr ""
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:152
msgid "invalid regular expression"
msgstr ""
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:155
msgid "connection to remote host failed"
msgstr ""
-#: lib/libalpm/error.c:146
+#: lib/libalpm/error.c:158
msgid "unexpected error"
msgstr ""
-#: lib/libalpm/handle.c:140
+#: lib/libalpm/package.c:124
#, c-format
-msgid "cannot canonicalize specified root path '%s'"
+msgid "could not get md5sum for package %s-%s\n"
msgstr ""
-#: lib/libalpm/md5driver.c:69
+#: lib/libalpm/package.c:133
#, c-format
-msgid "md5: %s can't be opened\n"
+msgid "md5sums do not match for package %s-%s\n"
msgstr ""
-#: lib/libalpm/package.c:129
+#: lib/libalpm/package.c:737
#, c-format
-msgid "could not get sha1sum for package %s-%s"
+msgid "%s: forcing upgrade to version %s\n"
msgstr ""
-#: lib/libalpm/package.c:138
+#: lib/libalpm/package.c:742
#, c-format
-msgid "sha1sums do not match for package %s-%s"
+msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr ""
-#: lib/libalpm/package.c:180
+#: lib/libalpm/package.c:750
#, c-format
-msgid "could not get md5sum for package %s-%s"
+msgid "%s-%s: delaying upgrade of package (%s)\n"
msgstr ""
-#: lib/libalpm/package.c:189
+#: lib/libalpm/package.c:931
#, c-format
-msgid "md5sums do not match for package %s-%s"
+msgid "could not parse package description file in %s\n"
msgstr ""
-#: lib/libalpm/package.c:360
+#: lib/libalpm/package.c:936
#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
+msgid "missing package name in %s\n"
msgstr ""
-#: lib/libalpm/package.c:369
+#: lib/libalpm/package.c:940
#, c-format
-msgid "%s: forcing upgrade to version %s"
+msgid "missing package version in %s\n"
msgstr ""
-#: lib/libalpm/package.c:374
+#: lib/libalpm/package.c:970
#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
+msgid "could not remove tempfile %s\n"
msgstr ""
-#: lib/libalpm/package.c:382
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
+msgid "error while reading package %s: %s\n"
msgstr ""
-#: lib/libalpm/package.c:564
-msgid "could not parse the package description file"
+#: lib/libalpm/package.c:1005
+#, c-format
+msgid "missing package metadata in %s\n"
msgstr ""
-#: lib/libalpm/package.c:568
+#: lib/libalpm/package.c:1012
#, c-format
-msgid "missing package name in %s"
+msgid "missing package filelist in %s, generating one\n"
msgstr ""
-#: lib/libalpm/package.c:572
+#: lib/libalpm/remove.c:121
#, c-format
-msgid "missing package version in %s"
+msgid "could not find %s in database -- skipping\n"
msgstr ""
-#: lib/libalpm/package.c:607
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
#, c-format
-msgid "could not remove tempfile %s"
+msgid "cannot remove file '%s': %s\n"
msgstr ""
-#: lib/libalpm/package.c:623 lib/libalpm/package.c:630
+#: lib/libalpm/remove.c:337
#, c-format
-msgid "error while reading package: %s"
+msgid "could not remove database entry %s-%s\n"
msgstr ""
-#: lib/libalpm/package.c:636
-msgid "missing package metadata"
+#: lib/libalpm/remove.c:342
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
msgstr ""
-#: lib/libalpm/package.c:643
+#: lib/libalpm/server.c:56
#, c-format
-msgid "missing package filelist in %s, generating one"
+msgid "url '%s' is invalid, ignoring\n"
msgstr ""
-#: lib/libalpm/remove.c:117
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
+msgstr ""
+
+#: lib/libalpm/server.c:241
+msgid "disk"
+msgstr ""
+
+#: lib/libalpm/server.c:245
#, c-format
-msgid "could not find %s in database -- skipping"
+msgid "failed retrieving file '%s' from %s : %s\n"
msgstr ""
-#: lib/libalpm/remove.c:168
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
#, c-format
-msgid "cannot remove file '%s': %s"
+msgid "cannot write to file '%s'\n"
msgstr ""
-#: lib/libalpm/remove.c:255
+#: lib/libalpm/server.c:307
#, c-format
-msgid "cannot remove file %s: %s"
+msgid "error downloading '%s': %s\n"
msgstr ""
-#: lib/libalpm/remove.c:338
+#: lib/libalpm/server.c:319
#, c-format
-msgid "could not remove database entry %s-%s"
+msgid "error writing to file '%s': %s\n"
msgstr ""
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/server.c:387
#, c-format
-msgid "could not remove entry '%s' from cache"
+msgid "could not chdir to %s\n"
msgstr ""
-#: lib/libalpm/sha1.c:409
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
#, c-format
-msgid "sha1: %s can't be opened\n"
+msgid "failed to download %s\n"
msgstr ""
-#: lib/libalpm/sync.c:294
+#: lib/libalpm/sync.c:135
#, c-format
-msgid "repository '%s' not found"
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
msgstr ""
-#: lib/libalpm/sync.c:335
+#: lib/libalpm/sync.c:250
#, c-format
-msgid "%s-%s is up to date -- skipping"
+msgid "%s: ignoring package upgrade (%s => %s)\n"
msgstr ""
-#: lib/libalpm/sync.c:608 lib/libalpm/sync.c:624
-msgid "unresolvable package conflicts detected"
+#: lib/libalpm/sync.c:320
+#, c-format
+msgid "repository '%s' not found\n"
msgstr ""
-#: lib/libalpm/sync.c:778
+#: lib/libalpm/sync.c:354
#, c-format
-msgid "no %s cache exists, creating...\n"
+msgid "%s-%s is up to date -- skipping\n"
msgstr ""
-#: lib/libalpm/sync.c:804
-msgid "couldn't create package cache, using /tmp instead"
+#: lib/libalpm/sync.c:358
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+msgid "unresolvable package conflicts detected\n"
msgstr ""
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:628
#, c-format
-msgid "failed to retrieve some files from %s\n"
+msgid "malloc failure: could not allocate %zd bytes\n"
msgstr ""
-#: lib/libalpm/sync.c:839 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:825
#, c-format
-msgid "can't get md5 or sha1 checksum for package %s\n"
+msgid "command: %s\n"
msgstr ""
-#: lib/libalpm/sync.c:878
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
#, c-format
-msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
+msgid "can't get md5 checksum for file %s\n"
msgstr ""
-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:910
#, c-format
-msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:901
-msgid "could not create removal transaction"
+#: lib/libalpm/sync.c:1056
+#, c-format
+msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:907
-msgid "could not initialize the removal transaction"
+#: lib/libalpm/sync.c:1137
+msgid "could not create removal transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:929
-msgid "could not prepare removal transaction"
+#: lib/libalpm/sync.c:1143
+msgid "could not initialize the removal transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:935
-msgid "could not commit removal transaction"
+#: lib/libalpm/sync.c:1165
+msgid "could not prepare removal transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:946
-msgid "could not create transaction"
+#: lib/libalpm/sync.c:1171
+msgid "could not commit removal transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:951
-msgid "could not initialize transaction"
+#: lib/libalpm/sync.c:1182
+msgid "could not create transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:980
-msgid "could not prepare transaction"
+#: lib/libalpm/sync.c:1187
+msgid "could not initialize transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:1022
+#: lib/libalpm/sync.c:1214
+msgid "could not prepare transaction\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:1219
+msgid "could not commit transaction\n"
+msgstr ""
+
+#: lib/libalpm/trans.c:214
#, c-format
-msgid "could not update requiredby for database entry %s-%s"
+msgid "could not remove lock file %s\n"
msgstr ""
-#: lib/libalpm/sync.c:1031
+#: lib/libalpm/trans.c:483
#, c-format
-msgid "could not update new database entry %s-%s"
+msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
+msgstr ""
+
+#: lib/libalpm/trans.c:494
+msgid "could not create temp directory\n"
msgstr ""
-#: lib/libalpm/trans.c:205
+#: lib/libalpm/trans.c:536
#, c-format
-msgid "could not remove lock file %s"
+msgid "could not change directory to %s (%s)\n"
msgstr ""
-#: lib/libalpm/trans.c:498 lib/libalpm/trans.c:528
+#: lib/libalpm/trans.c:554
#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
+msgid "could not fork a new process (%s)\n"
msgstr ""
-#: lib/libalpm/trans.c:589
-msgid "could not create temp directory"
+#: lib/libalpm/trans.c:564
+#, c-format
+msgid "could not change the root directory (%s)\n"
msgstr ""
-#: lib/libalpm/trans.c:616
+#: lib/libalpm/trans.c:569
#, c-format
-msgid "could not change directory to %s (%s)"
+msgid "could not change directory to / (%s)\n"
msgstr ""
-#: lib/libalpm/trans.c:633
+#: lib/libalpm/trans.c:578
#, c-format
-msgid "could not fork a new process (%s)"
+msgid "call to popen failed (%s)"
msgstr ""
-#: lib/libalpm/trans.c:641
+#: lib/libalpm/trans.c:597
#, c-format
-msgid "could not change the root directory (%s)"
+msgid "call to waitpid failed (%s)\n"
+msgstr ""
+
+#: lib/libalpm/trans.c:606
+msgid "scriptlet failed to execute correctly\n"
msgstr ""
-#: lib/libalpm/trans.c:645
+#: lib/libalpm/trans.c:615
#, c-format
-msgid "could not change directory to / (%s)"
+msgid "could not remove tmpdir %s\n"
msgstr ""
-#: lib/libalpm/trans.c:654
+#: lib/libalpm/util.c:204
#, c-format
-msgid "call to waitpid failed (%s)"
+msgid "failed to make path '%s' : %s\n"
msgstr ""
-#: lib/libalpm/trans.c:663
+#: lib/libalpm/util.c:389
#, c-format
-msgid "could not remove tmpdir %s"
+msgid "could not open %s: %s\n"
msgstr ""
-#: lib/libalpm/util.c:127
+#: lib/libalpm/util.c:573
#, c-format
-msgid "failed to make path '%s' : %s"
+msgid "no %s cache exists, creating...\n"
msgstr ""
-#: lib/libalpm/util.c:325
+#: lib/libalpm/util.c:593
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr ""
+
+#: lib/libalpm/util.c:643
#, c-format
-msgid "could not open %s: %s\n"
+msgid "md5: %s can't be opened\n"
msgstr ""
-#: lib/libalpm/util.c:346
+#: lib/libalpm/util.c:645
#, c-format
-msgid "could not extract %s (%s)\n"
+msgid "md5: %s can't be read\n"
msgstr ""
diff --git a/lib/libalpm/po/pl_PL.po b/lib/libalpm/po/pl_PL.po
index 3b64a3a4..01e0fa07 100644
--- a/lib/libalpm/po/pl_PL.po
+++ b/lib/libalpm/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.1\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-07-11 00:26-0400\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-04-12 04:23+0200\n"
"Last-Translator: Mateusz Jędrasik <m.jedrasik@gmail.com>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,614 +18,728 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-#: lib/libalpm/add.c:118
-#, c-format
-msgid "replacing older version %s-%s by %s in target list"
+#: lib/libalpm/add.c:88
+#, fuzzy, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów"
-#: lib/libalpm/add.c:127
-#, c-format
-msgid "newer version %s-%s is in the target list -- skipping"
+#: lib/libalpm/add.c:97
+#, fuzzy, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr "nowsza wersja %s-%s znajduje się w liście celów -- pomijam"
-#: lib/libalpm/add.c:201
-msgid "replacing packages with -A and -U is not supported yet"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+
+#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
+#, fuzzy
+msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "zastępowanie pakietów z -A i -U nie jest jeszcze wspierane"
-#: lib/libalpm/add.c:202
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
+
+#: lib/libalpm/add.c:365
#, c-format
-msgid "please remove '%s' first, using -Rd"
-msgstr "proszę usunąć pierw '%s', korzystając z -Rd"
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o package: %o\n"
+msgstr ""
-#: lib/libalpm/add.c:428 lib/libalpm/trans.c:609
-msgid "could not get current working directory"
-msgstr "nie można znaleźć obecnego katalogu"
+#: lib/libalpm/add.c:392
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr ""
-#: lib/libalpm/add.c:619
+#: lib/libalpm/add.c:399
#, c-format
-msgid "could not rename %s (%s)"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr ""
+
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#, fuzzy, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "nie udało się rozpakować %s (%s)"
+
+#: lib/libalpm/add.c:505
+#, fuzzy, c-format
+msgid "could not rename %s (%s)\n"
msgstr "nie udało się zmienić nazwy %s (%s)"
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:646
-#, c-format
-msgid "could not copy tempfile to %s (%s)"
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)\n"
msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)"
-#: lib/libalpm/add.c:631 lib/libalpm/remove.c:241
-#, c-format
-msgid "%s saved as %s"
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#, fuzzy, c-format
+msgid "%s saved as %s\n"
msgstr "%s zachowane jako %s"
-#: lib/libalpm/add.c:670
-#, c-format
-msgid "could not install %s as %s: %s"
+#: lib/libalpm/add.c:556
+#, fuzzy, c-format
+msgid "could not install %s as %s: %s\n"
msgstr "nie udało się zainstalować %s jako %s: %s"
-#: lib/libalpm/add.c:673
-#, c-format
-msgid "%s installed as %s"
+#: lib/libalpm/add.c:559
+#, fuzzy, c-format
+msgid "%s installed as %s\n"
msgstr "%s zainstalowano jako %s"
-#: lib/libalpm/add.c:689
-#, c-format
-msgid "extracting %s as %s.pacnew"
+#: lib/libalpm/add.c:576
+#, fuzzy, c-format
+msgid "extracting %s as %s.pacnew\n"
msgstr "rozpakowywanie %s jako %s.pacnew"
-#: lib/libalpm/add.c:721
-#, c-format
-msgid "could not extract %s (%s)"
-msgstr "nie udało się rozpakować %s (%s)"
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, fuzzy
+msgid "could not get current working directory\n"
+msgstr "nie można znaleźć obecnego katalogu"
-#: lib/libalpm/add.c:772
+#: lib/libalpm/add.c:765
#, fuzzy, c-format
-msgid "problem occurred while upgrading %s"
+msgid "problem occurred while upgrading %s\n"
msgstr "wystąpiły błędy podczas %s %s"
-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:770
#, fuzzy, c-format
-msgid "problem occurred while installing %s"
+msgid "problem occurred while installing %s\n"
msgstr "wystąpiły błędy podczas %s %s"
-#: lib/libalpm/add.c:815
-#, c-format
-msgid "could not update provision '%s' from '%s'"
-msgstr "nie udało się zaktualizować zasobu '%s' z '%s'"
-
-#: lib/libalpm/add.c:835
-#, c-format
-msgid "could not update database entry %s-%s"
+#: lib/libalpm/add.c:785
+#, fuzzy, c-format
+msgid "could not update database entry %s-%s\n"
msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s"
-#: lib/libalpm/add.c:843
-#, c-format
-msgid "could not add entry '%s' in cache"
+#: lib/libalpm/add.c:793
+#, fuzzy, c-format
+msgid "could not add entry '%s' in cache\n"
msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym"
-#: lib/libalpm/be_files.c:83
+#: lib/libalpm/be_files.c:223
#, fuzzy, c-format
-msgid "%s: description file is missing"
-msgstr "%s: błąd składni w pliku opisu linia %d"
-
-#: lib/libalpm/be_files.c:88
-#, c-format
-msgid "%s: dependency file is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:93
-#, c-format
-msgid "%s: file list is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:216
-#, c-format
-msgid "invalid name for database entry '%s'"
+msgid "invalid name for database entry '%s'\n"
msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'"
-#: lib/libalpm/be_files.c:271
-#, c-format
-msgid "loading package data for %s : level=%d"
+#: lib/libalpm/be_files.c:275
+#, fuzzy, c-format
+msgid "loading package data for %s : level=%d\n"
msgstr "ładowanie danych pakietu dla %s : poziom=%d"
-#: lib/libalpm/be_files.c:288 lib/libalpm/be_files.c:434
-#: lib/libalpm/be_files.c:457 lib/libalpm/be_files.c:549
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:419
-#, c-format
-msgid "could not open file %s: %s"
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
+#, fuzzy, c-format
+msgid "could not open file %s: %s\n"
msgstr "nie udało się otworzyć pliku %s: %s"
-#: lib/libalpm/cache.c:63
-#, c-format
-msgid "adding '%s' to package cache for db '%s'"
+#: lib/libalpm/cache.c:62
+#, fuzzy, c-format
+msgid "adding '%s' to package cache for db '%s'\n"
msgstr "dodawanie '%s' do pamięci podręcznej pakietów dla bd '%s'"
-#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:80 lib/libalpm/deps.c:449
-#: lib/libalpm/deps.c:650 lib/libalpm/deps.c:690 lib/libalpm/group.c:44
-#: lib/libalpm/handle.c:50 lib/libalpm/package.c:297 lib/libalpm/sync.c:62
-#: lib/libalpm/sync.c:612 lib/libalpm/sync.c:628 lib/libalpm/trans.c:223
-#, c-format
-msgid "malloc failure: could not allocate %d bytes"
-msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
-
-#: lib/libalpm/db.c:238
-#, c-format
-msgid "could not remove database entry %s%s"
+#: lib/libalpm/db.c:285
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s\n"
msgstr "nie udało się usunąć wpisu %s%s z bazy danych"
-#: lib/libalpm/db.c:432 lib/libalpm/sync.c:128
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
-msgstr "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)"
-
-#: lib/libalpm/db.c:553 lib/libalpm/db.c:560
-#, c-format
-msgid "malloc failed: could not allocate %d bytes"
-msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
-
-#: lib/libalpm/db.c:661
-msgid "attempt to re-register the 'local' DB"
+#: lib/libalpm/db.c:553
+#, fuzzy
+msgid "attempt to re-register the 'local' DB\n"
msgstr "próba ponownej rejestracji 'lokalnej' BD"
-#: lib/libalpm/db.c:680
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
#, fuzzy
-msgid "database path is undefined"
+msgid "database path is undefined\n"
msgstr "baza danych nie została zainicjowana"
-#: lib/libalpm/deps.c:187
+#: lib/libalpm/deps.c:173
#, fuzzy
-msgid "dependency cycle detected\n"
+msgid "dependency cycle detected:\n"
msgstr "wykryto cykl zależności: %s"
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:175
#, c-format
-msgid ""
-"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid "%s will be removed after its %s dependency\n"
msgstr ""
-"nie udało się rozwiązać zależności dla \"%s\" (\"%s\" nie znajduje się w "
-"zbiorze pakietów)"
-#: lib/libalpm/deps.c:687
+#: lib/libalpm/deps.c:177
#, c-format
-msgid "cannot resolve dependencies for \"%s\""
+msgid "%s will be installed before its %s dependency\n"
+msgstr ""
+
+#: lib/libalpm/deps.c:573
+#, fuzzy, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "nie udało się rozwiązać zależności dla \"%s\""
-#: lib/libalpm/error.c:38
+#: lib/libalpm/error.c:43
msgid "out of memory!"
msgstr "brak pamięci!"
-#: lib/libalpm/error.c:40
+#: lib/libalpm/error.c:45
msgid "unexpected system error"
msgstr "niespodziewany błąd systemu"
-#: lib/libalpm/error.c:42
+#: lib/libalpm/error.c:47
msgid "insufficient privileges"
msgstr "niewystarczające przywileje"
-#: lib/libalpm/error.c:44
+#: lib/libalpm/error.c:49
msgid "could not find or read file"
msgstr "nie udało się znaleźć bądź odczytać pliku"
-#: lib/libalpm/error.c:46
+#: lib/libalpm/error.c:51
+#, fuzzy
+msgid "could not find or read directory"
+msgstr "nie udało się znaleźć bądź odczytać pliku"
+
+#: lib/libalpm/error.c:53
msgid "wrong or NULL argument passed"
msgstr "błędny bądź ZEROWY argument dany"
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:56
msgid "library not initialized"
msgstr "biblioteka nie została zainicjowana"
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:58
msgid "library already initialized"
msgstr "biblioteka już zainicjowana"
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:60
msgid "unable to lock database"
msgstr "nie udało się zablokować bazy danych"
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:63
msgid "could not open database"
msgstr "nie udało się otworzyć bazy danych"
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:65
msgid "could not create database"
msgstr "nie udało się stworzyć bazy danych"
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:67
msgid "database not initialized"
msgstr "baza danych nie została zainicjowana"
-#: lib/libalpm/error.c:62
+#: lib/libalpm/error.c:69
msgid "database already registered"
msgstr "baza danych już zarejestrowana"
-#: lib/libalpm/error.c:64
+#: lib/libalpm/error.c:71
msgid "could not find database"
msgstr "nie udało się odnaleźc bazy danych"
-#: lib/libalpm/error.c:66
+#: lib/libalpm/error.c:73
msgid "could not update database"
msgstr "nie udało się zaktualizować bazy danych"
-#: lib/libalpm/error.c:68
+#: lib/libalpm/error.c:75
msgid "could not remove database entry"
msgstr "nie udało się usunąć wpisu do bazy danych"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:78
msgid "invalid url for server"
msgstr "nieprawidłowy url dla serwera"
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:85
msgid "could not set parameter"
msgstr "nie udało się ustawić parametru"
-#: lib/libalpm/error.c:81
+#: lib/libalpm/error.c:88
msgid "transaction already initialized"
msgstr "tranzakcja już zainicjowana"
-#: lib/libalpm/error.c:83 lib/libalpm/error.c:87
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr "tranzakcja nie została zainicjowana"
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:92
msgid "duplicate target"
msgstr "duplikat celu"
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:96
msgid "transaction not prepared"
msgstr "tranzakcja nie została przygotowana"
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "transaction aborted"
msgstr "tranzakcja zaniechana"
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "operation not compatible with the transaction type"
msgstr "operacja niekompatybilna z typem tranzakcji"
-#: lib/libalpm/error.c:95 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:102
msgid "could not commit transaction"
msgstr "nie udało się wykonać tranzakcji"
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "could not download all files"
msgstr "nie udało się pobrać wszystkich plików"
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:107
msgid "could not find or read package"
msgstr "nie udało się znaleźć bądź odczytać pakietu"
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:109
msgid "invalid or corrupted package"
msgstr "nieprawidłowy bądź skorumpowany pakiet"
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:111
msgid "cannot open package file"
msgstr "nie udało się otworzyć pliku pakietu"
-#: lib/libalpm/error.c:106
+#: lib/libalpm/error.c:113
msgid "cannot load package data"
msgstr "nie udało się załadować danych pakietu"
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:115
msgid "package already installed"
msgstr "pakiet już zainstalowany"
-#: lib/libalpm/error.c:110
+#: lib/libalpm/error.c:117
msgid "package not installed or lesser version"
msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
-#: lib/libalpm/error.c:112
+#: lib/libalpm/error.c:119
msgid "cannot remove all files for package"
msgstr "nie udało się usunąć wszystkich plików pakietu"
-#: lib/libalpm/error.c:114
+#: lib/libalpm/error.c:121
msgid "package name is not valid"
msgstr "nieprawidłowa nazwa pakietu"
-#: lib/libalpm/error.c:116
+#: lib/libalpm/error.c:123
msgid "corrupted package"
msgstr "skorumpowany pakiet"
-#: lib/libalpm/error.c:118
+#: lib/libalpm/error.c:125
msgid "no such repository"
msgstr "nie ma takiego repozytorium"
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:128
+#, fuzzy
+msgid "corrupted delta"
+msgstr "skorumpowany pakiet"
+
+#: lib/libalpm/error.c:130
+msgid "delta patch failed"
+msgstr ""
+
+#: lib/libalpm/error.c:133
msgid "group not found"
msgstr "grupa nie została odnaleziona"
-#: lib/libalpm/error.c:124
+#: lib/libalpm/error.c:136
msgid "could not satisfy dependencies"
msgstr "nie udało się usatysfakcjonować zależności"
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:138
msgid "conflicting dependencies"
msgstr "konfliktujące zależności"
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:140
msgid "conflicting files"
msgstr "konfliktujące pliki"
-#: lib/libalpm/error.c:131
+#: lib/libalpm/error.c:143
msgid "user aborted the operation"
msgstr "użytkownik zaniechał operacji"
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:145
msgid "internal error"
msgstr "błąd wewnętrzny"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:147
msgid "libarchive error"
msgstr "błąd libarchive"
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:150
msgid "not confirmed"
msgstr "nie potwierdzono"
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:152
msgid "invalid regular expression"
msgstr "nieprawidłowe wyrażenie regularne"
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:155
msgid "connection to remote host failed"
msgstr "połączenie ze zdalnym hostem nieudane"
-#: lib/libalpm/error.c:146
+#: lib/libalpm/error.c:158
msgid "unexpected error"
msgstr "niespodziewany błąd"
-#: lib/libalpm/handle.c:140
-#, c-format
-msgid "cannot canonicalize specified root path '%s'"
-msgstr "nie udało się skanonizować podanej ścieżki docelowej '%s'"
-
-#: lib/libalpm/md5driver.c:69
+#: lib/libalpm/package.c:124
#, fuzzy, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "%s nie może być otwarte\n"
-
-#: lib/libalpm/package.c:129
-#, c-format
-msgid "could not get sha1sum for package %s-%s"
-msgstr "nie udało się otrzymać sumy sha1 dla pakietu %s-%s"
-
-#: lib/libalpm/package.c:138
-#, c-format
-msgid "sha1sums do not match for package %s-%s"
-msgstr "sumy kontrolne sha1 dla pakietu %s-%s nie zgadzają się"
-
-#: lib/libalpm/package.c:180
-#, c-format
-msgid "could not get md5sum for package %s-%s"
+msgid "could not get md5sum for package %s-%s\n"
msgstr "nie udało się otrzymać sumy md5 dla pakietu %s-%s"
-#: lib/libalpm/package.c:189
-#, c-format
-msgid "md5sums do not match for package %s-%s"
+#: lib/libalpm/package.c:133
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s\n"
msgstr "sumy kontrolne md5 dla pakietu %s-%s nie zgadzają się"
-#: lib/libalpm/package.c:360
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: ignorowanie aktualizacji pakietu (%s)"
-
-#: lib/libalpm/package.c:369
-#, c-format
-msgid "%s: forcing upgrade to version %s"
+#: lib/libalpm/package.c:737
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s\n"
msgstr "%s: wymuszanie aktualizacji do wersji %s"
-#: lib/libalpm/package.c:374
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
+#: lib/libalpm/package.c:742
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr "%s: local (%s) jest nowsze niż %s (%s)"
-#: lib/libalpm/package.c:382
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
+#: lib/libalpm/package.c:750
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)\n"
msgstr "%s-%s: opóźnianie aktualizacji pakietu (%s)"
-#: lib/libalpm/package.c:564
-msgid "could not parse the package description file"
+#: lib/libalpm/package.c:931
+#, fuzzy, c-format
+msgid "could not parse package description file in %s\n"
msgstr "nie udało się przeczytać pliku opisu"
-#: lib/libalpm/package.c:568
-#, c-format
-msgid "missing package name in %s"
+#: lib/libalpm/package.c:936
+#, fuzzy, c-format
+msgid "missing package name in %s\n"
msgstr "brak nazwy pakietu w %s"
-#: lib/libalpm/package.c:572
-#, c-format
-msgid "missing package version in %s"
+#: lib/libalpm/package.c:940
+#, fuzzy, c-format
+msgid "missing package version in %s\n"
msgstr "brak wersji pakietu w %s"
-#: lib/libalpm/package.c:607
-#, c-format
-msgid "could not remove tempfile %s"
+#: lib/libalpm/package.c:970
+#, fuzzy, c-format
+msgid "could not remove tempfile %s\n"
msgstr "nie udało się usunąć pliku tymczasowego %s"
-#: lib/libalpm/package.c:623 lib/libalpm/package.c:630
-#, c-format
-msgid "error while reading package: %s"
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#, fuzzy, c-format
+msgid "error while reading package %s: %s\n"
msgstr "błąd odczytywania pakietu: %s"
-#: lib/libalpm/package.c:636
-msgid "missing package metadata"
+#: lib/libalpm/package.c:1005
+#, fuzzy, c-format
+msgid "missing package metadata in %s\n"
msgstr "brak metadanych pakietu"
-#: lib/libalpm/package.c:643
-#, c-format
-msgid "missing package filelist in %s, generating one"
+#: lib/libalpm/package.c:1012
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one\n"
msgstr "brak listy plików pakietu w %s, generowanie"
-#: lib/libalpm/remove.c:117
-#, c-format
-msgid "could not find %s in database -- skipping"
+#: lib/libalpm/remove.c:121
+#, fuzzy, c-format
+msgid "could not find %s in database -- skipping\n"
msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie"
-#: lib/libalpm/remove.c:168
-#, c-format
-msgid "cannot remove file '%s': %s"
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s\n"
msgstr "nie udało się usunąć pliku '%s': %s"
-#: lib/libalpm/remove.c:255
-#, c-format
-msgid "cannot remove file %s: %s"
-msgstr "nie udało się usunąć pliku %s: %s"
-
-#: lib/libalpm/remove.c:338
-#, c-format
-msgid "could not remove database entry %s-%s"
+#: lib/libalpm/remove.c:337
+#, fuzzy, c-format
+msgid "could not remove database entry %s-%s\n"
msgstr "nie udało się usunąć wpisu %s-%s z bazy danych"
-#: lib/libalpm/remove.c:343
-#, c-format
-msgid "could not remove entry '%s' from cache"
+#: lib/libalpm/remove.c:342
+#, fuzzy, c-format
+msgid "could not remove entry '%s' from cache\n"
msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej"
-#: lib/libalpm/sha1.c:409
+#: lib/libalpm/server.c:56
#, c-format
-msgid "sha1: %s can't be opened\n"
-msgstr "sha1: %s nie może zostać otwarty\n"
+msgid "url '%s' is invalid, ignoring\n"
+msgstr ""
-#: lib/libalpm/sync.c:294
-#, c-format
-msgid "repository '%s' not found"
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
+msgstr ""
+
+#: lib/libalpm/server.c:241
+msgid "disk"
+msgstr ""
+
+#: lib/libalpm/server.c:245
+#, fuzzy, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "nie udało się pobrać niektórych plików z %s\n"
+
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "nie udało się usunąć pliku '%s': %s"
+
+#: lib/libalpm/server.c:307
+#, fuzzy, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "błąd odczytywania pakietu: %s"
+
+#: lib/libalpm/server.c:319
+#, fuzzy, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "nie udało się usunąć pliku '%s': %s"
+
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "nie udało się zmienić katalogu na / (%s)"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
+#, fuzzy, c-format
+msgid "failed to download %s\n"
+msgstr "nie udało się pobrać wszystkich plików"
+
+#: lib/libalpm/sync.c:135
+#, fuzzy, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)"
+
+#: lib/libalpm/sync.c:250
+#, fuzzy, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s: ignorowanie aktualizacji pakietu (%s)"
+
+#: lib/libalpm/sync.c:320
+#, fuzzy, c-format
+msgid "repository '%s' not found\n"
msgstr "repozytorium '%s' nie zostało znalezione"
-#: lib/libalpm/sync.c:335
-#, c-format
-msgid "%s-%s is up to date -- skipping"
+#: lib/libalpm/sync.c:354
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s jest w najnowszej wersji -- pomijanie"
-#: lib/libalpm/sync.c:608 lib/libalpm/sync.c:624
-msgid "unresolvable package conflicts detected"
-msgstr "odkryto nierozwiązywalne konflikty pakietów"
-
-#: lib/libalpm/sync.c:778
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
+#: lib/libalpm/sync.c:358
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s jest w najnowszej wersji -- pomijanie"
-#: lib/libalpm/sync.c:804
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
#, fuzzy
-msgid "couldn't create package cache, using /tmp instead"
-msgstr ""
-"nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian\n"
+msgid "unresolvable package conflicts detected\n"
+msgstr "odkryto nierozwiązywalne konflikty pakietów"
-#: lib/libalpm/sync.c:808
-#, c-format
-msgid "failed to retrieve some files from %s\n"
-msgstr "nie udało się pobrać niektórych plików z %s\n"
+#: lib/libalpm/sync.c:628
+#, fuzzy, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
-#: lib/libalpm/sync.c:839 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:825
#, c-format
-msgid "can't get md5 or sha1 checksum for package %s\n"
+msgid "command: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#, fuzzy, c-format
+msgid "can't get md5 checksum for file %s\n"
msgstr "nie udało się otrzymać sum kontrolnych md5 lub sha1 dla pakietu %s\n"
-#: lib/libalpm/sync.c:878
-#, c-format
-msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
+#: lib/libalpm/sync.c:910
+#, fuzzy, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr "archiwum %s było skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n"
-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:1056
#, c-format
-msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-msgstr "archiwum %s jest skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n"
+msgid "failed to retrieve some files from %s\n"
+msgstr "nie udało się pobrać niektórych plików z %s\n"
-#: lib/libalpm/sync.c:901
-msgid "could not create removal transaction"
+#: lib/libalpm/sync.c:1137
+#, fuzzy
+msgid "could not create removal transaction\n"
msgstr "nie udało się utworzyć tranzakcji usuwania"
-#: lib/libalpm/sync.c:907
-msgid "could not initialize the removal transaction"
+#: lib/libalpm/sync.c:1143
+#, fuzzy
+msgid "could not initialize the removal transaction\n"
msgstr "nie udało się zainicjować tranzakcji usuwania"
-#: lib/libalpm/sync.c:929
-msgid "could not prepare removal transaction"
+#: lib/libalpm/sync.c:1165
+#, fuzzy
+msgid "could not prepare removal transaction\n"
msgstr "nie udało się przygotować tranzakcji usuwania"
-#: lib/libalpm/sync.c:935
-msgid "could not commit removal transaction"
+#: lib/libalpm/sync.c:1171
+#, fuzzy
+msgid "could not commit removal transaction\n"
msgstr "nie udało się wykonać tranzakcji usuwania"
-#: lib/libalpm/sync.c:946
-msgid "could not create transaction"
+#: lib/libalpm/sync.c:1182
+#, fuzzy
+msgid "could not create transaction\n"
msgstr "nie udało się stworzyć tranzakcji"
-#: lib/libalpm/sync.c:951
-msgid "could not initialize transaction"
+#: lib/libalpm/sync.c:1187
+#, fuzzy
+msgid "could not initialize transaction\n"
msgstr "nie udało się zainicjować tranzakcji"
-#: lib/libalpm/sync.c:980
-msgid "could not prepare transaction"
+#: lib/libalpm/sync.c:1214
+#, fuzzy
+msgid "could not prepare transaction\n"
msgstr "nie udało się przygotować tranzakcji"
-#: lib/libalpm/sync.c:1022
-#, c-format
-msgid "could not update requiredby for database entry %s-%s"
-msgstr "nie udało się zaktualizować requiredby dla wpisu %s-%s w bazie danych"
-
-#: lib/libalpm/sync.c:1031
-#, c-format
-msgid "could not update new database entry %s-%s"
-msgstr "nie udało się zaktualizować nowego wpisu %s-%s w bazie danych"
+#: lib/libalpm/sync.c:1219
+#, fuzzy
+msgid "could not commit transaction\n"
+msgstr "nie udało się wykonać tranzakcji"
-#: lib/libalpm/trans.c:205
-#, c-format
-msgid "could not remove lock file %s"
+#: lib/libalpm/trans.c:214
+#, fuzzy, c-format
+msgid "could not remove lock file %s\n"
msgstr "nie udało się usunąć pliku blokującego %s"
-#: lib/libalpm/trans.c:498 lib/libalpm/trans.c:528
+#: lib/libalpm/trans.c:483
#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
+msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
msgstr ""
-"nie udało się zaktualizować wpisu do bazy danych 'requiredby' dla %s-%s"
-#: lib/libalpm/trans.c:589
-msgid "could not create temp directory"
+#: lib/libalpm/trans.c:494
+#, fuzzy
+msgid "could not create temp directory\n"
msgstr "nie udało się stworzyć katalogu tymczasowego"
-#: lib/libalpm/trans.c:616
-#, c-format
-msgid "could not change directory to %s (%s)"
+#: lib/libalpm/trans.c:536
+#, fuzzy, c-format
+msgid "could not change directory to %s (%s)\n"
msgstr "nie udało się zmienić katalogu na %s (%s)"
-#: lib/libalpm/trans.c:633
-#, c-format
-msgid "could not fork a new process (%s)"
+#: lib/libalpm/trans.c:554
+#, fuzzy, c-format
+msgid "could not fork a new process (%s)\n"
msgstr "nie udało się odwidlić nowego procesu (%s)"
-#: lib/libalpm/trans.c:641
-#, c-format
-msgid "could not change the root directory (%s)"
+#: lib/libalpm/trans.c:564
+#, fuzzy, c-format
+msgid "could not change the root directory (%s)\n"
msgstr "nie udało się zmienić katalogu głównego (%s)"
-#: lib/libalpm/trans.c:645
-#, c-format
-msgid "could not change directory to / (%s)"
+#: lib/libalpm/trans.c:569
+#, fuzzy, c-format
+msgid "could not change directory to / (%s)\n"
msgstr "nie udało się zmienić katalogu na / (%s)"
-#: lib/libalpm/trans.c:654
-#, c-format
-msgid "call to waitpid failed (%s)"
+#: lib/libalpm/trans.c:578
+#, fuzzy, c-format
+msgid "call to popen failed (%s)"
msgstr "zawołanie do waitpid nieudane (%s)"
-#: lib/libalpm/trans.c:663
-#, c-format
-msgid "could not remove tmpdir %s"
+#: lib/libalpm/trans.c:597
+#, fuzzy, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "zawołanie do waitpid nieudane (%s)"
+
+#: lib/libalpm/trans.c:606
+msgid "scriptlet failed to execute correctly\n"
+msgstr ""
+
+#: lib/libalpm/trans.c:615
+#, fuzzy, c-format
+msgid "could not remove tmpdir %s\n"
msgstr "nie udało się usunąć katalogu tymczasowego %s"
-#: lib/libalpm/util.c:127
-#, c-format
-msgid "failed to make path '%s' : %s"
+#: lib/libalpm/util.c:204
+#, fuzzy, c-format
+msgid "failed to make path '%s' : %s\n"
msgstr "nie udało się stworzyć ścieżki '%s' : %s"
-#: lib/libalpm/util.c:325
+#: lib/libalpm/util.c:389
#, c-format
msgid "could not open %s: %s\n"
msgstr "nie udało się otworzyć %s: %s\n"
-#: lib/libalpm/util.c:346
+#: lib/libalpm/util.c:573
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
+
+#: lib/libalpm/util.c:593
+#, fuzzy
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr ""
+"nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian\n"
+
+#: lib/libalpm/util.c:643
#, fuzzy, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "nie udało się rozpakować %s (%s)"
+msgid "md5: %s can't be opened\n"
+msgstr "%s nie może być otwarte\n"
+
+#: lib/libalpm/util.c:645
+#, fuzzy, c-format
+msgid "md5: %s can't be read\n"
+msgstr "%s nie może być otwarte\n"
+
+#~ msgid "please remove '%s' first, using -Rd"
+#~ msgstr "proszę usunąć pierw '%s', korzystając z -Rd"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "nie udało się rozpakować %s (%s)"
+
+#~ msgid "could not update provision '%s' from '%s'"
+#~ msgstr "nie udało się zaktualizować zasobu '%s' z '%s'"
+
+#, fuzzy
+#~ msgid "%s: description file is missing"
+#~ msgstr "%s: błąd składni w pliku opisu linia %d"
+
+#~ msgid "malloc failed: could not allocate %d bytes"
+#~ msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
+
+#~ msgid ""
+#~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+#~ msgstr ""
+#~ "nie udało się rozwiązać zależności dla \"%s\" (\"%s\" nie znajduje się w "
+#~ "zbiorze pakietów)"
+
+#~ msgid "cannot canonicalize specified root path '%s'"
+#~ msgstr "nie udało się skanonizować podanej ścieżki docelowej '%s'"
+
+#~ msgid "could not get sha1sum for package %s-%s"
+#~ msgstr "nie udało się otrzymać sumy sha1 dla pakietu %s-%s"
+
+#~ msgid "sha1sums do not match for package %s-%s"
+#~ msgstr "sumy kontrolne sha1 dla pakietu %s-%s nie zgadzają się"
+
+#~ msgid "cannot remove file %s: %s"
+#~ msgstr "nie udało się usunąć pliku %s: %s"
+
+#~ msgid "sha1: %s can't be opened\n"
+#~ msgstr "sha1: %s nie może zostać otwarty\n"
+
+#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+#~ msgstr "archiwum %s jest skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n"
+
+#~ msgid "could not update requiredby for database entry %s-%s"
+#~ msgstr ""
+#~ "nie udało się zaktualizować requiredby dla wpisu %s-%s w bazie danych"
+
+#~ msgid "could not update new database entry %s-%s"
+#~ msgstr "nie udało się zaktualizować nowego wpisu %s-%s w bazie danych"
+#~ msgid "could not update 'requiredby' database entry %s-%s"
+#~ msgstr ""
+#~ "nie udało się zaktualizować wpisu do bazy danych 'requiredby' dla %s-%s"
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 10dc1a5b..35c7c880 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-07-11 00:26-0400\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-03-07 01:18-0300\n"
"Last-Translator: Douglas Soares de Andrade <dsandrade@gmail.com>\n"
"Language-Team: Português do Brasil <pt@li.org>\n"
@@ -22,608 +22,683 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: lib/libalpm/add.c:118
-#, c-format
-msgid "replacing older version %s-%s by %s in target list"
+#: lib/libalpm/add.c:88
+#, fuzzy, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
msgstr "substituindo a versão antiga %s-%s por '%s' na lista de pacotes"
-#: lib/libalpm/add.c:127
-#, c-format
-msgid "newer version %s-%s is in the target list -- skipping"
+#: lib/libalpm/add.c:97
+#, fuzzy, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
msgstr "versão atualizada %s-%s está na lista de pacotes -- pulando"
-#: lib/libalpm/add.c:201
-msgid "replacing packages with -A and -U is not supported yet"
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
+msgstr ""
+
+#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
+#, fuzzy
+msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "substituir pacotes com -A e -U ainda não é suportado"
-#: lib/libalpm/add.c:202
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
+
+#: lib/libalpm/add.c:365
#, c-format
-msgid "please remove '%s' first, using -Rd"
-msgstr "por favor, remova '%s' primeiro usando -Rd"
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o package: %o\n"
+msgstr ""
-#: lib/libalpm/add.c:428 lib/libalpm/trans.c:609
-msgid "could not get current working directory"
-msgstr "não foi possível obter o diretório de trabalho atual"
+#: lib/libalpm/add.c:392
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr ""
-#: lib/libalpm/add.c:619
+#: lib/libalpm/add.c:399
#, c-format
-msgid "could not rename %s (%s)"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr ""
+
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#, fuzzy, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "não foi possível extrair %s (%s)"
+
+#: lib/libalpm/add.c:505
+#, fuzzy, c-format
+msgid "could not rename %s (%s)\n"
msgstr "não foi possível renomear %s (%s)"
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:646
-#, c-format
-msgid "could not copy tempfile to %s (%s)"
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)\n"
msgstr "não foi possível copiar arquivo temporário para %s (%s)"
-#: lib/libalpm/add.c:631 lib/libalpm/remove.c:241
-#, c-format
-msgid "%s saved as %s"
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#, fuzzy, c-format
+msgid "%s saved as %s\n"
msgstr "%s salvo como %s"
-#: lib/libalpm/add.c:670
-#, c-format
-msgid "could not install %s as %s: %s"
+#: lib/libalpm/add.c:556
+#, fuzzy, c-format
+msgid "could not install %s as %s: %s\n"
msgstr "não foi possível instalar %s como %s: %s"
-#: lib/libalpm/add.c:673
-#, c-format
-msgid "%s installed as %s"
+#: lib/libalpm/add.c:559
+#, fuzzy, c-format
+msgid "%s installed as %s\n"
msgstr "%s instalado como %s"
-#: lib/libalpm/add.c:689
-#, c-format
-msgid "extracting %s as %s.pacnew"
+#: lib/libalpm/add.c:576
+#, fuzzy, c-format
+msgid "extracting %s as %s.pacnew\n"
msgstr "extraindo %s como %s.pacnew"
-#: lib/libalpm/add.c:721
-#, c-format
-msgid "could not extract %s (%s)"
-msgstr "não foi possível extrair %s (%s)"
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, fuzzy
+msgid "could not get current working directory\n"
+msgstr "não foi possível obter o diretório de trabalho atual"
-#: lib/libalpm/add.c:772
+#: lib/libalpm/add.c:765
#, fuzzy, c-format
-msgid "problem occurred while upgrading %s"
+msgid "problem occurred while upgrading %s\n"
msgstr "erros ocorreram durante %s %s"
-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:770
#, fuzzy, c-format
-msgid "problem occurred while installing %s"
+msgid "problem occurred while installing %s\n"
msgstr "erros ocorreram durante %s %s"
-#: lib/libalpm/add.c:815
-#, c-format
-msgid "could not update provision '%s' from '%s'"
-msgstr "não foi possível atualizar a provisão '%s' para '%s'"
-
-#: lib/libalpm/add.c:835
-#, c-format
-msgid "could not update database entry %s-%s"
+#: lib/libalpm/add.c:785
+#, fuzzy, c-format
+msgid "could not update database entry %s-%s\n"
msgstr "não foi possível atualizar a entrada na base de dados %s-%s"
-#: lib/libalpm/add.c:843
-#, c-format
-msgid "could not add entry '%s' in cache"
+#: lib/libalpm/add.c:793
+#, fuzzy, c-format
+msgid "could not add entry '%s' in cache\n"
msgstr "não foi possível adicionar a entrada '%s' ao cache"
-#: lib/libalpm/be_files.c:83
-#, c-format
-msgid "%s: description file is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:88
-#, c-format
-msgid "%s: dependency file is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:93
-#, c-format
-msgid "%s: file list is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:216
-#, c-format
-msgid "invalid name for database entry '%s'"
+#: lib/libalpm/be_files.c:223
+#, fuzzy, c-format
+msgid "invalid name for database entry '%s'\n"
msgstr "nome inválido para a entrada na base de dados '%s'"
-#: lib/libalpm/be_files.c:271
+#: lib/libalpm/be_files.c:275
#, c-format
-msgid "loading package data for %s : level=%d"
+msgid "loading package data for %s : level=%d\n"
msgstr ""
-#: lib/libalpm/be_files.c:288 lib/libalpm/be_files.c:434
-#: lib/libalpm/be_files.c:457 lib/libalpm/be_files.c:549
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:419
-#, c-format
-msgid "could not open file %s: %s"
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
+#, fuzzy, c-format
+msgid "could not open file %s: %s\n"
msgstr "não foi possível abrir o arquivo %s: %s"
-#: lib/libalpm/cache.c:63
-#, c-format
-msgid "adding '%s' to package cache for db '%s'"
-msgstr ""
-
-#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:80 lib/libalpm/deps.c:449
-#: lib/libalpm/deps.c:650 lib/libalpm/deps.c:690 lib/libalpm/group.c:44
-#: lib/libalpm/handle.c:50 lib/libalpm/package.c:297 lib/libalpm/sync.c:62
-#: lib/libalpm/sync.c:612 lib/libalpm/sync.c:628 lib/libalpm/trans.c:223
+#: lib/libalpm/cache.c:62
#, c-format
-msgid "malloc failure: could not allocate %d bytes"
+msgid "adding '%s' to package cache for db '%s'\n"
msgstr ""
-#: lib/libalpm/db.c:238
-#, c-format
-msgid "could not remove database entry %s%s"
+#: lib/libalpm/db.c:285
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s\n"
msgstr "não foi possível remover a entrada da base de dados %s%s"
-#: lib/libalpm/db.c:432 lib/libalpm/sync.c:128
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
-msgstr ""
-
-#: lib/libalpm/db.c:553 lib/libalpm/db.c:560
-#, c-format
-msgid "malloc failed: could not allocate %d bytes"
+#: lib/libalpm/db.c:553
+msgid "attempt to re-register the 'local' DB\n"
msgstr ""
-#: lib/libalpm/db.c:661
-msgid "attempt to re-register the 'local' DB"
-msgstr ""
-
-#: lib/libalpm/db.c:680
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
#, fuzzy
-msgid "database path is undefined"
+msgid "database path is undefined\n"
msgstr "base de dados não inicializada"
-#: lib/libalpm/deps.c:187
-msgid "dependency cycle detected\n"
+#: lib/libalpm/deps.c:173
+msgid "dependency cycle detected:\n"
msgstr ""
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:175
#, c-format
-msgid ""
-"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid "%s will be removed after its %s dependency\n"
+msgstr ""
+
+#: lib/libalpm/deps.c:177
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
msgstr ""
-#: lib/libalpm/deps.c:687
+#: lib/libalpm/deps.c:573
#, c-format
-msgid "cannot resolve dependencies for \"%s\""
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr ""
-#: lib/libalpm/error.c:38
+#: lib/libalpm/error.c:43
msgid "out of memory!"
msgstr ""
-#: lib/libalpm/error.c:40
+#: lib/libalpm/error.c:45
msgid "unexpected system error"
msgstr ""
-#: lib/libalpm/error.c:42
+#: lib/libalpm/error.c:47
msgid "insufficient privileges"
msgstr ""
-#: lib/libalpm/error.c:44
+#: lib/libalpm/error.c:49
msgid "could not find or read file"
msgstr ""
-#: lib/libalpm/error.c:46
+#: lib/libalpm/error.c:51
+#, fuzzy
+msgid "could not find or read directory"
+msgstr "não foi possível obter o diretório de trabalho atual"
+
+#: lib/libalpm/error.c:53
msgid "wrong or NULL argument passed"
msgstr ""
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:56
msgid "library not initialized"
msgstr "biblioteca não inicializada"
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:58
msgid "library already initialized"
msgstr "biblioteca já inicializada"
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:60
msgid "unable to lock database"
msgstr ""
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:63
msgid "could not open database"
msgstr "não foi possível abrir a base de dados"
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:65
msgid "could not create database"
msgstr "não foi possível criar a base de dados"
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:67
msgid "database not initialized"
msgstr "base de dados não inicializada"
-#: lib/libalpm/error.c:62
+#: lib/libalpm/error.c:69
msgid "database already registered"
msgstr "base de dados já registrada"
-#: lib/libalpm/error.c:64
+#: lib/libalpm/error.c:71
msgid "could not find database"
msgstr "não foi possível encontrar a base de dados"
-#: lib/libalpm/error.c:66
+#: lib/libalpm/error.c:73
msgid "could not update database"
msgstr "não foi possível atualizar a base de dados"
-#: lib/libalpm/error.c:68
+#: lib/libalpm/error.c:75
msgid "could not remove database entry"
msgstr "não foi possível remover a entrada da base de dados"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:78
msgid "invalid url for server"
msgstr ""
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:85
msgid "could not set parameter"
msgstr ""
-#: lib/libalpm/error.c:81
+#: lib/libalpm/error.c:88
msgid "transaction already initialized"
msgstr ""
-#: lib/libalpm/error.c:83 lib/libalpm/error.c:87
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr ""
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:92
msgid "duplicate target"
msgstr "alvo duplicado"
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:96
msgid "transaction not prepared"
msgstr ""
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "transaction aborted"
msgstr ""
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "operation not compatible with the transaction type"
msgstr ""
-#: lib/libalpm/error.c:95 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:102
msgid "could not commit transaction"
msgstr ""
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "could not download all files"
msgstr ""
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:107
msgid "could not find or read package"
msgstr ""
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:109
msgid "invalid or corrupted package"
msgstr ""
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:111
msgid "cannot open package file"
msgstr ""
-#: lib/libalpm/error.c:106
+#: lib/libalpm/error.c:113
msgid "cannot load package data"
msgstr ""
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:115
msgid "package already installed"
msgstr ""
-#: lib/libalpm/error.c:110
+#: lib/libalpm/error.c:117
msgid "package not installed or lesser version"
msgstr ""
-#: lib/libalpm/error.c:112
+#: lib/libalpm/error.c:119
msgid "cannot remove all files for package"
msgstr ""
-#: lib/libalpm/error.c:114
+#: lib/libalpm/error.c:121
msgid "package name is not valid"
msgstr "o nome do pacote não é valido"
-#: lib/libalpm/error.c:116
+#: lib/libalpm/error.c:123
msgid "corrupted package"
msgstr "pacote corrompido"
-#: lib/libalpm/error.c:118
+#: lib/libalpm/error.c:125
msgid "no such repository"
msgstr ""
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:128
+#, fuzzy
+msgid "corrupted delta"
+msgstr "pacote corrompido"
+
+#: lib/libalpm/error.c:130
+msgid "delta patch failed"
+msgstr ""
+
+#: lib/libalpm/error.c:133
msgid "group not found"
msgstr "grupo não encontrado"
-#: lib/libalpm/error.c:124
+#: lib/libalpm/error.c:136
msgid "could not satisfy dependencies"
msgstr ""
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:138
msgid "conflicting dependencies"
msgstr ""
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:140
msgid "conflicting files"
msgstr ""
-#: lib/libalpm/error.c:131
+#: lib/libalpm/error.c:143
msgid "user aborted the operation"
msgstr ""
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:145
msgid "internal error"
msgstr "erro interno"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:147
msgid "libarchive error"
msgstr ""
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:150
msgid "not confirmed"
msgstr ""
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:152
msgid "invalid regular expression"
msgstr "expressão regular inválida"
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:155
msgid "connection to remote host failed"
msgstr ""
-#: lib/libalpm/error.c:146
+#: lib/libalpm/error.c:158
msgid "unexpected error"
msgstr "erro inesperado"
-#: lib/libalpm/handle.c:140
-#, c-format
-msgid "cannot canonicalize specified root path '%s'"
-msgstr ""
+#: lib/libalpm/package.c:124
+#, fuzzy, c-format
+msgid "could not get md5sum for package %s-%s\n"
+msgstr "não foi possível conseguir a soma md5 para o pacote %s-%s"
-#: lib/libalpm/md5driver.c:69
+#: lib/libalpm/package.c:133
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s\n"
+msgstr "somas md5 não coincidem para o pacote %s-%s"
+
+#: lib/libalpm/package.c:737
#, c-format
-msgid "md5: %s can't be opened\n"
+msgid "%s: forcing upgrade to version %s\n"
msgstr ""
-#: lib/libalpm/package.c:129
+#: lib/libalpm/package.c:742
#, c-format
-msgid "could not get sha1sum for package %s-%s"
-msgstr "não foi possível conseguir a soma sha1 para o pacote %s-%s"
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr ""
-#: lib/libalpm/package.c:138
+#: lib/libalpm/package.c:750
#, c-format
-msgid "sha1sums do not match for package %s-%s"
-msgstr "somas sha1 não coincidem para o pacote %s-%s"
+msgid "%s-%s: delaying upgrade of package (%s)\n"
+msgstr ""
-#: lib/libalpm/package.c:180
-#, c-format
-msgid "could not get md5sum for package %s-%s"
-msgstr "não foi possível conseguir a soma md5 para o pacote %s-%s"
+#: lib/libalpm/package.c:931
+#, fuzzy, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "não foi possível remover o arquivo de lock %s"
-#: lib/libalpm/package.c:189
-#, c-format
-msgid "md5sums do not match for package %s-%s"
-msgstr "somas md5 não coincidem para o pacote %s-%s"
+#: lib/libalpm/package.c:936
+#, fuzzy, c-format
+msgid "missing package name in %s\n"
+msgstr "o nome do pacote não é valido"
-#: lib/libalpm/package.c:360
+#: lib/libalpm/package.c:940
#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
+msgid "missing package version in %s\n"
msgstr ""
-#: lib/libalpm/package.c:369
+#: lib/libalpm/package.c:970
+#, fuzzy, c-format
+msgid "could not remove tempfile %s\n"
+msgstr "não foi possível remover o arquivo de lock %s"
+
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
#, c-format
-msgid "%s: forcing upgrade to version %s"
+msgid "error while reading package %s: %s\n"
msgstr ""
-#: lib/libalpm/package.c:374
+#: lib/libalpm/package.c:1005
#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
+msgid "missing package metadata in %s\n"
msgstr ""
-#: lib/libalpm/package.c:382
+#: lib/libalpm/package.c:1012
#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
+msgid "missing package filelist in %s, generating one\n"
msgstr ""
-#: lib/libalpm/package.c:564
-msgid "could not parse the package description file"
-msgstr ""
+#: lib/libalpm/remove.c:121
+#, fuzzy, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "não foi possível encontrar a base de dados"
+
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "não foi possível abrir o arquivo %s: %s"
+
+#: lib/libalpm/remove.c:337
+#, fuzzy, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "não foi possível remover a entrada da base de dados %s%s"
-#: lib/libalpm/package.c:568
+#: lib/libalpm/remove.c:342
+#, fuzzy, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "não foi possível adicionar a entrada '%s' ao cache"
+
+#: lib/libalpm/server.c:56
#, c-format
-msgid "missing package name in %s"
+msgid "url '%s' is invalid, ignoring\n"
msgstr ""
-#: lib/libalpm/package.c:572
-#, c-format
-msgid "missing package version in %s"
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
msgstr ""
-#: lib/libalpm/package.c:607
-#, c-format
-msgid "could not remove tempfile %s"
+#: lib/libalpm/server.c:241
+msgid "disk"
msgstr ""
-#: lib/libalpm/package.c:623 lib/libalpm/package.c:630
+#: lib/libalpm/server.c:245
#, c-format
-msgid "error while reading package: %s"
+msgid "failed retrieving file '%s' from %s : %s\n"
msgstr ""
-#: lib/libalpm/package.c:636
-msgid "missing package metadata"
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
msgstr ""
-#: lib/libalpm/package.c:643
-#, c-format
-msgid "missing package filelist in %s, generating one"
-msgstr ""
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "não foi possível remover o arquivo de lock %s"
-#: lib/libalpm/remove.c:117
+#: lib/libalpm/server.c:307
#, c-format
-msgid "could not find %s in database -- skipping"
+msgid "error downloading '%s': %s\n"
msgstr ""
-#: lib/libalpm/remove.c:168
+#: lib/libalpm/server.c:319
#, c-format
-msgid "cannot remove file '%s': %s"
+msgid "error writing to file '%s': %s\n"
msgstr ""
-#: lib/libalpm/remove.c:255
-#, c-format
-msgid "cannot remove file %s: %s"
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "não foi possível extrair %s (%s)"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
msgstr ""
-#: lib/libalpm/remove.c:338
-#, c-format
-msgid "could not remove database entry %s-%s"
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
msgstr ""
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/server.c:458
#, c-format
-msgid "could not remove entry '%s' from cache"
+msgid "failed to download %s\n"
msgstr ""
-#: lib/libalpm/sha1.c:409
+#: lib/libalpm/sync.c:135
#, c-format
-msgid "sha1: %s can't be opened\n"
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
msgstr ""
-#: lib/libalpm/sync.c:294
+#: lib/libalpm/sync.c:250
#, c-format
-msgid "repository '%s' not found"
+msgid "%s: ignoring package upgrade (%s => %s)\n"
msgstr ""
-#: lib/libalpm/sync.c:335
+#: lib/libalpm/sync.c:320
#, c-format
-msgid "%s-%s is up to date -- skipping"
+msgid "repository '%s' not found\n"
msgstr ""
-#: lib/libalpm/sync.c:608 lib/libalpm/sync.c:624
-msgid "unresolvable package conflicts detected"
-msgstr ""
+#: lib/libalpm/sync.c:354
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "versão atualizada %s-%s está na lista de pacotes -- pulando"
-#: lib/libalpm/sync.c:778
+#: lib/libalpm/sync.c:358
#, c-format
-msgid "no %s cache exists, creating...\n"
+msgid "%s-%s is up to date -- reinstalling\n"
msgstr ""
-#: lib/libalpm/sync.c:804
-msgid "couldn't create package cache, using /tmp instead"
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
+msgid "unresolvable package conflicts detected\n"
msgstr ""
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:628
#, c-format
-msgid "failed to retrieve some files from %s\n"
+msgid "malloc failure: could not allocate %zd bytes\n"
msgstr ""
-#: lib/libalpm/sync.c:839 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:825
#, c-format
-msgid "can't get md5 or sha1 checksum for package %s\n"
+msgid "command: %s\n"
msgstr ""
-#: lib/libalpm/sync.c:878
-#, c-format
-msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
-msgstr ""
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#, fuzzy, c-format
+msgid "can't get md5 checksum for file %s\n"
+msgstr "não foi possível conseguir a soma md5 para o pacote %s-%s"
-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:910
#, c-format
-msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:901
-msgid "could not create removal transaction"
+#: lib/libalpm/sync.c:1056
+#, c-format
+msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:907
-msgid "could not initialize the removal transaction"
-msgstr ""
+#: lib/libalpm/sync.c:1137
+#, fuzzy
+msgid "could not create removal transaction\n"
+msgstr "não foi possível criar a base de dados"
-#: lib/libalpm/sync.c:929
-msgid "could not prepare removal transaction"
+#: lib/libalpm/sync.c:1143
+msgid "could not initialize the removal transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:935
-msgid "could not commit removal transaction"
-msgstr ""
+#: lib/libalpm/sync.c:1165
+#, fuzzy
+msgid "could not prepare removal transaction\n"
+msgstr "não foi possível criar a base de dados"
-#: lib/libalpm/sync.c:946
-msgid "could not create transaction"
+#: lib/libalpm/sync.c:1171
+msgid "could not commit removal transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:951
-msgid "could not initialize transaction"
-msgstr ""
+#: lib/libalpm/sync.c:1182
+#, fuzzy
+msgid "could not create transaction\n"
+msgstr "não foi possível criar a base de dados"
-#: lib/libalpm/sync.c:980
-msgid "could not prepare transaction"
+#: lib/libalpm/sync.c:1187
+msgid "could not initialize transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:1022
-#, c-format
-msgid "could not update requiredby for database entry %s-%s"
-msgstr ""
+#: lib/libalpm/sync.c:1214
+#, fuzzy
+msgid "could not prepare transaction\n"
+msgstr "não foi possível criar a base de dados"
-#: lib/libalpm/sync.c:1031
-#, c-format
-msgid "could not update new database entry %s-%s"
+#: lib/libalpm/sync.c:1219
+msgid "could not commit transaction\n"
msgstr ""
-#: lib/libalpm/trans.c:205
-#, c-format
-msgid "could not remove lock file %s"
+#: lib/libalpm/trans.c:214
+#, fuzzy, c-format
+msgid "could not remove lock file %s\n"
msgstr "não foi possível remover o arquivo de lock %s"
-#: lib/libalpm/trans.c:498 lib/libalpm/trans.c:528
+#: lib/libalpm/trans.c:483
#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
+msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
msgstr ""
-#: lib/libalpm/trans.c:589
-msgid "could not create temp directory"
-msgstr ""
+#: lib/libalpm/trans.c:494
+#, fuzzy
+msgid "could not create temp directory\n"
+msgstr "não foi possível obter o diretório de trabalho atual"
+
+#: lib/libalpm/trans.c:536
+#, fuzzy, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "não foi possível extrair %s (%s)"
-#: lib/libalpm/trans.c:616
+#: lib/libalpm/trans.c:554
+#, fuzzy, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "não foi possível renomear %s (%s)"
+
+#: lib/libalpm/trans.c:564
+#, fuzzy, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "não foi possível obter o diretório de trabalho atual"
+
+#: lib/libalpm/trans.c:569
+#, fuzzy, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "não foi possível extrair %s (%s)"
+
+#: lib/libalpm/trans.c:578
+#, fuzzy, c-format
+msgid "call to popen failed (%s)"
+msgstr "não foi possível abrir o arquivo %s: %s"
+
+#: lib/libalpm/trans.c:597
#, c-format
-msgid "could not change directory to %s (%s)"
+msgid "call to waitpid failed (%s)\n"
msgstr ""
-#: lib/libalpm/trans.c:633
-#, c-format
-msgid "could not fork a new process (%s)"
+#: lib/libalpm/trans.c:606
+msgid "scriptlet failed to execute correctly\n"
msgstr ""
-#: lib/libalpm/trans.c:641
+#: lib/libalpm/trans.c:615
+#, fuzzy, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "não foi possível remover o arquivo de lock %s"
+
+#: lib/libalpm/util.c:204
#, c-format
-msgid "could not change the root directory (%s)"
+msgid "failed to make path '%s' : %s\n"
msgstr ""
-#: lib/libalpm/trans.c:645
+#: lib/libalpm/util.c:389
#, c-format
-msgid "could not change directory to / (%s)"
+msgid "could not open %s: %s\n"
msgstr ""
-#: lib/libalpm/trans.c:654
+#: lib/libalpm/util.c:573
#, c-format
-msgid "call to waitpid failed (%s)"
+msgid "no %s cache exists, creating...\n"
msgstr ""
-#: lib/libalpm/trans.c:663
-#, c-format
-msgid "could not remove tmpdir %s"
+#: lib/libalpm/util.c:593
+msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/util.c:127
+#: lib/libalpm/util.c:643
#, c-format
-msgid "failed to make path '%s' : %s"
+msgid "md5: %s can't be opened\n"
msgstr ""
-#: lib/libalpm/util.c:325
+#: lib/libalpm/util.c:645
#, c-format
-msgid "could not open %s: %s\n"
+msgid "md5: %s can't be read\n"
msgstr ""
-#: lib/libalpm/util.c:346
-#, fuzzy, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "não foi possível extrair %s (%s)"
+#~ msgid "please remove '%s' first, using -Rd"
+#~ msgstr "por favor, remova '%s' primeiro usando -Rd"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "não foi possível extrair %s (%s)"
+
+#~ msgid "could not update provision '%s' from '%s'"
+#~ msgstr "não foi possível atualizar a provisão '%s' para '%s'"
+
+#~ msgid "could not get sha1sum for package %s-%s"
+#~ msgstr "não foi possível conseguir a soma sha1 para o pacote %s-%s"
+#~ msgid "sha1sums do not match for package %s-%s"
+#~ msgstr "somas sha1 não coincidem para o pacote %s-%s"
diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru_RU.po
index 09adeec7..89fb8f28 100644
--- a/lib/libalpm/po/ru_RU.po
+++ b/lib/libalpm/po/ru_RU.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-07-11 00:26-0400\n"
+"POT-Creation-Date: 2007-12-02 21:40-0600\n"
"PO-Revision-Date: 2007-03-16 02:52+1000\n"
"Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -16,610 +16,692 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/libalpm/add.c:118
+#: lib/libalpm/add.c:88
#, c-format
-msgid "replacing older version %s-%s by %s in target list"
+msgid "replacing older version %s-%s by %s in target list\n"
msgstr ""
-#: lib/libalpm/add.c:127
-#, c-format
-msgid "newer version %s-%s is in the target list -- skipping"
+#: lib/libalpm/add.c:97
+#, fuzzy, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
+msgstr "%s-%s не устарел -- пропускаю"
+
+#: lib/libalpm/add.c:168
+msgid "conflicting packages were found in the target list\n"
msgstr ""
-#: lib/libalpm/add.c:201
-msgid "replacing packages with -A and -U is not supported yet"
+#: lib/libalpm/add.c:169
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr ""
+
+#: lib/libalpm/add.c:172
+#, fuzzy
+msgid "replacing packages with -A and -U is not supported yet\n"
msgstr "замещение пакетов с использованием опций -A и -U еще не реализовано"
-#: lib/libalpm/add.c:202
+#: lib/libalpm/add.c:173
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr ""
+
+#: lib/libalpm/add.c:365
#, c-format
-msgid "please remove '%s' first, using -Rd"
-msgstr "пожалуйста, уделите сначала '%s' используя -Rd"
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o package: %o\n"
+msgstr ""
-#: lib/libalpm/add.c:428 lib/libalpm/trans.c:609
-msgid "could not get current working directory"
-msgstr "не могу определить текущую рабочую директорию"
+#: lib/libalpm/add.c:392
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr ""
-#: lib/libalpm/add.c:619
+#: lib/libalpm/add.c:399
#, c-format
-msgid "could not rename %s (%s)"
+msgid "extract: not overwriting dir with file %s\n"
+msgstr ""
+
+#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422
+#, fuzzy, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "не могу извлечь %s (%s)"
+
+#: lib/libalpm/add.c:505
+#, fuzzy, c-format
+msgid "could not rename %s (%s)\n"
msgstr "не могу переименовать %s (%s)"
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:646
-#, c-format
-msgid "could not copy tempfile to %s (%s)"
+#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)\n"
msgstr "не могу скопировать временный файл в %s (%s)"
-#: lib/libalpm/add.c:631 lib/libalpm/remove.c:241
-#, c-format
-msgid "%s saved as %s"
+#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234
+#, fuzzy, c-format
+msgid "%s saved as %s\n"
msgstr "%s сохранен как %s"
-#: lib/libalpm/add.c:670
-#, c-format
-msgid "could not install %s as %s: %s"
+#: lib/libalpm/add.c:556
+#, fuzzy, c-format
+msgid "could not install %s as %s: %s\n"
msgstr "не могу установить %s как %s: %s"
-#: lib/libalpm/add.c:673
-#, c-format
-msgid "%s installed as %s"
+#: lib/libalpm/add.c:559
+#, fuzzy, c-format
+msgid "%s installed as %s\n"
msgstr "%s установлен как %s"
-#: lib/libalpm/add.c:689
-#, c-format
-msgid "extracting %s as %s.pacnew"
+#: lib/libalpm/add.c:576
+#, fuzzy, c-format
+msgid "extracting %s as %s.pacnew\n"
msgstr "извлекаю %s как %s.pacnew"
-#: lib/libalpm/add.c:721
-#, c-format
-msgid "could not extract %s (%s)"
-msgstr "не могу извлечь %s (%s)"
+#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529
+#, fuzzy
+msgid "could not get current working directory\n"
+msgstr "не могу определить текущую рабочую директорию"
-#: lib/libalpm/add.c:772
+#: lib/libalpm/add.c:765
#, fuzzy, c-format
-msgid "problem occurred while upgrading %s"
+msgid "problem occurred while upgrading %s\n"
msgstr "во время %s %s произошли ошибки"
-#: lib/libalpm/add.c:777
+#: lib/libalpm/add.c:770
#, fuzzy, c-format
-msgid "problem occurred while installing %s"
+msgid "problem occurred while installing %s\n"
msgstr "во время %s %s произошли ошибки"
-#: lib/libalpm/add.c:815
-#, c-format
-msgid "could not update provision '%s' from '%s'"
-msgstr "не могу обновить '%s' из '%s'"
-
-#: lib/libalpm/add.c:835
-#, c-format
-msgid "could not update database entry %s-%s"
+#: lib/libalpm/add.c:785
+#, fuzzy, c-format
+msgid "could not update database entry %s-%s\n"
msgstr "не могу обновить в базе данных запись %s-%s"
-#: lib/libalpm/add.c:843
-#, c-format
-msgid "could not add entry '%s' in cache"
+#: lib/libalpm/add.c:793
+#, fuzzy, c-format
+msgid "could not add entry '%s' in cache\n"
msgstr "не могу добавить запись '%s' в кэш"
-#: lib/libalpm/be_files.c:83
-#, c-format
-msgid "%s: description file is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:88
-#, c-format
-msgid "%s: dependency file is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:93
-#, c-format
-msgid "%s: file list is missing"
-msgstr ""
-
-#: lib/libalpm/be_files.c:216
-#, c-format
-msgid "invalid name for database entry '%s'"
-msgstr ""
+#: lib/libalpm/be_files.c:223
+#, fuzzy, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "не могу удалить из базы данных запись %s%s"
-#: lib/libalpm/be_files.c:271
-#, c-format
-msgid "loading package data for %s : level=%d"
+#: lib/libalpm/be_files.c:275
+#, fuzzy, c-format
+msgid "loading package data for %s : level=%d\n"
msgstr "загружаю данные пакета %s : уровень=%d"
-#: lib/libalpm/be_files.c:288 lib/libalpm/be_files.c:434
-#: lib/libalpm/be_files.c:457 lib/libalpm/be_files.c:549
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:419
-#, c-format
-msgid "could not open file %s: %s"
-msgstr ""
-
-#: lib/libalpm/cache.c:63
-#, c-format
-msgid "adding '%s' to package cache for db '%s'"
-msgstr ""
+#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429
+#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563
+#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669
+#: lib/libalpm/package.c:787
+#, fuzzy, c-format
+msgid "could not open file %s: %s\n"
+msgstr "не могу скопировать временный файл в %s (%s)"
-#: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:80 lib/libalpm/deps.c:449
-#: lib/libalpm/deps.c:650 lib/libalpm/deps.c:690 lib/libalpm/group.c:44
-#: lib/libalpm/handle.c:50 lib/libalpm/package.c:297 lib/libalpm/sync.c:62
-#: lib/libalpm/sync.c:612 lib/libalpm/sync.c:628 lib/libalpm/trans.c:223
+#: lib/libalpm/cache.c:62
#, c-format
-msgid "malloc failure: could not allocate %d bytes"
+msgid "adding '%s' to package cache for db '%s'\n"
msgstr ""
-#: lib/libalpm/db.c:238
-#, c-format
-msgid "could not remove database entry %s%s"
+#: lib/libalpm/db.c:285
+#, fuzzy, c-format
+msgid "could not remove database entry %s%s\n"
msgstr "не могу удалить из базы данных запись %s%s"
-#: lib/libalpm/db.c:432 lib/libalpm/sync.c:128
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
-msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)"
-
-#: lib/libalpm/db.c:553 lib/libalpm/db.c:560
-#, c-format
-msgid "malloc failed: could not allocate %d bytes"
-msgstr ""
-
-#: lib/libalpm/db.c:661
-msgid "attempt to re-register the 'local' DB"
+#: lib/libalpm/db.c:553
+msgid "attempt to re-register the 'local' DB\n"
msgstr ""
-#: lib/libalpm/db.c:680
+#: lib/libalpm/db.c:562 lib/libalpm/db.c:613
#, fuzzy
-msgid "database path is undefined"
+msgid "database path is undefined\n"
msgstr "база данных не инициализирована"
-#: lib/libalpm/deps.c:187
+#: lib/libalpm/deps.c:173
#, fuzzy
-msgid "dependency cycle detected\n"
+msgid "dependency cycle detected:\n"
msgstr "обнаружена циклическая зависимость: %s"
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:175
#, c-format
-msgid ""
-"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid "%s will be removed after its %s dependency\n"
msgstr ""
-#: lib/libalpm/deps.c:687
+#: lib/libalpm/deps.c:177
#, c-format
-msgid "cannot resolve dependencies for \"%s\""
+msgid "%s will be installed before its %s dependency\n"
+msgstr ""
+
+#: lib/libalpm/deps.c:573
+#, fuzzy, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
msgstr "не удается удовлетворить зависимости для \"%s\""
-#: lib/libalpm/error.c:38
+#: lib/libalpm/error.c:43
msgid "out of memory!"
msgstr ""
-#: lib/libalpm/error.c:40
+#: lib/libalpm/error.c:45
msgid "unexpected system error"
msgstr ""
-#: lib/libalpm/error.c:42
+#: lib/libalpm/error.c:47
msgid "insufficient privileges"
msgstr ""
-#: lib/libalpm/error.c:44
+#: lib/libalpm/error.c:49
msgid "could not find or read file"
msgstr ""
-#: lib/libalpm/error.c:46
+#: lib/libalpm/error.c:51
+#, fuzzy
+msgid "could not find or read directory"
+msgstr "не удается найти или прочитать пакет"
+
+#: lib/libalpm/error.c:53
msgid "wrong or NULL argument passed"
msgstr ""
-#: lib/libalpm/error.c:49
+#: lib/libalpm/error.c:56
msgid "library not initialized"
msgstr ""
-#: lib/libalpm/error.c:51
+#: lib/libalpm/error.c:58
msgid "library already initialized"
msgstr ""
-#: lib/libalpm/error.c:53
+#: lib/libalpm/error.c:60
msgid "unable to lock database"
msgstr "не удается заблокировать базу данных"
-#: lib/libalpm/error.c:56
+#: lib/libalpm/error.c:63
msgid "could not open database"
msgstr "не удается открыть базу данных"
-#: lib/libalpm/error.c:58
+#: lib/libalpm/error.c:65
msgid "could not create database"
msgstr "не удается создать базу данных"
-#: lib/libalpm/error.c:60
+#: lib/libalpm/error.c:67
msgid "database not initialized"
msgstr "база данных не инициализирована"
-#: lib/libalpm/error.c:62
+#: lib/libalpm/error.c:69
msgid "database already registered"
msgstr "база данных уже зарегистрирована"
-#: lib/libalpm/error.c:64
+#: lib/libalpm/error.c:71
msgid "could not find database"
msgstr "не удается найти базу данных"
-#: lib/libalpm/error.c:66
+#: lib/libalpm/error.c:73
msgid "could not update database"
msgstr "не удается обновить базу данных"
-#: lib/libalpm/error.c:68
+#: lib/libalpm/error.c:75
msgid "could not remove database entry"
msgstr "не удается удалить запись в базе данных"
-#: lib/libalpm/error.c:71
+#: lib/libalpm/error.c:78
msgid "invalid url for server"
msgstr "неверный url"
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:85
msgid "could not set parameter"
msgstr "ну могу установить параметр"
-#: lib/libalpm/error.c:81
+#: lib/libalpm/error.c:88
msgid "transaction already initialized"
msgstr ""
-#: lib/libalpm/error.c:83 lib/libalpm/error.c:87
+#: lib/libalpm/error.c:90 lib/libalpm/error.c:94
msgid "transaction not initialized"
msgstr ""
-#: lib/libalpm/error.c:85
+#: lib/libalpm/error.c:92
msgid "duplicate target"
msgstr ""
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:96
msgid "transaction not prepared"
msgstr ""
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
msgid "transaction aborted"
msgstr ""
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
msgid "operation not compatible with the transaction type"
msgstr ""
-#: lib/libalpm/error.c:95 lib/libalpm/sync.c:985
+#: lib/libalpm/error.c:102
msgid "could not commit transaction"
msgstr ""
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
msgid "could not download all files"
msgstr "не могу загрузить все файлы"
-#: lib/libalpm/error.c:100
+#: lib/libalpm/error.c:107
msgid "could not find or read package"
msgstr "не удается найти или прочитать пакет"
-#: lib/libalpm/error.c:102
+#: lib/libalpm/error.c:109
msgid "invalid or corrupted package"
msgstr "пакет неправильный или поврежден"
-#: lib/libalpm/error.c:104
+#: lib/libalpm/error.c:111
msgid "cannot open package file"
msgstr "не удается открыть файл пакета"
-#: lib/libalpm/error.c:106
+#: lib/libalpm/error.c:113
msgid "cannot load package data"
msgstr "не удается загрузить данные пакета"
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:115
msgid "package already installed"
msgstr "пакет уже установлен"
-#: lib/libalpm/error.c:110
+#: lib/libalpm/error.c:117
msgid "package not installed or lesser version"
msgstr ""
-#: lib/libalpm/error.c:112
+#: lib/libalpm/error.c:119
msgid "cannot remove all files for package"
msgstr "не могу удалить все файлы пакета"
-#: lib/libalpm/error.c:114
+#: lib/libalpm/error.c:121
msgid "package name is not valid"
msgstr "неверное имя пакета"
-#: lib/libalpm/error.c:116
+#: lib/libalpm/error.c:123
msgid "corrupted package"
msgstr "пакет поврежден"
-#: lib/libalpm/error.c:118
+#: lib/libalpm/error.c:125
msgid "no such repository"
msgstr "нет такого репозитория"
-#: lib/libalpm/error.c:121
+#: lib/libalpm/error.c:128
+#, fuzzy
+msgid "corrupted delta"
+msgstr "пакет поврежден"
+
+#: lib/libalpm/error.c:130
+msgid "delta patch failed"
+msgstr ""
+
+#: lib/libalpm/error.c:133
msgid "group not found"
msgstr "группа не найдена"
-#: lib/libalpm/error.c:124
+#: lib/libalpm/error.c:136
msgid "could not satisfy dependencies"
msgstr "не удается удовлетворить зависимости"
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:138
msgid "conflicting dependencies"
msgstr ""
-#: lib/libalpm/error.c:128
+#: lib/libalpm/error.c:140
msgid "conflicting files"
msgstr ""
-#: lib/libalpm/error.c:131
+#: lib/libalpm/error.c:143
msgid "user aborted the operation"
msgstr "пользователь прервал операцию"
-#: lib/libalpm/error.c:133
+#: lib/libalpm/error.c:145
msgid "internal error"
msgstr "внутренняя ошибка"
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:147
msgid "libarchive error"
msgstr "ошибка в libarchive"
-#: lib/libalpm/error.c:138
+#: lib/libalpm/error.c:150
msgid "not confirmed"
msgstr ""
-#: lib/libalpm/error.c:140
+#: lib/libalpm/error.c:152
msgid "invalid regular expression"
msgstr "неверное регулярное выражение"
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:155
msgid "connection to remote host failed"
msgstr "не удалось подключиться к удаленному хосту"
-#: lib/libalpm/error.c:146
+#: lib/libalpm/error.c:158
msgid "unexpected error"
msgstr "непредвиденная ошибка"
-#: lib/libalpm/handle.c:140
-#, c-format
-msgid "cannot canonicalize specified root path '%s'"
-msgstr ""
-
-#: lib/libalpm/md5driver.c:69
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr ""
-
-#: lib/libalpm/package.c:129
-#, c-format
-msgid "could not get sha1sum for package %s-%s"
-msgstr "не могу получить контрольную сумму sha1sum для пакета %s-%s"
-
-#: lib/libalpm/package.c:138
-#, c-format
-msgid "sha1sums do not match for package %s-%s"
-msgstr "контрольные суммы sha1sum для пакета %s-%s не совпали"
-
-#: lib/libalpm/package.c:180
-#, c-format
-msgid "could not get md5sum for package %s-%s"
+#: lib/libalpm/package.c:124
+#, fuzzy, c-format
+msgid "could not get md5sum for package %s-%s\n"
msgstr "не могу получить контрольную сумму md5sum для пакета %s-%s"
-#: lib/libalpm/package.c:189
-#, c-format
-msgid "md5sums do not match for package %s-%s"
+#: lib/libalpm/package.c:133
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s\n"
msgstr "контрольные суммы md5sum для пакета %s-%s не совпали"
-#: lib/libalpm/package.c:360
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr ""
-
-#: lib/libalpm/package.c:369
-#, c-format
-msgid "%s: forcing upgrade to version %s"
+#: lib/libalpm/package.c:737
+#, fuzzy, c-format
+msgid "%s: forcing upgrade to version %s\n"
msgstr "%s: принудительно обновляю до версии %s"
-#: lib/libalpm/package.c:374
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
+#: lib/libalpm/package.c:742
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
msgstr "%s: установленная версия (%s) новее, чем в %s (%s)"
-#: lib/libalpm/package.c:382
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
-msgstr ""
+#: lib/libalpm/package.c:750
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)\n"
+msgstr "%s: принудительно обновляю до версии %s"
-#: lib/libalpm/package.c:564
-msgid "could not parse the package description file"
-msgstr ""
+#: lib/libalpm/package.c:931
+#, fuzzy, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "не могу удалить временный файл %s"
-#: lib/libalpm/package.c:568
-#, c-format
-msgid "missing package name in %s"
-msgstr ""
+#: lib/libalpm/package.c:936
+#, fuzzy, c-format
+msgid "missing package name in %s\n"
+msgstr "отсутствует список файлов пакета в %s, генерирую его"
-#: lib/libalpm/package.c:572
-#, c-format
-msgid "missing package version in %s"
-msgstr ""
+#: lib/libalpm/package.c:940
+#, fuzzy, c-format
+msgid "missing package version in %s\n"
+msgstr "отсутствует список файлов пакета в %s, генерирую его"
-#: lib/libalpm/package.c:607
-#, c-format
-msgid "could not remove tempfile %s"
+#: lib/libalpm/package.c:970
+#, fuzzy, c-format
+msgid "could not remove tempfile %s\n"
msgstr "не могу удалить временный файл %s"
-#: lib/libalpm/package.c:623 lib/libalpm/package.c:630
-#, c-format
-msgid "error while reading package: %s"
+#: lib/libalpm/package.c:985 lib/libalpm/package.c:998
+#, fuzzy, c-format
+msgid "error while reading package %s: %s\n"
msgstr "ошибка при чтении пакета: %s"
-#: lib/libalpm/package.c:636
-msgid "missing package metadata"
-msgstr ""
+#: lib/libalpm/package.c:1005
+#, fuzzy, c-format
+msgid "missing package metadata in %s\n"
+msgstr "отсутствует список файлов пакета в %s, генерирую его"
-#: lib/libalpm/package.c:643
-#, c-format
-msgid "missing package filelist in %s, generating one"
+#: lib/libalpm/package.c:1012
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one\n"
msgstr "отсутствует список файлов пакета в %s, генерирую его"
-#: lib/libalpm/remove.c:117
-#, c-format
-msgid "could not find %s in database -- skipping"
+#: lib/libalpm/remove.c:121
+#, fuzzy, c-format
+msgid "could not find %s in database -- skipping\n"
msgstr "не могу найти %s в базе данных -- пропускаю"
-#: lib/libalpm/remove.c:168
-#, c-format
-msgid "cannot remove file '%s': %s"
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243
+#, fuzzy, c-format
+msgid "cannot remove file '%s': %s\n"
msgstr "не могу удалить файл '%s': %s"
-#: lib/libalpm/remove.c:255
-#, c-format
-msgid "cannot remove file %s: %s"
-msgstr "не могу удалить файл %s: %s"
+#: lib/libalpm/remove.c:337
+#, fuzzy, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "не могу удалить из базы данных запись %s%s"
-#: lib/libalpm/remove.c:338
+#: lib/libalpm/remove.c:342
+#, fuzzy, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "не могу добавить запись '%s' в кэш"
+
+#: lib/libalpm/server.c:56
#, c-format
-msgid "could not remove database entry %s-%s"
+msgid "url '%s' is invalid, ignoring\n"
msgstr ""
-#: lib/libalpm/remove.c:343
-#, c-format
-msgid "could not remove entry '%s' from cache"
+#: lib/libalpm/server.c:60
+msgid "url scheme not specified, assuming http\n"
msgstr ""
-#: lib/libalpm/sha1.c:409
-#, c-format
-msgid "sha1: %s can't be opened\n"
+#: lib/libalpm/server.c:241
+msgid "disk"
msgstr ""
-#: lib/libalpm/sync.c:294
-#, c-format
-msgid "repository '%s' not found"
+#: lib/libalpm/server.c:245
+#, fuzzy, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "не удалось получить некоторые файлы с %s\n"
+
+#: lib/libalpm/server.c:275
+msgid "cannot resume download, starting over\n"
+msgstr ""
+
+#: lib/libalpm/server.c:288
+#, fuzzy, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "не могу удалить файл '%s': %s"
+
+#: lib/libalpm/server.c:307
+#, fuzzy, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "ошибка при чтении пакета: %s"
+
+#: lib/libalpm/server.c:319
+#, fuzzy, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "не могу удалить файл '%s': %s"
+
+#: lib/libalpm/server.c:387
+#, fuzzy, c-format
+msgid "could not chdir to %s\n"
+msgstr "не могу извлечь %s (%s)"
+
+#: lib/libalpm/server.c:394
+msgid "running XferCommand: fork failed!\n"
+msgstr ""
+
+#: lib/libalpm/server.c:445
+msgid "URL does not contain a file for download\n"
+msgstr ""
+
+#: lib/libalpm/server.c:458
+#, fuzzy, c-format
+msgid "failed to download %s\n"
+msgstr "не могу загрузить все файлы"
+
+#: lib/libalpm/sync.c:135
+#, fuzzy, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)"
+
+#: lib/libalpm/sync.c:250
+#, fuzzy, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)"
+
+#: lib/libalpm/sync.c:320
+#, fuzzy, c-format
+msgid "repository '%s' not found\n"
msgstr "репозиторий '%s' не найден"
-#: lib/libalpm/sync.c:335
-#, c-format
-msgid "%s-%s is up to date -- skipping"
+#: lib/libalpm/sync.c:354
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- skipping\n"
msgstr "%s-%s не устарел -- пропускаю"
-#: lib/libalpm/sync.c:608 lib/libalpm/sync.c:624
-msgid "unresolvable package conflicts detected"
-msgstr "обнаружен неразрешимый конфликт пакетов"
-
-#: lib/libalpm/sync.c:778
-#, c-format
-msgid "no %s cache exists, creating...\n"
-msgstr "кэш %s не существует, создаю...\n"
+#: lib/libalpm/sync.c:358
+#, fuzzy, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s не устарел -- пропускаю"
-#: lib/libalpm/sync.c:804
+#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618
#, fuzzy
-msgid "couldn't create package cache, using /tmp instead"
-msgstr "не могу создать кэш пакета, будет использован /tmp\n"
+msgid "unresolvable package conflicts detected\n"
+msgstr "обнаружен неразрешимый конфликт пакетов"
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:628
#, c-format
-msgid "failed to retrieve some files from %s\n"
-msgstr "не удалось получить некоторые файлы с %s\n"
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr ""
-#: lib/libalpm/sync.c:839 lib/libalpm/sync.c:861
+#: lib/libalpm/sync.c:825
#, c-format
-msgid "can't get md5 or sha1 checksum for package %s\n"
+msgid "command: %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896
+#, fuzzy, c-format
+msgid "can't get md5 checksum for file %s\n"
msgstr "не удалось получить md5 или sha1 контрольную сумму для пакета %s\n"
-#: lib/libalpm/sync.c:878
-#, c-format
-msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
+#: lib/libalpm/sync.c:910
+#, fuzzy, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
msgstr "архив %s был поврежден (не сходится MD5 или SHA1 контрольная сумма)\n"
-#: lib/libalpm/sync.c:880
+#: lib/libalpm/sync.c:1056
#, c-format
-msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
-msgstr "архив %s поврежден (не сходится MD5 или SHA1 контрольная сумма)\n"
-
-#: lib/libalpm/sync.c:901
-msgid "could not create removal transaction"
-msgstr ""
+msgid "failed to retrieve some files from %s\n"
+msgstr "не удалось получить некоторые файлы с %s\n"
-#: lib/libalpm/sync.c:907
-msgid "could not initialize the removal transaction"
-msgstr ""
+#: lib/libalpm/sync.c:1137
+#, fuzzy
+msgid "could not create removal transaction\n"
+msgstr "не удается создать базу данных"
-#: lib/libalpm/sync.c:929
-msgid "could not prepare removal transaction"
+#: lib/libalpm/sync.c:1143
+msgid "could not initialize the removal transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:935
-msgid "could not commit removal transaction"
-msgstr ""
+#: lib/libalpm/sync.c:1165
+#, fuzzy
+msgid "could not prepare removal transaction\n"
+msgstr "не удается создать базу данных"
-#: lib/libalpm/sync.c:946
-msgid "could not create transaction"
+#: lib/libalpm/sync.c:1171
+msgid "could not commit removal transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:951
-msgid "could not initialize transaction"
-msgstr ""
+#: lib/libalpm/sync.c:1182
+#, fuzzy
+msgid "could not create transaction\n"
+msgstr "не удается создать базу данных"
-#: lib/libalpm/sync.c:980
-msgid "could not prepare transaction"
+#: lib/libalpm/sync.c:1187
+msgid "could not initialize transaction\n"
msgstr ""
-#: lib/libalpm/sync.c:1022
-#, c-format
-msgid "could not update requiredby for database entry %s-%s"
-msgstr ""
+#: lib/libalpm/sync.c:1214
+#, fuzzy
+msgid "could not prepare transaction\n"
+msgstr "не удается создать базу данных"
-#: lib/libalpm/sync.c:1031
-#, c-format
-msgid "could not update new database entry %s-%s"
+#: lib/libalpm/sync.c:1219
+msgid "could not commit transaction\n"
msgstr ""
-#: lib/libalpm/trans.c:205
-#, c-format
-msgid "could not remove lock file %s"
+#: lib/libalpm/trans.c:214
+#, fuzzy, c-format
+msgid "could not remove lock file %s\n"
msgstr "не могу удалить lock-файл %s"
-#: lib/libalpm/trans.c:498 lib/libalpm/trans.c:528
+#: lib/libalpm/trans.c:483
#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
+msgid "No /bin/sh in root dir (%s), aborting scriptlet\n"
msgstr ""
-#: lib/libalpm/trans.c:589
-msgid "could not create temp directory"
-msgstr ""
+#: lib/libalpm/trans.c:494
+#, fuzzy
+msgid "could not create temp directory\n"
+msgstr "не могу определить текущую рабочую директорию"
+
+#: lib/libalpm/trans.c:536
+#, fuzzy, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "не могу извлечь %s (%s)"
+
+#: lib/libalpm/trans.c:554
+#, fuzzy, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "не могу переименовать %s (%s)"
+
+#: lib/libalpm/trans.c:564
+#, fuzzy, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "не могу определить текущую рабочую директорию"
+
+#: lib/libalpm/trans.c:569
+#, fuzzy, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "не могу извлечь %s (%s)"
-#: lib/libalpm/trans.c:616
+#: lib/libalpm/trans.c:578
#, c-format
-msgid "could not change directory to %s (%s)"
+msgid "call to popen failed (%s)"
msgstr ""
-#: lib/libalpm/trans.c:633
+#: lib/libalpm/trans.c:597
#, c-format
-msgid "could not fork a new process (%s)"
+msgid "call to waitpid failed (%s)\n"
msgstr ""
-#: lib/libalpm/trans.c:641
-#, c-format
-msgid "could not change the root directory (%s)"
+#: lib/libalpm/trans.c:606
+msgid "scriptlet failed to execute correctly\n"
msgstr ""
-#: lib/libalpm/trans.c:645
+#: lib/libalpm/trans.c:615
+#, fuzzy, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "не могу удалить временный файл %s"
+
+#: lib/libalpm/util.c:204
#, c-format
-msgid "could not change directory to / (%s)"
+msgid "failed to make path '%s' : %s\n"
msgstr ""
-#: lib/libalpm/trans.c:654
+#: lib/libalpm/util.c:389
#, c-format
-msgid "call to waitpid failed (%s)"
+msgid "could not open %s: %s\n"
msgstr ""
-#: lib/libalpm/trans.c:663
+#: lib/libalpm/util.c:573
#, c-format
-msgid "could not remove tmpdir %s"
-msgstr ""
+msgid "no %s cache exists, creating...\n"
+msgstr "кэш %s не существует, создаю...\n"
-#: lib/libalpm/util.c:127
+#: lib/libalpm/util.c:593
+#, fuzzy
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "не могу создать кэш пакета, будет использован /tmp\n"
+
+#: lib/libalpm/util.c:643
#, c-format
-msgid "failed to make path '%s' : %s"
+msgid "md5: %s can't be opened\n"
msgstr ""
-#: lib/libalpm/util.c:325
+#: lib/libalpm/util.c:645
#, c-format
-msgid "could not open %s: %s\n"
+msgid "md5: %s can't be read\n"
msgstr ""
-#: lib/libalpm/util.c:346
-#, fuzzy, c-format
-msgid "could not extract %s (%s)\n"
-msgstr "не могу извлечь %s (%s)"
+#~ msgid "please remove '%s' first, using -Rd"
+#~ msgstr "пожалуйста, уделите сначала '%s' используя -Rd"
+
+#~ msgid "could not extract %s (%s)"
+#~ msgstr "не могу извлечь %s (%s)"
+
+#~ msgid "could not update provision '%s' from '%s'"
+#~ msgstr "не могу обновить '%s' из '%s'"
+
+#~ msgid "could not get sha1sum for package %s-%s"
+#~ msgstr "не могу получить контрольную сумму sha1sum для пакета %s-%s"
+
+#~ msgid "sha1sums do not match for package %s-%s"
+#~ msgstr "контрольные суммы sha1sum для пакета %s-%s не совпали"
+
+#~ msgid "cannot remove file %s: %s"
+#~ msgstr "не могу удалить файл %s: %s"
+#~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+#~ msgstr "архив %s поврежден (не сходится MD5 или SHA1 контрольная сумма)\n"