* Update of all the *.po files and *.pot template files.

* Makefile targets to rebuild po files now work - use 'make update-po' in
  the po directories.
* Added two new translation templates as requested on the ML- 'it' and
  'pt_BR'.

This commit might be a bit big for the mailing list to like on the commit
message. :)

14 files changed, 4429 insertions, 3968 deletions

diff --git a/lib/libalpm/po/LINGUAS b/lib/libalpm/po/LINGUAS
index cc891622..0f3f0ccb 100644
--- a/lib/libalpm/po/LINGUAS
+++ b/lib/libalpm/po/LINGUAS
@@ -1,8 +1,6 @@
-# Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
-# This file is in the public domain.
-#
 # Set of available languages.
 de
 fr
 hu
+it
+pt_BR
diff --git a/lib/libalpm/po/Makevars b/lib/libalpm/po/Makevars
index 8499e269..1b1b8279 100644
--- a/lib/libalpm/po/Makevars
+++ b/lib/libalpm/po/Makevars
@@ -14,29 +14,12 @@ XGETTEXT_OPTIONS = \
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Yoyodyne, Inc.
+# package.
+COPYRIGHT_HOLDER = Judd Vinet <jvinet@zeroflux.org>
 
 # This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
+# bugs in the untranslated strings.
+MSGID_BUGS_ADDRESS = pacman-dev@archlinux.org
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
diff --git a/lib/libalpm/po/POTFILES.in b/lib/libalpm/po/POTFILES.in
index b1a8aab2..e668f661 100644
--- a/lib/libalpm/po/POTFILES.in
+++ b/lib/libalpm/po/POTFILES.in
@@ -1,23 +1,25 @@
-add.c
-alpm.c
-alpm_list.c
-backup.c
-be_files.c
-cache.c
-conflict.c
-db.c
-deps.c
-error.c
-group.c
-handle.c
-log.c
-md5.c
-md5driver.c
-package.c
-provide.c
-remove.c
-sha1.c
-sync.c
-trans.c
-util.c
-versioncmp.c
+# List of source files with translatable strings
+
+lib/libalpm/add.c
+lib/libalpm/alpm.c
+lib/libalpm/alpm_list.c
+lib/libalpm/backup.c
+lib/libalpm/be_files.c
+lib/libalpm/cache.c
+lib/libalpm/conflict.c
+lib/libalpm/db.c
+lib/libalpm/deps.c
+lib/libalpm/error.c
+lib/libalpm/group.c
+lib/libalpm/handle.c
+lib/libalpm/log.c
+lib/libalpm/md5.c
+lib/libalpm/md5driver.c
+lib/libalpm/package.c
+lib/libalpm/provide.c
+lib/libalpm/remove.c
+lib/libalpm/sha1.c
+lib/libalpm/sync.c
+lib/libalpm/trans.c
+lib/libalpm/util.c
+lib/libalpm/versioncmp.c
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 8d3cb4c5..14459b59 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -1,614 +1,722 @@
-# German translations for libalpm package.
-# Copyright (C) 2006 THE libalpm'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the libalpm package.
+# German translations for Pacman package manager package.
+# Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
 # Marcus Habermehl <bmh1980@frugalware.org>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libalpm\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 13:36+0200\n"
+"Project-Id-Version: Pacman package manager 3.0.0\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2007-02-06 20:43-0500\n"
 "PO-Revision-Date: 2006-05-06 14:31+0200\n"
 "Last-Translator: Marcus Habermehl <bmh1980@frugalware.org>\n"
-"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../add.c:95
+#: lib/libalpm/add.c:95
 #, c-format
 msgid "could not parse token %s"
 msgstr ""
 
-#: ../add.c:127
+#: lib/libalpm/add.c:129
 #, c-format
 msgid "loading target '%s'"
 msgstr "Lade Paket '%s'"
 
-#: ../add.c:169
+#: lib/libalpm/add.c:175
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr "Ersetze ältere Version %s-%s durch %s in der Paketliste"
 
-#: ../add.c:178
+#: lib/libalpm/add.c:184
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr "Neuere Version %s-%s ist in der Paketliste -- Ãœberspringe"
 
-#: ../add.c:185
+#: lib/libalpm/add.c:191
 #, c-format
 msgid "reading '%s' metadata"
 msgstr "Lese Metadaten von '%s'"
 
-#. look for unsatisfied dependencies
-#: ../add.c:227 ../remove.c:104
+#: lib/libalpm/add.c:244 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr "Suche nach ungelösten Abhängigkeiten"
 
-#. no unsatisfied deps, so look for conflicts
-#: ../add.c:239 ../sync.c:504
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
 msgid "looking for conflicts"
 msgstr "Suche nach Konflikten"
 
-#. re-order w.r.t. dependencies
-#: ../add.c:251 ../remove.c:140
+#: lib/libalpm/add.c:295 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr "Sortiere nach Abhängigkeiten"
 
-#: ../add.c:263
+#: lib/libalpm/add.c:307
 msgid "cleaning up"
 msgstr "Räume auf"
 
-#: ../add.c:280
+#: lib/libalpm/add.c:324
 msgid "looking for file conflicts"
 msgstr "Suche nach Dateikonflikten"
 
-#: ../add.c:345
+#: lib/libalpm/add.c:391
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr "Aktualisiere Paket %s-%s"
 
-#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304
+#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
 #, c-format
 msgid "loading FILES info for '%s'"
 msgstr "Lade FILES Informationen für '%s'"
 
-#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726
-#, c-format
-msgid "loading DESC info for '%s'"
-msgstr "Lade DESC Informationen für '%s'"
-
-#: ../add.c:378
+#: lib/libalpm/add.c:423
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr "Entferne zuerst altes Paket (%s-%s)"
 
-#: ../add.c:408
+#: lib/libalpm/add.c:453
 #, c-format
 msgid "adding package %s-%s"
 msgstr "Füge Paket %s-%s hinzu"
 
-#: ../add.c:419
+#: lib/libalpm/add.c:464
 #, c-format
 msgid "adding new package %s-%s"
 msgstr "Füge neues Paket %s-%s hinzu"
 
-#: ../add.c:423
+#: lib/libalpm/add.c:468
 msgid "extracting files"
 msgstr "Entpacke Dateien"
 
-#: ../add.c:438 ../util.c:456
+#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
 msgid "could not get current working directory"
 msgstr "Kann aktuelles Arbeitsverzeichnis nicht ermitteln"
 
-#: ../add.c:492
+#: lib/libalpm/add.c:529
 #, c-format
 msgid "notice: %s is in NoExtract -- skipping extraction"
 msgstr "Hinweis: %s ist in NoExtract -- Wird nicht entpackt"
 
-#: ../add.c:528 ../add.c:681
+#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr "Kann %s nicht entpacken (%s)"
 
-#: ../add.c:571
+#: lib/libalpm/add.c:608
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr "Prüfe MD5 Hashes für %s"
 
-#: ../add.c:572 ../add.c:579
+#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
 #, c-format
 msgid "current:  %s"
 msgstr "Aktuell:  %s"
 
-#: ../add.c:573 ../add.c:580
+#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
 #, c-format
 msgid "new:      %s"
 msgstr "Neu:      %s"
 
-#: ../add.c:575 ../add.c:582
+#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
 #, c-format
 msgid "original: %s"
 msgstr "Original: %s"
 
-#: ../add.c:578
+#: lib/libalpm/add.c:615
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr "Prüfe SHA1 Hashes für %s"
 
-#: ../add.c:596
+#: lib/libalpm/add.c:633
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr "Konnte %s nicht umbenennen (%s)"
 
-#: ../add.c:597
+#: lib/libalpm/add.c:634
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr "Fehler: Konnte %s nicht umbenennen (%s)"
 
-#: ../add.c:601 ../add.c:645
+#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
 #, c-format
 msgid "could not copy %s to %s (%s)"
 msgstr "Konnte %s nicht nach %s kopieren (%s)"
 
-#: ../add.c:602
+#: lib/libalpm/add.c:639
 #, c-format
 msgid "error: could not copy %s to %s (%s)"
 msgstr "Fehler: Konnte %s nicht nach %s kopieren (%s)"
 
-#: ../add.c:606
+#: lib/libalpm/add.c:643
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr "%s gesichert als %s.pacorig"
 
-#: ../add.c:607
+#: lib/libalpm/add.c:644
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "Warnung: %s gesichert als %s"
 
-#: ../add.c:617 ../add.c:620 ../add.c:626
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
 msgid "action: installing new file"
 msgstr "Aktion: Installiere neue Datei"
 
-#: ../add.c:624
+#: lib/libalpm/add.c:661
 msgid "action: leaving existing file in place"
 msgstr "Aktion: Lasse existierende Datei an ihrem Platz"
 
-#: ../add.c:630
+#: lib/libalpm/add.c:667
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 "Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew"
 
-#: ../add.c:634
+#: lib/libalpm/add.c:671
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr "Konnte %s nicht als %s installieren: %s"
 
-#: ../add.c:635
+#: lib/libalpm/add.c:672
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr "Fehler: Konnte %s nicht als %s installieren: %s"
 
-#: ../add.c:637
+#: lib/libalpm/add.c:674
 #, c-format
 msgid "%s installed as %s"
 msgstr "%s installiert als %s"
 
-#: ../add.c:638
+#: lib/libalpm/add.c:675
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr "Warnung: %s installiert als %s"
 
-#: ../add.c:643 ../add.c:663
+#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
 #, c-format
 msgid "extracting %s"
 msgstr "Entpacke %s"
 
-#: ../add.c:665
+#: lib/libalpm/add.c:702
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr "%s ist in NoUpgrade -- Ãœberspringe"
 
-#: ../add.c:667
+#: lib/libalpm/add.c:704
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr "Entpacke %s als %s.pacnew"
 
-#: ../add.c:668
+#: lib/libalpm/add.c:705
 #, c-format
 msgid "warning: extracting %s%s as %s"
 msgstr "Warnung: Entpacke %s%s als %s"
 
-#: ../add.c:682
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr "Fehler: Konnte %s nicht entpacken (%s)"
 
-#: ../add.c:693
+#: lib/libalpm/add.c:729
 msgid "appending backup entry"
 msgstr "Hänge Sicherungseintrag an"
 
-#: ../add.c:725 ../add.c:727
+#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "Fehler traten auf, während %s %s"
 
-#: ../add.c:726 ../add.c:728
+#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
 msgid "upgrading"
 msgstr "der Aktualisierung von"
 
-#: ../add.c:726 ../add.c:728
+#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
 msgid "installing"
 msgstr "der Installation von"
 
-#: ../add.c:749 ../add.c:800
+#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr "Füge '%s' zum requiredby Feld für '%s' hinzu"
 
-#. remove the package from the database
-#: ../add.c:760 ../remove.c:284
+#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
 msgid "updating database"
 msgstr "Aktualisiere Datenbank"
 
-#: ../add.c:761
+#: lib/libalpm/add.c:796
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "Füge Datenbankeintrag '%s' hinzu"
 
-#: ../add.c:763
+#: lib/libalpm/add.c:798
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren"
 
-#: ../add.c:765
+#: lib/libalpm/add.c:800
 #, c-format
 msgid "error updating database for %s-%s!"
 msgstr "Fehler beim aktualisieren der Datenbank für %s-%s!"
 
-#: ../add.c:769
+#: lib/libalpm/add.c:804
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "Konnte Eintrag '%s' nicht zum Cache hinzufügen"
 
-#. update dependency packages' REQUIREDBY fields
-#: ../add.c:774 ../remove.c:294
+#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
 msgid "updating dependency packages 'requiredby' fields"
 msgstr "Aktualisiere 'requiredby' Felder abhängiger Pakete"
 
-#: ../add.c:795 ../remove.c:322
+#: lib/libalpm/add.c:832
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr "Konnte Abhängigkeit '%s' nicht finden"
 
-#: ../add.c:803 ../remove.c:332
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr "Konnte 'requiredby' Eintrag %s-%s nicht aktualisieren"
 
-#: ../add.c:830 ../remove.c:345
+#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "Führe \"ldconfig -r %s\" aus"
 
-#: ../alpm.c:201
-#, c-format
-msgid "registering database '%s'"
-msgstr "Registriere Datenbank '%s'"
-
-#: ../alpm.c:206
+#: lib/libalpm/alpm.c:113
 #, c-format
-msgid "database directory '%s' does not exist -- try creating it"
+msgid "removing DB %s, %d remaining..."
 msgstr ""
-"Datenbankverzeichnis '%s' ist nicht vorhanden - Versuche es zu erstellen"
 
-#: ../alpm.c:217
-#, c-format
-msgid "opening database '%s'"
-msgstr "Öffne Datenbank '%s'"
-
-#: ../alpm.c:261
+#: lib/libalpm/alpm.c:178
 #, c-format
 msgid "unregistering database '%s'"
 msgstr ""
 
-#: ../alpm.c:266
+#: lib/libalpm/alpm.c:183
 #, c-format
 msgid "closing database '%s'"
 msgstr "Schließe Datenbank '%s'"
 
-#: ../alpm.c:344
+#: lib/libalpm/alpm.c:229
 #, c-format
 msgid ""
 "adding new server to database '%s': protocol '%s', server '%s', path '%s'"
 msgstr ""
 
-#: ../alpm.c:348
+#: lib/libalpm/alpm.c:233
 #, c-format
 msgid "serverlist flushed for '%s'"
 msgstr ""
 
-#: ../alpm.c:383
+#: lib/libalpm/alpm.c:276
+#, c-format
+msgid "failed to get lastupdate time for %s (no big deal)"
+msgstr ""
+
+#: lib/libalpm/alpm.c:295
 #, c-format
-msgid "failed to get lastupdate time for %s (no big deal)\n"
+msgid "failed to sync db: %s [%d]"
 msgstr ""
 
-#: ../alpm.c:402
+#: lib/libalpm/alpm.c:299
 #, c-format
-msgid "sync: new mtime for %s: %s\n"
+msgid "sync: new mtime for %s: %s"
 msgstr ""
 
-#. remove the old dir
-#: ../alpm.c:408
+#: lib/libalpm/alpm.c:305
 #, c-format
 msgid "flushing database %s/%s"
 msgstr ""
 
-#: ../alpm.c:412
+#: lib/libalpm/alpm.c:309
 #, c-format
 msgid "could not remove database entry %s/%s"
 msgstr "Konnte Datenbankeintrag %s/%s nicht entfernen"
 
-#. uncompress the sync database
-#. ORE
-#. we should not simply unpack the archive, but better parse it and
-#. db_write each entry (see sync_load_dbarchive to get archive content)
-#: ../alpm.c:426
-#, c-format
-msgid "unpacking %s"
-msgstr "Entpacke %s"
-
-#: ../alpm.c:574
-#, c-format
-msgid "loading SCRIPLET info for '%s'"
-msgstr "Lade SCRIPTLET Informationen für '%s'"
+#: lib/libalpm/alpm.c:479
+#, fuzzy, c-format
+msgid "could not get sha1 checksum for package %s-%s"
+msgstr "Konnte SHA1 Prüfsumme für Paket %s-%s nicht ermitteln\n"
 
-#: ../alpm.c:673
+#: lib/libalpm/alpm.c:485 lib/libalpm/alpm.c:534
 #, c-format
-msgid "could not get sha1 checksum for package %s-%s\n"
-msgstr "Konnte SHA1 Prüfsumme für Paket %s-%s nicht ermitteln\n"
+msgid "loading DESC info for '%s'"
+msgstr "Lade DESC Informationen für '%s'"
 
-#: ../alpm.c:684 ../alpm.c:731
+#: lib/libalpm/alpm.c:490 lib/libalpm/alpm.c:539
 #, c-format
 msgid "checksums for package %s-%s are matching"
 msgstr "Prüfsummen für Paket %s-%s stimmen überein"
 
-#: ../alpm.c:687
-#, c-format
-msgid "sha1sums do not match for package %s-%s\n"
+#: lib/libalpm/alpm.c:493
+#, fuzzy, c-format
+msgid "sha1sums do not match for package %s-%s"
 msgstr "SHA1 Summen für Paket %s-%s stimmen nicht überein\n"
 
-#: ../alpm.c:720
-#, c-format
-msgid "could not get md5 checksum for package %s-%s\n"
+#: lib/libalpm/alpm.c:528
+#, fuzzy, c-format
+msgid "could not get md5 checksum for package %s-%s"
 msgstr "Konnte MD5 Prüfsumme für Paket %s-%s nicht ermitteln\n"
 
-#: ../alpm.c:734
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
+#: lib/libalpm/alpm.c:542
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s"
 msgstr "MD5 Summen für Paket %s-%s stimmen nicht überein\n"
 
-#: ../alpm.c:993
+#: lib/libalpm/alpm.c:791
 #, c-format
 msgid "could not remove lock file %s"
 msgstr "Konnte Sperrdatei %s nicht entfernen"
 
-#: ../alpm.c:994
+#: lib/libalpm/alpm.c:792
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr "Warnung: Konnte Sperrdatei %s nicht entfernen"
 
-#: ../alpm.c:1232
-#, c-format
-msgid "config: new section '%s'\n"
+#: lib/libalpm/alpm.c:929
+#, fuzzy, c-format
+msgid "config: new section '%s'"
+msgstr "Konnte %s nicht entpacken: %s\n"
+
+#: lib/libalpm/alpm.c:958
+msgid "config: nopassiveftp"
 msgstr ""
 
-#: ../alpm.c:1275
-msgid "config: usesyslog\n"
+#: lib/libalpm/alpm.c:961
+msgid "config: usesyslog"
 msgstr ""
 
-#: ../alpm.c:1286
-#, c-format
-msgid "config: including %s\n"
+#: lib/libalpm/alpm.c:964
+msgid "config: chomp"
 msgstr ""
 
-#: ../alpm.c:1298 ../alpm.c:1306
-#, c-format
-msgid "config: noupgrade: %s\n"
+#: lib/libalpm/alpm.c:967
+msgid "config: usecolor"
 msgstr ""
 
-#: ../alpm.c:1316 ../alpm.c:1324
+#: lib/libalpm/alpm.c:976
 #, fuzzy, c-format
-msgid "config: noextract: %s\n"
+msgid "config: including %s"
+msgstr "Kann Logdatei '%s' nicht öffnen"
+
+#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#, fuzzy, c-format
+msgid "config: noupgrade: %s"
+msgstr "Konnte %s nicht entpacken: %s\n"
+
+#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#, fuzzy, c-format
+msgid "config: noextract: %s"
+msgstr "Konnte %s nicht entpacken: %s\n"
+
+#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#, fuzzy, c-format
+msgid "config: ignorepkg: %s"
+msgstr "Konnte %s nicht entpacken: %s\n"
+
+#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#, fuzzy, c-format
+msgid "config: holdpkg: %s"
+msgstr "Kann Logdatei '%s' nicht öffnen"
+
+#: lib/libalpm/alpm.c:1037
+#, fuzzy, c-format
+msgid "config: dbpath: %s"
+msgstr "Konnte %s nicht entpacken: %s\n"
+
+#: lib/libalpm/alpm.c:1044
+#, fuzzy, c-format
+msgid "config: cachedir: %s"
+msgstr "Konnte %s nicht entpacken: %s\n"
+
+#: lib/libalpm/alpm.c:1047
+#, fuzzy, c-format
+msgid "config: logfile: %s"
+msgstr "Kann Logdatei '%s' nicht öffnen"
+
+#: lib/libalpm/alpm.c:1050
+#, fuzzy, c-format
+msgid "config: xfercommand: %s"
 msgstr "Konnte %s nicht entpacken: %s\n"
 
-#: ../alpm.c:1334 ../alpm.c:1342
+#: lib/libalpm/alpm.c:1055
 #, c-format
-msgid "config: ignorepkg: %s\n"
+msgid "config: upgradedelay: %d"
 msgstr ""
 
-#: ../alpm.c:1352 ../alpm.c:1360
+#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+msgid "checking for package replacements"
+msgstr "Prüfe auf Paketersetzungen"
+
+#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
 #, c-format
-msgid "config: holdpkg: %s\n"
-msgstr ""
+msgid "checking replacement '%s' for package '%s'"
+msgstr "Prüfe Ersetzung '%s' für Paket '%s'"
 
-#: ../alpm.c:1370
+#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
 #, c-format
-msgid "config: dbpath: %s\n"
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: ../alpm.c:1380
+#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
 #, c-format
-msgid "config: cachedir: %s\n"
+msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: ../alpm.c:1386
+#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#, c-format
+msgid "'%s' not found in sync db -- skipping"
+msgstr "'%s' nicht in sync DB gefunden -- Ãœberspringe"
+
+#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#, c-format
+msgid "'%s' is already elected for removal -- skipping"
+msgstr "'%s' ist bereits zum Entfernen ausgewählt -- Überspringe"
+
+#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
 #, fuzzy, c-format
-msgid "config: log file: %s\n"
-msgstr "Kann Logdatei '%s' nicht öffnen"
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr "%s-%s: Lokale Version ist neuer"
 
-#. The config value is in days, we use seconds
-#: ../alpm.c:1394
+#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
 #, c-format
-msgid "config: UpgradeDelay: %i\n"
-msgstr ""
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
 
-#. add to the list
-#: ../alpm.c:1415
+#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
 #, fuzzy, c-format
-msgid "config: %s: server: %s\n"
-msgstr "Warnung: %s gesichert als %s"
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
 
-#: ../be_files.c:151
+#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#, c-format
+msgid "%s-%s elected for upgrade (%s => %s)"
+msgstr "%s-%s ausgewählt für Aktualisierung (%s => %s)"
+
+#: lib/libalpm/be_files.c:59
+#, fuzzy, c-format
+msgid "unpacking database '%s'"
+msgstr "Öffne Datenbank '%s'"
+
+#: lib/libalpm/be_files.c:183
 #, c-format
 msgid "invalid name for dabatase entry '%s'"
 msgstr "Falscher Name für Datenbankeintrag '%s'"
 
-#: ../be_files.c:432
+#: lib/libalpm/be_files.c:211
+msgid "invalid package entry provided to _alpm_db_read, skipping"
+msgstr ""
+
+#: lib/libalpm/be_files.c:216
+#, c-format
+msgid ""
+"request to read database info for a file-based package '%s', skipping..."
+msgstr ""
+
+#: lib/libalpm/be_files.c:224
 #, c-format
-msgid "db_write: could not open file %s/desc"
-msgstr "db_write: Konnte Datei %s/desc nicht öffnen"
+msgid "loading package data for %s : level=%d"
+msgstr ""
+
+#: lib/libalpm/be_files.c:232
+#, fuzzy, c-format
+msgid "cannot find '%s-%s' in db '%s'"
+msgstr "Konnte %s nicht in der Datenbank finden"
 
-#: ../be_files.c:517
+#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
+#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
+#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
+#: lib/libalpm/package.c:185
+#, fuzzy, c-format
+msgid "could not open file %s: %s"
+msgstr "Konnte Datei %s nicht öffnen"
+
+#: lib/libalpm/be_files.c:492
 #, c-format
-msgid "db_write: could not open file %s/files"
-msgstr "db_write: Konnte Datei %s/files nicht öffnen"
+msgid "writing %s-%s DESC information back to db"
+msgstr ""
 
-#: ../be_files.c:543
+#: lib/libalpm/be_files.c:578
 #, c-format
-msgid "db_write: could not open file %s/depends"
-msgstr "db_write: Konnte Datei %s/depends nicht öffnen"
+msgid "writing %s-%s FILES information back to db"
+msgstr ""
 
-#: ../cache.c:57
+#: lib/libalpm/be_files.c:605
+#, c-format
+msgid "writing %s-%s DEPENDS information back to db"
+msgstr ""
+
+#: lib/libalpm/cache.c:59
 #, c-format
 msgid "loading package cache (infolevel=%#x) for repository '%s'"
 msgstr "Lade Paketcache (infolevel=%#x) für Repository '%s'"
 
-#: ../cache.c:77
+#: lib/libalpm/cache.c:83
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr ""
 
-#: ../cache.c:112
+#: lib/libalpm/cache.c:132
+#, fuzzy, c-format
+msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
+msgstr "Lade Paketcache (infolevel=%#x) für Repository '%s'"
+
+#: lib/libalpm/cache.c:152
 #, c-format
 msgid "adding entry '%s' in '%s' cache"
 msgstr "Füge Eintrag '%s' zu '%s' Cache hinzu"
 
-#: ../cache.c:134
+#: lib/libalpm/cache.c:178
 #, c-format
 msgid "removing entry '%s' from '%s' cache"
 msgstr "Entferne Eintrag '%s' aus '%s' Cache"
 
-#: ../cache.c:165
+#: lib/libalpm/cache.c:213
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr "Lade Gruppencache für repository '%s'"
 
-#. CHECK 1: check targets against database
-#: ../conflict.c:71
+#: lib/libalpm/conflict.c:78
 #, c-format
 msgid "checkconflicts: targ '%s' vs db"
 msgstr ""
 
-#. conflict
-#. confict
-#: ../conflict.c:80 ../conflict.c:94
+#: lib/libalpm/conflict.c:87 lib/libalpm/conflict.c:101
 #, c-format
 msgid "targs vs db: found %s as a conflict for %s"
 msgstr ""
 
-#. CHECK 2: check targets against targets
-#: ../conflict.c:107
+#: lib/libalpm/conflict.c:114
 #, c-format
 msgid "checkconflicts: targ '%s' vs targs"
 msgstr ""
 
-#. otp is listed in tp's conflict list
-#: ../conflict.c:116 ../conflict.c:129
+#: lib/libalpm/conflict.c:123 lib/libalpm/conflict.c:136
 #, c-format
 msgid "targs vs targs: found %s as a conflict for %s"
 msgstr ""
 
-#. CHECK 3: check database against targets
-#: ../conflict.c:143
+#: lib/libalpm/conflict.c:150
 #, c-format
 msgid "checkconflicts: db vs targ '%s'"
 msgstr ""
 
-#: ../conflict.c:170 ../conflict.c:185
+#: lib/libalpm/conflict.c:177 lib/libalpm/conflict.c:192
 #, c-format
 msgid "db vs targs: found %s as a conflict for %s"
 msgstr ""
 
-#: ../conflict.c:234 ../conflict.c:335 ../deps.c:54 ../deps.c:601
-#: ../deps.c:641 ../group.c:42 ../handle.c:62 ../package.c:98 ../sync.c:65
-#: ../sync.c:635 ../sync.c:651 ../sync.c:747 ../trans.c:49 ../util.c:598
-#: ../util.c:605
+#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
+#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr ""
 
-#: ../db.c:57 ../db.c:64
+#: lib/libalpm/db.c:62 lib/libalpm/db.c:69
 #, c-format
 msgid "malloc failed: could not allocate %d bytes"
 msgstr ""
 
-#: ../deps.c:118
+#: lib/libalpm/db.c:163
+msgid "attempt to re-register the 'local' DB"
+msgstr ""
+
+#: lib/libalpm/db.c:171
+#, c-format
+msgid "attempt to re-register the '%s' database, using existing"
+msgstr ""
+
+#: lib/libalpm/db.c:177
+#, c-format
+msgid "registering database '%s'"
+msgstr "Registriere Datenbank '%s'"
+
+#: lib/libalpm/db.c:182
+#, c-format
+msgid "database directory '%s' does not exist -- try creating it"
+msgstr ""
+"Datenbankverzeichnis '%s' ist nicht vorhanden - Versuche es zu erstellen"
+
+#: lib/libalpm/db.c:193
+#, c-format
+msgid "opening database '%s'"
+msgstr "Öffne Datenbank '%s'"
+
+#: lib/libalpm/deps.c:128
 #, fuzzy
 msgid "started sorting dependencies"
 msgstr "Sortiere nach Abhängigkeiten"
 
-#: ../deps.c:123
+#: lib/libalpm/deps.c:133
 msgid "possible dependency cycle detected"
 msgstr ""
 
-#: ../deps.c:166
+#: lib/libalpm/deps.c:178
 #, fuzzy
 msgid "sorting dependencies finished"
 msgstr "Sortiere nach Abhängigkeiten"
 
-#: ../deps.c:260 ../deps.c:406
+#: lib/libalpm/deps.c:219 lib/libalpm/deps.c:276
+msgid "null package found in package list"
+msgstr ""
+
+#: lib/libalpm/deps.c:224
+#, fuzzy, c-format
+msgid "cannot find package installed '%s'"
+msgstr "Kann Paketdatei nicht öffnen"
+
+#: lib/libalpm/deps.c:258 lib/libalpm/deps.c:379
 #, c-format
 msgid "checkdeps: found %s as required by %s"
 msgstr ""
 
-#: ../deps.c:370
+#: lib/libalpm/deps.c:284
+#, fuzzy, c-format
+msgid "no dependencies for target '%s'"
+msgstr "Kann Abhängigkeiten für \"%s\" nicht auflösen"
+
+#: lib/libalpm/deps.c:330
 #, c-format
 msgid "checkdeps: found %s as a dependency for %s"
 msgstr "checkdeps: %s als Abhängigkeit für %s gefunden"
 
-#: ../deps.c:494
+#: lib/libalpm/deps.c:478
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr ""
 
-#: ../deps.c:499
+#: lib/libalpm/deps.c:483
 msgid "dep is NULL!"
 msgstr ""
 
-#: ../deps.c:511
+#: lib/libalpm/deps.c:498
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr "Schließe %s aus -- Ausdrücklich installiert"
 
-#. add it to the target list
-#: ../deps.c:528
+#: lib/libalpm/deps.c:515
 #, c-format
 msgid "loading ALL info for '%s'"
 msgstr "Lade ALL Informationen für '%s'"
 
-#: ../deps.c:531
+#: lib/libalpm/deps.c:518
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr "Füge '%s' zu den Paketen hinzu"
 
-#: ../deps.c:573
+#: lib/libalpm/deps.c:546
+#, fuzzy
+msgid "started resolving dependencies"
+msgstr "Sortiere nach Abhängigkeiten"
+
+#: lib/libalpm/deps.c:564
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr "%s stellt Abhängigkeit %s zur Verfügung -- Überspringe"
 
-#: ../deps.c:597
+#: lib/libalpm/deps.c:589
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
@@ -616,750 +724,714 @@ msgstr ""
 "Kann Abhängigkeiten für \"%s\" nicht auflösen (\"%s\" ist nicht in "
 "Paketliste enthalten)"
 
-#. this dep is already in the target list
-#: ../deps.c:614
+#: lib/libalpm/deps.c:606
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr "Abhängigkeit %s ist bereits in Paketliste -- Überspringe"
 
-#: ../deps.c:634
+#: lib/libalpm/deps.c:626
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr "Ziehe Abhängigkeit %s (benötigt von %s)"
 
-#: ../deps.c:638
+#: lib/libalpm/deps.c:630
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr "Kann Abhängigkeiten für \"%s\" nicht auflösen"
 
-#. cycle detected -- skip it
-#: ../deps.c:654
+#: lib/libalpm/deps.c:646
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr ""
 
-#: ../error.c:34
+#: lib/libalpm/deps.c:650
+#, fuzzy
+msgid "finished resolving dependencies"
+msgstr "Sortiere nach Abhängigkeiten"
+
+#: lib/libalpm/error.c:34
 msgid "out of memory!"
 msgstr ""
 
-#: ../error.c:36 ../error.c:135
-msgid "unexpected error"
+#: lib/libalpm/error.c:36
+#, fuzzy
+msgid "unexpected system error"
 msgstr "Unerwarteter Fehler"
 
-#: ../error.c:38
+#: lib/libalpm/error.c:38
 msgid "insufficient privileges"
 msgstr "Ungenügende Rechte"
 
-#: ../error.c:40
+#: lib/libalpm/error.c:40
 msgid "wrong or NULL argument passed"
 msgstr "Falsches oder NULL Argument übergeben"
 
-#: ../error.c:42
+#: lib/libalpm/error.c:42
 msgid "could not find or read file"
 msgstr "Konnte Datei nicht finden oder lesen"
 
-#: ../error.c:45
+#: lib/libalpm/error.c:45
 msgid "library not initialized"
 msgstr "Bibliothek nicht initialisiert"
 
-#: ../error.c:47
+#: lib/libalpm/error.c:47
 msgid "library already initialized"
 msgstr "Bibliothek bereits initialisiert"
 
-#: ../error.c:49
+#: lib/libalpm/error.c:49
 msgid "unable to lock database"
 msgstr "Konnte Datenbank nicht sperren"
 
-#: ../error.c:52
+#: lib/libalpm/error.c:52
 msgid "could not open database"
 msgstr "Konnte Datenbank nicht öffnen"
 
-#: ../error.c:54
+#: lib/libalpm/error.c:54
 msgid "could not create database"
 msgstr "Konnte Datenbank nicht erstellen"
 
-#: ../error.c:56
+#: lib/libalpm/error.c:56
 msgid "database not initialized"
 msgstr "Datenbank nicht initialisiert"
 
-#: ../error.c:58
+#: lib/libalpm/error.c:58
 msgid "database already registered"
 msgstr "Datenbank bereits registriert"
 
-#: ../error.c:60
+#: lib/libalpm/error.c:60
 msgid "could not find database"
 msgstr "Konnte Datenbank nicht finden"
 
-#: ../error.c:62
+#: lib/libalpm/error.c:62
 msgid "could not update database"
 msgstr "Konnte Datenbank nicht aktualisieren"
 
-#: ../error.c:64
+#: lib/libalpm/error.c:64
 msgid "could not remove database entry"
 msgstr "Konnte Datenbankeintrag nicht entfernen"
 
-#: ../error.c:71
+#: lib/libalpm/error.c:71
 msgid "could not set parameter"
 msgstr "Konnte Parameter nicht setzen"
 
-#: ../error.c:74 ../error.c:80
+#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
 msgid "transaction not initialized"
 msgstr ""
 
-#: ../error.c:76
+#: lib/libalpm/error.c:76
 msgid "transaction already initialized"
 msgstr ""
 
-#: ../error.c:78
+#: lib/libalpm/error.c:78
 msgid "duplicate target"
 msgstr "Doppelte Pakete"
 
-#: ../error.c:82
+#: lib/libalpm/error.c:82
 msgid "transaction not prepared"
 msgstr ""
 
-#: ../error.c:84
+#: lib/libalpm/error.c:84
 msgid "transaction aborted"
 msgstr ""
 
-#: ../error.c:86
+#: lib/libalpm/error.c:86
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: ../error.c:89
+#: lib/libalpm/error.c:89
 msgid "could not find or read package"
 msgstr "Konnte Paket nicht finden oder lesen"
 
-#: ../error.c:91
+#: lib/libalpm/error.c:91
 msgid "invalid or corrupted package"
 msgstr "Ungültiges oder beschädigtes Paket"
 
-#: ../error.c:93
+#: lib/libalpm/error.c:93
 msgid "cannot open package file"
 msgstr "Kann Paketdatei nicht öffnen"
 
-#: ../error.c:95
+#: lib/libalpm/error.c:95
 msgid "cannot load package data"
 msgstr "Kann Paketdaten nicht laden"
 
-#: ../error.c:97
+#: lib/libalpm/error.c:97
 msgid "package already installed"
 msgstr "Paket ist bereits installiert"
 
-#: ../error.c:99
+#: lib/libalpm/error.c:99
 msgid "package not installed or lesser version"
 msgstr "Paket ist nicht installiert oder kleinere Version"
 
-#: ../error.c:101
+#: lib/libalpm/error.c:101
 msgid "package name is not valid"
 msgstr "Paketname ist nicht gültig"
 
-#: ../error.c:103
+#: lib/libalpm/error.c:103
 msgid "corrupted package"
 msgstr "Beschädigtes Paket"
 
-#: ../error.c:106
+#: lib/libalpm/error.c:105
+msgid "no such repository"
+msgstr ""
+
+#: lib/libalpm/error.c:108
 msgid "group not found"
 msgstr "Gruppe nicht gefunden"
 
-#: ../error.c:109
+#: lib/libalpm/error.c:111
 msgid "could not satisfy dependencies"
 msgstr "Kann Abhängigkeiten nicht erfüllen"
 
-#: ../error.c:111
+#: lib/libalpm/error.c:113
 msgid "conflicting dependencies"
 msgstr "In Konflikt stehende Abhängigkeiten"
 
-#: ../error.c:113
+#: lib/libalpm/error.c:115
 msgid "conflicting files"
 msgstr "In Konflikt stehende Dateien"
 
-#: ../error.c:116
+#: lib/libalpm/error.c:118
 msgid "user aborted"
 msgstr "Benutzerabbruch"
 
-#: ../error.c:118
+#: lib/libalpm/error.c:120
 msgid "libarchive error"
 msgstr "libarchive Fehler"
 
-#: ../error.c:120
+#: lib/libalpm/error.c:122
 msgid "internal error"
 msgstr "Interner Fehler"
 
-#: ../error.c:122
+#: lib/libalpm/error.c:124
 msgid "not enough space"
 msgstr ""
 
-#: ../error.c:124
+#: lib/libalpm/error.c:126
 msgid "not confirmed"
 msgstr ""
 
-#: ../error.c:127
+#: lib/libalpm/error.c:129
 msgid "bad section name"
 msgstr ""
 
-#: ../error.c:129
+#: lib/libalpm/error.c:131
 msgid "'local' is reserved and cannot be used as a package tree"
 msgstr ""
 
-#: ../error.c:131
+#: lib/libalpm/error.c:133
 #, fuzzy
 msgid "syntax error"
 msgstr "Interner Fehler"
 
-#: ../error.c:133
+#: lib/libalpm/error.c:135
 msgid "all directives must belong to a section"
 msgstr ""
 
-#: ../handle.c:143
-#, c-format
-msgid "PM_OPT_DBPATH set to '%s'"
-msgstr "PM_OPT_DBPATH auf '%s' gesetzt"
-
-#: ../handle.c:150
-#, c-format
-msgid "PM_OPT_CACHEDIR set to '%s'"
-msgstr "PM_OPT_CACHEDIR auf '%s' gesetzt"
-
-#: ../handle.c:167
-#, c-format
-msgid "can't open log file %s"
-msgstr "Kann Logdatei '%s' nicht öffnen"
-
-#: ../handle.c:171
-#, c-format
-msgid "PM_OPT_LOGFILE set to '%s'"
-msgstr "PM_OPT_LOGFILE auf '%s' gesetzt"
-
-#: ../handle.c:176
-#, c-format
-msgid "'%s' added to PM_OPT_NOUPGRADE"
-msgstr "'%s' zu PM_OPT_NOUPGRADE hinzugefügt"
-
-#: ../handle.c:179
-msgid "PM_OPT_NOUPGRADE flushed"
+#: lib/libalpm/error.c:137
+msgid "invalid regular expression"
 msgstr ""
 
-#: ../handle.c:185
-#, c-format
-msgid "'%s' added to PM_OPT_NOEXTRACT"
-msgstr "'%s' zu PM_OPT_NOEXTRACT hinzugefügt"
-
-#: ../handle.c:188
-msgid "PM_OPT_NOEXTRACT flushed"
-msgstr ""
-
-#: ../handle.c:194
-#, c-format
-msgid "'%s' added to PM_OPT_IGNOREPKG"
-msgstr "'%s' zu PM_OPT_IGNOREPKG hinzugefügt"
-
-#: ../handle.c:197
-msgid "PM_OPT_IGNOREPKG flushed"
-msgstr ""
-
-#: ../handle.c:203
-#, fuzzy, c-format
-msgid "'%s' added to PM_OPT_HOLDPKG"
-msgstr "'%s' zu PM_OPT_IGNOREPKG hinzugefügt"
+#: lib/libalpm/error.c:139
+#, fuzzy
+msgid "connection to remote host failed"
+msgstr "Kann Datei %s nicht entfernen"
 
-#: ../handle.c:206
-msgid "PM_OPT_HOLDPKG flushed"
+#: lib/libalpm/error.c:141
+msgid "forking process failed"
 msgstr ""
 
-#: ../handle.c:222
-#, c-format
-msgid "PM_OPT_USESYSLOG set to '%d'"
-msgstr "PM_OPT_USESYSLOG auf '%d' gesetzt"
-
-#: ../handle.c:262
-#, c-format
-msgid "PM_OPT_LOGMASK set to '%02x'"
-msgstr "PM_OPT_LOGMASK auf '%02x' gesetzt"
-
-#: ../handle.c:281
-#, fuzzy, c-format
-msgid "PM_OPT_PROXYHOST set to '%s'"
-msgstr "PM_OPT_DBPATH auf '%s' gesetzt"
-
-#: ../handle.c:285
-#, fuzzy, c-format
-msgid "PM_OPT_PROXYPORT set to '%d'"
-msgstr "PM_OPT_DBPATH auf '%s' gesetzt"
-
-#: ../handle.c:296
-#, fuzzy, c-format
-msgid "PM_OPT_XFERCOMMAND set to '%s'"
-msgstr "PM_OPT_CACHEDIR auf '%s' gesetzt"
-
-#: ../handle.c:300
-#, fuzzy, c-format
-msgid "PM_OPT_NOPASSIVEFTP set to '%d'"
-msgstr "PM_OPT_DBPATH auf '%s' gesetzt"
-
-#: ../handle.c:304
-#, fuzzy, c-format
-msgid "PM_OPT_CHOMP set to '%d'"
-msgstr "PM_OPT_CACHEDIR auf '%s' gesetzt"
+#: lib/libalpm/error.c:143
+msgid "unexpected error"
+msgstr "Unerwarteter Fehler"
 
-#: ../md5driver.c:48 ../sha1.c:395
+#: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398
 #, c-format
 msgid "%s can't be opened\n"
 msgstr "%s kann nicht geöffnet werden\n"
 
-#: ../package.c:185
-#, c-format
-msgid "could not open file %s"
-msgstr "Konnte Datei %s nicht öffnen"
-
-#: ../package.c:202 ../package.c:262
+#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr "%s: Falscher Syntax in Beschreibungsdatei, Zeile %d"
 
-#: ../package.c:319
+#: lib/libalpm/package.c:331
 msgid "could not parse the package description file"
 msgstr "Konnte Paketbeschreibungsdatei nicht analysieren"
 
-#: ../package.c:327
+#: lib/libalpm/package.c:335
 #, c-format
 msgid "missing package name in %s"
 msgstr "Fehlender Paketname in %s"
 
-#: ../package.c:335
+#: lib/libalpm/package.c:339
 #, c-format
 msgid "missing package version in %s"
 msgstr "Fehlende Paketversion in %s"
 
-#: ../package.c:374
+#: lib/libalpm/package.c:374
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr "Konnte tempfile %s nicht entfernen"
 
-#: ../package.c:391
-#, c-format
-msgid "bad package file in %s"
-msgstr ""
+#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#, fuzzy, c-format
+msgid "error while reading package: %s"
+msgstr "Aktualisiere Paket %s-%s"
 
-#: ../package.c:399
-#, c-format
-msgid "missing package info file in %s"
+#: lib/libalpm/package.c:400
+#, fuzzy
+msgid "missing package metadata"
+msgstr "Fehlender Paketname in %s"
+
+#: lib/libalpm/package.c:407
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one"
 msgstr "Fehlende Paketinfodatei in %s"
 
-#: ../remove.c:76
+#: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
 msgstr "Konnte %s nicht in der Datenbank finden"
 
-#: ../remove.c:88
+#: lib/libalpm/remove.c:92
 #, c-format
 msgid "adding %s in the targets list"
 msgstr ""
 
-#: ../remove.c:114
+#: lib/libalpm/remove.c:120
 #, c-format
 msgid "pulling %s in the targets list"
 msgstr ""
 
-#: ../remove.c:117
+#: lib/libalpm/remove.c:123
 #, c-format
 msgid "could not find %s in database -- skipping"
 msgstr "Konnte %s nicht in Datenbank finden -- Ãœberspringe"
 
-#: ../remove.c:135
+#: lib/libalpm/remove.c:141
 msgid "finding removable dependencies"
 msgstr "Finde entfernbare Abhängigkeiten"
 
-#: ../remove.c:180
-#, c-format
-msgid "removing package %s-%s"
-msgstr "Entferne Paket %s-%s"
-
-#: ../remove.c:191
-msgid "removing files"
-msgstr "Entferne Dateien"
-
-#: ../remove.c:217
+#: lib/libalpm/remove.c:193
 #, c-format
 msgid "file %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#. this is okay, other packages are probably using it.
-#: ../remove.c:223
+#: lib/libalpm/remove.c:199
 #, c-format
 msgid "keeping directory %s"
 msgstr "Behalte Verzeichnis %s"
 
-#: ../remove.c:225
+#: lib/libalpm/remove.c:201
 #, c-format
 msgid "removing directory %s"
 msgstr "Entferne Verzeichnis %s"
 
-#: ../remove.c:239
+#: lib/libalpm/remove.c:215
 #, c-format
 msgid "skipping removal of %s as it has moved to another package"
 msgstr ""
 
-#: ../remove.c:251 ../remove.c:252
+#: lib/libalpm/remove.c:227
 #, c-format
 msgid "%s saved as %s"
 msgstr "%s gespeichert als %s"
 
-#: ../remove.c:254 ../remove.c:261
+#: lib/libalpm/remove.c:231
 #, c-format
 msgid "unlinking %s"
 msgstr ""
 
-#: ../remove.c:256 ../remove.c:266
-#, c-format
-msgid "cannot remove file %s"
+#: lib/libalpm/remove.c:237
+#, fuzzy, c-format
+msgid "cannot remove file %s: %s"
 msgstr "Kann Datei %s nicht entfernen"
 
-#: ../remove.c:285
+#: lib/libalpm/remove.c:265
+#, c-format
+msgid "removing package %s-%s"
+msgstr "Entferne Paket %s-%s"
+
+#: lib/libalpm/remove.c:276
+msgid "removing files"
+msgstr "Entferne Dateien"
+
+#: lib/libalpm/remove.c:294
 #, c-format
 msgid "removing database entry '%s'"
 msgstr "Entferne Datenbankeintrag '%s'"
 
-#: ../remove.c:287
+#: lib/libalpm/remove.c:296
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr "Konnte Datenbankeintrag %s-%s nicht entfernen"
 
-#: ../remove.c:290
+#: lib/libalpm/remove.c:299
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr "Konnte Eintrag '%s' nicht aus dem Cache entfernen"
 
-#: ../remove.c:330
+#: lib/libalpm/remove.c:333
+#, fuzzy, c-format
+msgid "could not find dependency '%s' for removal"
+msgstr "Konnte Abhängigkeit '%s' nicht finden"
+
+#: lib/libalpm/remove.c:343
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr "Aktualisiere 'requiredby' Feld für Paket '%s'"
 
-#. check for "recommended" package replacements
-#: ../sync.c:160
-msgid "checking for package replacements"
-msgstr "Prüfe auf Paketersetzungen"
-
-#: ../sync.c:169
-#, c-format
-msgid "checking replacement '%s' for package '%s'"
-msgstr "Prüfe Ersetzung '%s' für Paket '%s'"
-
-#: ../sync.c:171
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
-msgstr ""
-
-#: ../sync.c:205
-#, c-format
-msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
-msgstr ""
-
-#. match installed packages with the sync dbs and compare versions
-#: ../sync.c:217
+#: lib/libalpm/sync.c:200
 msgid "checking for package upgrades"
 msgstr "Prüfe auf Paketaktualisierungen"
 
-#: ../sync.c:229
-#, c-format
-msgid "'%s' not found in sync db -- skipping"
-msgstr "'%s' nicht in sync DB gefunden -- Ãœberspringe"
-
-#: ../sync.c:243 ../sync.c:530
-#, c-format
-msgid "'%s' is already elected for removal -- skipping"
-msgstr "'%s' ist bereits zum Entfernen ausgewählt -- Überspringe"
-
-#. local version is newer
-#: ../sync.c:252
-#, c-format
-msgid "%s-%s: local version is newer"
-msgstr "%s-%s: Lokale Version ist neuer"
-
-#. package should be ignored (IgnorePkg)
-#: ../sync.c:258
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)"
-
-#. package too new (UpgradeDelay)
-#: ../sync.c:262
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr ""
-
-#: ../sync.c:266
-#, c-format
-msgid "%s-%s elected for upgrade (%s => %s)"
-msgstr "%s-%s ausgewählt für Aktualisierung (%s => %s)"
+#: lib/libalpm/sync.c:278
+#, fuzzy, c-format
+msgid "searching for target in repo '%s'"
+msgstr "Lade Paket '%s'"
 
-#. Search provides
-#: ../sync.c:317 ../sync.c:336
+#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr ""
 
-#: ../sync.c:322 ../sync.c:341
+#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr ""
 
-#: ../sync.c:360
-#, c-format
-msgid "%s-%s: local version is newer -- skipping"
-msgstr "%s-%s: Lokale Version ist neuer -- Ãœberspringe"
+#: lib/libalpm/sync.c:299
+#, fuzzy, c-format
+msgid "repository '%s' not found"
+msgstr "Gruppe nicht gefunden"
 
-#: ../sync.c:368
+#: lib/libalpm/sync.c:333
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr "%s-%s ist aktuell -- Ãœberspringe"
 
-#: ../sync.c:388
+#: lib/libalpm/sync.c:353
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr ""
 
-#: ../sync.c:433
-msgid "resolving targets dependencies"
-msgstr ""
+#: lib/libalpm/sync.c:401
+#, fuzzy
+msgid "resolving target's dependencies"
+msgstr "Sortiere nach Abhängigkeiten"
 
-#: ../sync.c:453
+#: lib/libalpm/sync.c:421
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr ""
 
-#: ../sync.c:485
+#: lib/libalpm/sync.c:456
 msgid "looking for unresolvable dependencies"
 msgstr "Suche nach ungelösten Abhängigkeiten"
 
-#: ../sync.c:515
+#: lib/libalpm/sync.c:487
 #, c-format
 msgid "package '%s' is conflicting with '%s'"
 msgstr "Paket '%s' steht im Konflikt mit '%s'"
 
-#: ../sync.c:537
+#: lib/libalpm/sync.c:509
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr ""
 
-#. so just treat it like a "replaces" item so the REQUIREDBY
-#. * fields are inherited properly.
-#.
-#: ../sync.c:548
+#: lib/libalpm/sync.c:520
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr "Paket '%s' liefert seinen eigenen Konflikt"
 
-#: ../sync.c:571 ../sync.c:576
+#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr ""
 
-#: ../sync.c:588 ../sync.c:625
+#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
 #, c-format
 msgid "removing '%s' from target list"
 msgstr "Entferne '%s' von Paketliste"
 
-#. It's a conflict -- see if they want to remove it
-#.
-#: ../sync.c:597
+#: lib/libalpm/sync.c:569
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr ""
 
-#. append to the replaces list
-#: ../sync.c:620
+#: lib/libalpm/sync.c:592
 #, c-format
 msgid "electing '%s' for removal"
 msgstr "Wähle '%s' zum Entfernen aus"
 
-#. abort
-#: ../sync.c:631 ../sync.c:647
+#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
 msgid "unresolvable package conflicts detected"
 msgstr "Nicht lösbare Paketkonflikte gefunden"
 
-#: ../sync.c:699
+#: lib/libalpm/sync.c:671
 msgid "checking dependencies of packages designated for removal"
 msgstr ""
 
-#: ../sync.c:713
+#: lib/libalpm/sync.c:685
 msgid "something has gone horribly wrong"
 msgstr ""
 
-#. found matching provisio -- we're good to go
-#: ../sync.c:732
+#: lib/libalpm/sync.c:704
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr ""
 
-#: ../sync.c:825
+#: lib/libalpm/sync.c:800
 #, c-format
-msgid "%s-%s-%s%s is already in the cache\n"
+msgid "%s is already in the cache\n"
 msgstr ""
 
-#. no cache directory.... try creating it
-#: ../sync.c:837
+#: lib/libalpm/sync.c:811
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: ../sync.c:838
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#. couldn't mkdir the cache directory, so fall back to /tmp and unlink
-#. * the package afterwards.
-#.
-#: ../sync.c:843
+#: lib/libalpm/sync.c:817
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: ../sync.c:844
+#: lib/libalpm/sync.c:818
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: ../sync.c:847
-#, c-format
-msgid "failed to set option CACHEDIR (%s)\n"
-msgstr ""
-
-#: ../sync.c:854
+#: lib/libalpm/sync.c:825
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: ../sync.c:883 ../sync.c:895
+#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr "Kann MD5 oder SHA1 Prüfsumme für Paket %s nicht ermitteln\n"
 
-#: ../sync.c:914
+#: lib/libalpm/sync.c:885
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr "Archive %s war beschädigt (falsche MD5 oder SHA1 Prüfsumme)\n"
 
-#: ../sync.c:916
+#: lib/libalpm/sync.c:887
 #, 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"
 
-#: ../sync.c:936
+#: lib/libalpm/sync.c:908
 msgid "could not create removal transaction"
 msgstr ""
 
-#: ../sync.c:942
+#: lib/libalpm/sync.c:914
 msgid "could not initialize the removal transaction"
 msgstr ""
 
-#: ../sync.c:962
+#: lib/libalpm/sync.c:934
 msgid "removing conflicting and to-be-replaced packages"
 msgstr "Entferne im Konflikt stehende und zu ersetzende Pakete"
 
-#: ../sync.c:964
+#: lib/libalpm/sync.c:936
 msgid "could not prepare removal transaction"
 msgstr ""
 
-#: ../sync.c:970
+#: lib/libalpm/sync.c:942
 msgid "could not commit removal transaction"
 msgstr ""
 
-#. install targets
-#: ../sync.c:977
+#: lib/libalpm/sync.c:949
 msgid "installing packages"
 msgstr "Installiere Pakete"
 
-#: ../sync.c:980
+#: lib/libalpm/sync.c:952
 msgid "could not create transaction"
 msgstr ""
 
-#: ../sync.c:985
+#: lib/libalpm/sync.c:957
 msgid "could not initialize transaction"
 msgstr ""
 
-#: ../sync.c:1004
+#: lib/libalpm/sync.c:980
 msgid "could not prepare transaction"
 msgstr ""
 
-#: ../sync.c:1009
+#: lib/libalpm/sync.c:985
 msgid "could not commit transaction"
 msgstr ""
 
-#: ../sync.c:1016
+#: lib/libalpm/sync.c:992
 #, fuzzy
 msgid "updating database for replaced packages' dependencies"
 msgstr "Aktualisiere Datenbank für ersetzte Paketabhängigkeiten"
 
-#: ../sync.c:1045
+#: lib/libalpm/sync.c:1021
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr "Konnte requiredby für Datenbankeintrag %s-%s nicht aktualisieren"
 
-#: ../sync.c:1054
+#: lib/libalpm/sync.c:1030
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr "Konnte neuen Datenbankeintrag %s-%s nicht aktualisieren"
 
-#: ../util.c:285
+#: lib/libalpm/util.c:278
+#, fuzzy, c-format
+msgid "could not open %s: %s\n"
+msgstr "Konnte Datei %s nicht öffnen"
+
+#: lib/libalpm/util.c:291
 #, c-format
 msgid "could not extract %s: %s\n"
 msgstr "Konnte %s nicht entpacken: %s\n"
 
-#: ../util.c:436
+#: lib/libalpm/util.c:349
+#, fuzzy, c-format
+msgid "logaction called: %s"
+msgstr "Original: %s"
+
+#: lib/libalpm/util.c:441
 msgid "could not create temp directory"
 msgstr "Konnte temp Verzeichnis nicht erstellen"
 
-#: ../util.c:463
+#: lib/libalpm/util.c:468
 #, c-format
 msgid "could not change directory to %s (%s)"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)"
 
-#: ../util.c:466
+#: lib/libalpm/util.c:471
 #, c-format
 msgid "executing %s script..."
 msgstr "Führe %s Skript aus ..."
 
-#: ../util.c:479
+#: lib/libalpm/util.c:484
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr "Konnte keinen neuen Prozess starten (%s)"
 
-#: ../util.c:486
+#: lib/libalpm/util.c:491
 #, c-format
 msgid "chrooting in %s"
 msgstr "Wechsel root zu %s"
 
-#: ../util.c:488
+#: lib/libalpm/util.c:493
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr "Konnte root Verzeichnis nicht wechseln (%s)"
 
-#: ../util.c:492
+#: lib/libalpm/util.c:497
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr "Konnte nicht zu Verzeichnis / wechseln (%s)"
 
-#: ../util.c:496
+#: lib/libalpm/util.c:501
 #, c-format
 msgid "executing \"%s\""
 msgstr "Führe \"%s\" aus"
 
-#: ../util.c:499
+#: lib/libalpm/util.c:504
 #, fuzzy, c-format
 msgid "call to popen failed (%s)"
 msgstr "Konnte Datei %s nicht öffnen"
 
-#: ../util.c:521
+#: lib/libalpm/util.c:529
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr ""
 
-#: ../util.c:529
+#: lib/libalpm/util.c:537
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr "Konnte tmpdir %s nicht entfernen"
 
-#: ../util.c:593
+#: lib/libalpm/util.c:594
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
+
+#: lib/libalpm/versioncmp.c:277
+#, c-format
+msgid "depcmp: %s-%s %s %s-%s => %s"
+msgstr ""
+
+#: lib/libalpm/versioncmp.c:281
+#, c-format
+msgid "depcmp: %s-%s %s %s => %s"
+msgstr ""
+
+#~ msgid "unpacking %s"
+#~ msgstr "Entpacke %s"
+
+#~ msgid "loading SCRIPLET info for '%s'"
+#~ msgstr "Lade SCRIPTLET Informationen für '%s'"
+
+#, fuzzy
+#~ msgid "config: %s: server: %s\n"
+#~ msgstr "Warnung: %s gesichert als %s"
+
+#~ msgid "db_write: could not open file %s/desc"
+#~ msgstr "db_write: Konnte Datei %s/desc nicht öffnen"
+
+#~ msgid "db_write: could not open file %s/files"
+#~ msgstr "db_write: Konnte Datei %s/files nicht öffnen"
+
+#~ msgid "db_write: could not open file %s/depends"
+#~ msgstr "db_write: Konnte Datei %s/depends nicht öffnen"
+
+#~ msgid "PM_OPT_DBPATH set to '%s'"
+#~ msgstr "PM_OPT_DBPATH auf '%s' gesetzt"
+
+#~ msgid "PM_OPT_CACHEDIR set to '%s'"
+#~ msgstr "PM_OPT_CACHEDIR auf '%s' gesetzt"
+
+#~ msgid "can't open log file %s"
+#~ msgstr "Kann Logdatei '%s' nicht öffnen"
+
+#~ msgid "PM_OPT_LOGFILE set to '%s'"
+#~ msgstr "PM_OPT_LOGFILE auf '%s' gesetzt"
+
+#~ msgid "'%s' added to PM_OPT_NOUPGRADE"
+#~ msgstr "'%s' zu PM_OPT_NOUPGRADE hinzugefügt"
+
+#~ msgid "'%s' added to PM_OPT_NOEXTRACT"
+#~ msgstr "'%s' zu PM_OPT_NOEXTRACT hinzugefügt"
+
+#~ msgid "'%s' added to PM_OPT_IGNOREPKG"
+#~ msgstr "'%s' zu PM_OPT_IGNOREPKG hinzugefügt"
+
+#, fuzzy
+#~ msgid "'%s' added to PM_OPT_HOLDPKG"
+#~ msgstr "'%s' zu PM_OPT_IGNOREPKG hinzugefügt"
+
+#~ msgid "PM_OPT_USESYSLOG set to '%d'"
+#~ msgstr "PM_OPT_USESYSLOG auf '%d' gesetzt"
+
+#~ msgid "PM_OPT_LOGMASK set to '%02x'"
+#~ msgstr "PM_OPT_LOGMASK auf '%02x' gesetzt"
+
+#, fuzzy
+#~ msgid "PM_OPT_PROXYHOST set to '%s'"
+#~ msgstr "PM_OPT_DBPATH auf '%s' gesetzt"
+
+#, fuzzy
+#~ msgid "PM_OPT_PROXYPORT set to '%d'"
+#~ msgstr "PM_OPT_DBPATH auf '%s' gesetzt"
+
+#, fuzzy
+#~ msgid "PM_OPT_XFERCOMMAND set to '%s'"
+#~ msgstr "PM_OPT_CACHEDIR auf '%s' gesetzt"
+
+#, fuzzy
+#~ msgid "PM_OPT_NOPASSIVEFTP set to '%d'"
+#~ msgstr "PM_OPT_DBPATH auf '%s' gesetzt"
+
+#, fuzzy
+#~ msgid "PM_OPT_CHOMP set to '%d'"
+#~ msgstr "PM_OPT_CACHEDIR auf '%s' gesetzt"
+
+#~ msgid "%s-%s: local version is newer -- skipping"
+#~ msgstr "%s-%s: Lokale Version ist neuer -- Ãœberspringe"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index b3b33f4f..ed5abe8b 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -1,616 +1,724 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# French translations for Pacman package manager package.
+# Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libalpm\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 13:36+0200\n"
+"Project-Id-Version: Pacman package manager 3.0.0\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2007-02-06 20:43-0500\n"
 "PO-Revision-Date: 2006-06-05 22:47+0100\n"
 "Last-Translator: Enda <enda@netou.com>\n"
-"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../add.c:95
+#: lib/libalpm/add.c:95
 #, c-format
 msgid "could not parse token %s"
 msgstr "ne peut analyser l'élément %s"
 
-#: ../add.c:127
+#: lib/libalpm/add.c:129
 #, c-format
 msgid "loading target '%s'"
 msgstr "charge la cible  '%s'"
 
-#: ../add.c:169
+#: lib/libalpm/add.c:175
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr "remplace l'ancienne version %s-%s par %s dans la liste de destination"
 
-#: ../add.c:178
+#: lib/libalpm/add.c:184
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr "une version plus récente %s-%s est déjà présente -- ignorer"
 
-#: ../add.c:185
+#: lib/libalpm/add.c:191
 #, c-format
 msgid "reading '%s' metadata"
 msgstr "lecture des métas-données '%s'"
 
-#. look for unsatisfied dependencies
-#: ../add.c:227 ../remove.c:104
+#: lib/libalpm/add.c:244 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr "recherche des dépendances non satisfaites"
 
-#. no unsatisfied deps, so look for conflicts
-#: ../add.c:239 ../sync.c:504
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
 msgid "looking for conflicts"
 msgstr "recherche des conflits"
 
-#. re-order w.r.t. dependencies
-#: ../add.c:251 ../remove.c:140
+#: lib/libalpm/add.c:295 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr "tri par dépendances"
 
-#: ../add.c:263
+#: lib/libalpm/add.c:307
 msgid "cleaning up"
 msgstr "nettoyage"
 
-#: ../add.c:280
+#: lib/libalpm/add.c:324
 msgid "looking for file conflicts"
 msgstr "recherche de conflits entre fichiers"
 
-#: ../add.c:345
+#: lib/libalpm/add.c:391
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr "mise a jour du paquet %s-%s"
 
-#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304
+#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
 #, c-format
 msgid "loading FILES info for '%s'"
 msgstr "chargement des informations de fichiers pour '%s'"
 
-#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726
-#, c-format
-msgid "loading DESC info for '%s'"
-msgstr "chargement des informations descriptives pour '%s'"
-
-#: ../add.c:378
+#: lib/libalpm/add.c:423
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr "retirer l'ancien paquet préalablement (%s-%s)"
 
-#: ../add.c:408
+#: lib/libalpm/add.c:453
 #, c-format
 msgid "adding package %s-%s"
 msgstr "ajout du paquet %s-%s"
 
-#: ../add.c:419
+#: lib/libalpm/add.c:464
 #, c-format
 msgid "adding new package %s-%s"
 msgstr "ajout du nouveau paquet %s-%s"
 
-#: ../add.c:423
+#: lib/libalpm/add.c:468
 msgid "extracting files"
 msgstr "extraction des fichiers"
 
-#: ../add.c:438 ../util.c:456
+#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
 msgid "could not get current working directory"
 msgstr "impossible de déterminer le répertoire courant"
 
-#: ../add.c:492
+#: lib/libalpm/add.c:529
 #, c-format
 msgid "notice: %s is in NoExtract -- skipping extraction"
 msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
 
-#: ../add.c:528 ../add.c:681
+#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr "n'a pas pu extraire %s (%s)"
 
-#: ../add.c:571
+#: lib/libalpm/add.c:608
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr "vérification de la 'signature' md5 pour %s"
 
-#: ../add.c:572 ../add.c:579
+#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
 #, c-format
 msgid "current:  %s"
 msgstr "courant:   %s"
 
-#: ../add.c:573 ../add.c:580
+#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
 #, c-format
 msgid "new:      %s"
 msgstr "nouveau: %s"
 
-#: ../add.c:575 ../add.c:582
+#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
 #, c-format
 msgid "original: %s"
 msgstr "original:   %s"
 
-#: ../add.c:578
+#: lib/libalpm/add.c:615
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr "vérification de la 'signature' sha1 pour %s"
 
-#: ../add.c:596
+#: lib/libalpm/add.c:633
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr "n'a pas pu renommer  %s (%s)"
 
-#: ../add.c:597
+#: lib/libalpm/add.c:634
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr "erreur: n'a pas pu renommer  %s (%s)"
 
-#: ../add.c:601 ../add.c:645
+#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
 #, c-format
 msgid "could not copy %s to %s (%s)"
 msgstr "n'a pas pu copier %s vers %s (%s)"
 
-#: ../add.c:602
+#: lib/libalpm/add.c:639
 #, c-format
 msgid "error: could not copy %s to %s (%s)"
 msgstr "erreur: n'a pas pu copier %s vers %s (%s)"
 
-#: ../add.c:606
+#: lib/libalpm/add.c:643
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr "%s sauve en tant que %s.pacorig"
 
-#: ../add.c:607
+#: lib/libalpm/add.c:644
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "avertissement: %s sauve en tant que %s"
 
-#: ../add.c:617 ../add.c:620 ../add.c:626
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
 msgid "action: installing new file"
 msgstr "action: installation de nouveau fichier"
 
-#: ../add.c:624
+#: lib/libalpm/add.c:661
 msgid "action: leaving existing file in place"
 msgstr "action: quitte en préservant les fichiers existant"
 
-#: ../add.c:630
+#: lib/libalpm/add.c:667
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 "action: conserver le fichier actuel et installer le nouveau avec "
 "l'extension .pacnew"
 
-#: ../add.c:634
+#: lib/libalpm/add.c:671
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr "n'a pas pu installer %s en tant que %s: %s"
 
-#: ../add.c:635
+#: lib/libalpm/add.c:672
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr "erreur: n'a pas pu installer %s en tant que %s: %s"
 
-#: ../add.c:637
+#: lib/libalpm/add.c:674
 #, c-format
 msgid "%s installed as %s"
 msgstr "%s installé en tant que %s"
 
-#: ../add.c:638
+#: lib/libalpm/add.c:675
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr "avertissement: %s installé en tant que %s"
 
-#: ../add.c:643 ../add.c:663
+#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
 #, c-format
 msgid "extracting %s"
 msgstr "extrait %s"
 
-#: ../add.c:665
+#: lib/libalpm/add.c:702
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr "%s est marqué NoUpgrade -- ignore"
 
-#: ../add.c:667
+#: lib/libalpm/add.c:704
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr "extrait %s en tant que %s.pacnew"
 
-#: ../add.c:668
+#: lib/libalpm/add.c:705
 #, c-format
 msgid "warning: extracting %s%s as %s"
 msgstr "avertissement: extrait %s%s en tant que %s"
 
-#: ../add.c:682
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr "erreur: n'a pas pu extraire %s (%s)"
 
-#: ../add.c:693
+#: lib/libalpm/add.c:729
 msgid "appending backup entry"
 msgstr "ajoute une entre pour la sauvegarde"
 
-#: ../add.c:725 ../add.c:727
+#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "des erreurs sont survenue pendant %s %s"
 
-#: ../add.c:726 ../add.c:728
+#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
 msgid "upgrading"
 msgstr "mise à jour"
 
-#: ../add.c:726 ../add.c:728
+#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
 msgid "installing"
 msgstr "installation"
 
-#: ../add.c:749 ../add.c:800
+#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr "ajoute '%s' dans le champ 'requit par' pour '%s'"
 
-#. remove the package from the database
-#: ../add.c:760 ../remove.c:284
+#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
 msgid "updating database"
 msgstr "met à jour la base de données"
 
-#: ../add.c:761
+#: lib/libalpm/add.c:796
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "ajoute l'entrée de base de données '%s'"
 
-#: ../add.c:763
+#: lib/libalpm/add.c:798
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "n'a pas pu mettre a jour l'entrée de base de données %s-%s"
 
-#: ../add.c:765
+#: lib/libalpm/add.c:800
 #, c-format
 msgid "error updating database for %s-%s!"
 msgstr "erreur lors de la mise a jour de la base de données pour %s-%s!"
 
-#: ../add.c:769
+#: lib/libalpm/add.c:804
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "n'a pas pu ajouter l'entrée '%s' dans le cache"
 
-#. update dependency packages' REQUIREDBY fields
-#: ../add.c:774 ../remove.c:294
+#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
 msgid "updating dependency packages 'requiredby' fields"
 msgstr "mise a jour des champs 'requit par' des dépendances"
 
-#: ../add.c:795 ../remove.c:322
+#: lib/libalpm/add.c:832
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr "n'a pas pu trouver la dépendance '%s'"
 
-#: ../add.c:803 ../remove.c:332
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr ""
 "n'a pas pu mettre à jour le champ 'requit par' de l'entrée de base de "
 "données %s-%s"
 
-#: ../add.c:830 ../remove.c:345
+#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "execute \"ldconfig -r %s\""
 
-#: ../alpm.c:201
-#, c-format
-msgid "registering database '%s'"
-msgstr "enregistre la base de données '%s'"
-
-#: ../alpm.c:206
+#: lib/libalpm/alpm.c:113
 #, c-format
-msgid "database directory '%s' does not exist -- try creating it"
+msgid "removing DB %s, %d remaining..."
 msgstr ""
-"le répertoire de base de données '%s' n'existe pas -- tentative de création"
 
-#: ../alpm.c:217
-#, c-format
-msgid "opening database '%s'"
-msgstr "ouvre la base de données '%s'"
-
-#: ../alpm.c:261
+#: lib/libalpm/alpm.c:178
 #, c-format
 msgid "unregistering database '%s'"
 msgstr "désenregistre la base de données '%s'"
 
-#: ../alpm.c:266
+#: lib/libalpm/alpm.c:183
 #, c-format
 msgid "closing database '%s'"
 msgstr "ferme la base de données '%s'"
 
-#: ../alpm.c:344
+#: lib/libalpm/alpm.c:229
 #, c-format
 msgid ""
 "adding new server to database '%s': protocol '%s', server '%s', path '%s'"
 msgstr ""
 
-#: ../alpm.c:348
+#: lib/libalpm/alpm.c:233
 #, c-format
 msgid "serverlist flushed for '%s'"
 msgstr ""
 
-#: ../alpm.c:383
+#: lib/libalpm/alpm.c:276
+#, c-format
+msgid "failed to get lastupdate time for %s (no big deal)"
+msgstr ""
+
+#: lib/libalpm/alpm.c:295
 #, c-format
-msgid "failed to get lastupdate time for %s (no big deal)\n"
+msgid "failed to sync db: %s [%d]"
 msgstr ""
 
-#: ../alpm.c:402
+#: lib/libalpm/alpm.c:299
 #, c-format
-msgid "sync: new mtime for %s: %s\n"
+msgid "sync: new mtime for %s: %s"
 msgstr ""
 
-#. remove the old dir
-#: ../alpm.c:408
+#: lib/libalpm/alpm.c:305
 #, c-format
 msgid "flushing database %s/%s"
 msgstr "recharge la base de données %s/%s"
 
-#: ../alpm.c:412
+#: lib/libalpm/alpm.c:309
 #, c-format
 msgid "could not remove database entry %s/%s"
 msgstr "n'a pas pu retirer l'entrée de base de données %s/%s"
 
-#. uncompress the sync database
-#. ORE
-#. we should not simply unpack the archive, but better parse it and
-#. db_write each entry (see sync_load_dbarchive to get archive content)
-#: ../alpm.c:426
-#, c-format
-msgid "unpacking %s"
-msgstr "décompacte %s"
-
-#: ../alpm.c:574
-#, c-format
-msgid "loading SCRIPLET info for '%s'"
-msgstr "charge les infos de SCRIPLET pour '%s'"
+#: lib/libalpm/alpm.c:479
+#, fuzzy, c-format
+msgid "could not get sha1 checksum for package %s-%s"
+msgstr "n'a pas pu obtenir la 'signature' sha1 pour le paquet %s-%s\n"
 
-#: ../alpm.c:673
+#: lib/libalpm/alpm.c:485 lib/libalpm/alpm.c:534
 #, c-format
-msgid "could not get sha1 checksum for package %s-%s\n"
-msgstr "n'a pas pu obtenir la 'signature' sha1 pour le paquet %s-%s\n"
+msgid "loading DESC info for '%s'"
+msgstr "chargement des informations descriptives pour '%s'"
 
-#: ../alpm.c:684 ../alpm.c:731
+#: lib/libalpm/alpm.c:490 lib/libalpm/alpm.c:539
 #, c-format
 msgid "checksums for package %s-%s are matching"
 msgstr "les 'signatures' correspondent pour le paquet %s-%s"
 
-#: ../alpm.c:687
-#, c-format
-msgid "sha1sums do not match for package %s-%s\n"
+#: lib/libalpm/alpm.c:493
+#, fuzzy, c-format
+msgid "sha1sums do not match for package %s-%s"
 msgstr "les 'signatures' sha1 ne correspondent pas pour le paquet %s-%s\n"
 
-#: ../alpm.c:720
-#, c-format
-msgid "could not get md5 checksum for package %s-%s\n"
+#: lib/libalpm/alpm.c:528
+#, fuzzy, c-format
+msgid "could not get md5 checksum for package %s-%s"
 msgstr "n'a pas pu obtenir la 'signature' md5 pour le paquet %s-%s\n"
 
-#: ../alpm.c:734
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
+#: lib/libalpm/alpm.c:542
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s"
 msgstr "les 'signatures' md5 ne correspondent pas pour le paquet %s-%s\n"
 
-#: ../alpm.c:993
+#: lib/libalpm/alpm.c:791
 #, c-format
 msgid "could not remove lock file %s"
 msgstr "n'a pas pu effacer le fichier de verrou %s"
 
-#: ../alpm.c:994
+#: lib/libalpm/alpm.c:792
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr "avertissement: n'a pas pu effacer le fichier de verrou %s"
 
-#: ../alpm.c:1232
-#, c-format
-msgid "config: new section '%s'\n"
+#: lib/libalpm/alpm.c:929
+#, fuzzy, c-format
+msgid "config: new section '%s'"
+msgstr "n'a pas pu extraire %s: %s\n"
+
+#: lib/libalpm/alpm.c:958
+msgid "config: nopassiveftp"
 msgstr ""
 
-#: ../alpm.c:1275
-msgid "config: usesyslog\n"
+#: lib/libalpm/alpm.c:961
+msgid "config: usesyslog"
 msgstr ""
 
-#: ../alpm.c:1286
-#, c-format
-msgid "config: including %s\n"
+#: lib/libalpm/alpm.c:964
+msgid "config: chomp"
 msgstr ""
 
-#: ../alpm.c:1298 ../alpm.c:1306
-#, c-format
-msgid "config: noupgrade: %s\n"
+#: lib/libalpm/alpm.c:967
+msgid "config: usecolor"
 msgstr ""
 
-#: ../alpm.c:1316 ../alpm.c:1324
+#: lib/libalpm/alpm.c:976
+#, fuzzy, c-format
+msgid "config: including %s"
+msgstr "ne peut ouvrir le fichier de log %s"
+
+#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#, fuzzy, c-format
+msgid "config: noupgrade: %s"
+msgstr "n'a pas pu extraire %s: %s\n"
+
+#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#, fuzzy, c-format
+msgid "config: noextract: %s"
+msgstr "n'a pas pu extraire %s: %s\n"
+
+#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#, fuzzy, c-format
+msgid "config: ignorepkg: %s"
+msgstr "n'a pas pu extraire %s: %s\n"
+
+#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
 #, fuzzy, c-format
-msgid "config: noextract: %s\n"
+msgid "config: holdpkg: %s"
+msgstr "ne peut ouvrir le fichier de log %s"
+
+#: lib/libalpm/alpm.c:1037
+#, fuzzy, c-format
+msgid "config: dbpath: %s"
+msgstr "n'a pas pu extraire %s: %s\n"
+
+#: lib/libalpm/alpm.c:1044
+#, fuzzy, c-format
+msgid "config: cachedir: %s"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: ../alpm.c:1334 ../alpm.c:1342
+#: lib/libalpm/alpm.c:1047
+#, fuzzy, c-format
+msgid "config: logfile: %s"
+msgstr "ne peut ouvrir le fichier de log %s"
+
+#: lib/libalpm/alpm.c:1050
+#, fuzzy, c-format
+msgid "config: xfercommand: %s"
+msgstr "n'a pas pu extraire %s: %s\n"
+
+#: lib/libalpm/alpm.c:1055
 #, c-format
-msgid "config: ignorepkg: %s\n"
+msgid "config: upgradedelay: %d"
 msgstr ""
 
-#: ../alpm.c:1352 ../alpm.c:1360
+#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+msgid "checking for package replacements"
+msgstr "vérification des remplacements pour le paquet"
+
+#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
 #, c-format
-msgid "config: holdpkg: %s\n"
-msgstr ""
+msgid "checking replacement '%s' for package '%s'"
+msgstr "analyse du remplacement '%s' pour le paquet '%s'"
 
-#: ../alpm.c:1370
+#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
 #, c-format
-msgid "config: dbpath: %s\n"
-msgstr ""
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
+msgstr "%s-%s: ignore la mise a jour du paquet (à remplacer par %s-%s)"
 
-#: ../alpm.c:1380
+#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
 #, c-format
-msgid "config: cachedir: %s\n"
-msgstr ""
+msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
+msgstr "%s-%s sélectionné pour mise à jour (à remplacer par %s-%s)"
 
-#: ../alpm.c:1386
+#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#, c-format
+msgid "'%s' not found in sync db -- skipping"
+msgstr "'%s' non trouvé dans la liste de synchronisation -- ignoré"
+
+#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#, c-format
+msgid "'%s' is already elected for removal -- skipping"
+msgstr "'%s' est déjà sélectionné pour retrait -- ignoré"
+
+#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
 #, fuzzy, c-format
-msgid "config: log file: %s\n"
-msgstr "ne peut ouvrir le fichier de log %s"
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr "%s-%s: la version locale est plus récente"
 
-#. The config value is in days, we use seconds
-#: ../alpm.c:1394
+#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
 #, c-format
-msgid "config: UpgradeDelay: %i\n"
-msgstr ""
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr "%s-%s: ignore la mise à jour du paquet (%s)"
 
-#. add to the list
-#: ../alpm.c:1415
+#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
 #, fuzzy, c-format
-msgid "config: %s: server: %s\n"
-msgstr "avertissement: %s sauve en tant que %s"
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr "%s-%s: repousse la mise à jour du paquet (%s)\n"
 
-#: ../be_files.c:151
+#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#, c-format
+msgid "%s-%s elected for upgrade (%s => %s)"
+msgstr "%s-%s sélectionné pour mise à jour (%s => %s)"
+
+#: lib/libalpm/be_files.c:59
+#, fuzzy, c-format
+msgid "unpacking database '%s'"
+msgstr "ouvre la base de données '%s'"
+
+#: lib/libalpm/be_files.c:183
 #, c-format
 msgid "invalid name for dabatase entry '%s'"
 msgstr "nom invalide pour l'entrée de base de données '%s'"
 
-#: ../be_files.c:432
+#: lib/libalpm/be_files.c:211
+msgid "invalid package entry provided to _alpm_db_read, skipping"
+msgstr ""
+
+#: lib/libalpm/be_files.c:216
 #, c-format
-msgid "db_write: could not open file %s/desc"
-msgstr "db_write: n'a pas pu ouvrir le fichier %s/desc"
+msgid ""
+"request to read database info for a file-based package '%s', skipping..."
+msgstr ""
 
-#: ../be_files.c:517
+#: lib/libalpm/be_files.c:224
 #, c-format
-msgid "db_write: could not open file %s/files"
-msgstr "db_write: n'a pas pu ouvrir le fichier %s/files"
+msgid "loading package data for %s : level=%d"
+msgstr ""
+
+#: lib/libalpm/be_files.c:232
+#, fuzzy, c-format
+msgid "cannot find '%s-%s' in db '%s'"
+msgstr "ne peut trouver %s dans la base de données"
 
-#: ../be_files.c:543
+#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
+#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
+#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
+#: lib/libalpm/package.c:185
+#, fuzzy, c-format
+msgid "could not open file %s: %s"
+msgstr "ne peut ouvrir le fichier %s"
+
+#: lib/libalpm/be_files.c:492
 #, c-format
-msgid "db_write: could not open file %s/depends"
-msgstr "db_write: n' pas pu ouvrir le fichier %s/depends"
+msgid "writing %s-%s DESC information back to db"
+msgstr ""
 
-#: ../cache.c:57
+#: lib/libalpm/be_files.c:578
+#, c-format
+msgid "writing %s-%s FILES information back to db"
+msgstr ""
+
+#: lib/libalpm/be_files.c:605
+#, c-format
+msgid "writing %s-%s DEPENDS information back to db"
+msgstr ""
+
+#: lib/libalpm/cache.c:59
 #, c-format
 msgid "loading package cache (infolevel=%#x) for repository '%s'"
 msgstr "chargement du cache de paquet (infolevel=%#x) pour le dépot '%s'"
 
-#: ../cache.c:77
+#: lib/libalpm/cache.c:83
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr "nettoyage du cache de paquet pour le dépot '%s'"
 
-#: ../cache.c:112
+#: lib/libalpm/cache.c:132
+#, fuzzy, c-format
+msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
+msgstr "chargement du cache de paquet (infolevel=%#x) pour le dépot '%s'"
+
+#: lib/libalpm/cache.c:152
 #, c-format
 msgid "adding entry '%s' in '%s' cache"
 msgstr "ajout de l'entrée '%s' dans '%s' cache"
 
-#: ../cache.c:134
+#: lib/libalpm/cache.c:178
 #, c-format
 msgid "removing entry '%s' from '%s' cache"
 msgstr "retrait de l'entrée '%s' depuis '%s' cache"
 
-#: ../cache.c:165
+#: lib/libalpm/cache.c:213
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr "chargement du group depuis le cache pour le dépot '%s'"
 
-#. CHECK 1: check targets against database
-#: ../conflict.c:71
+#: lib/libalpm/conflict.c:78
 #, c-format
 msgid "checkconflicts: targ '%s' vs db"
 msgstr "analyse des conflits: cible '%s' comparée à la base"
 
-#. conflict
-#. confict
-#: ../conflict.c:80 ../conflict.c:94
+#: lib/libalpm/conflict.c:87 lib/libalpm/conflict.c:101
 #, c-format
 msgid "targs vs db: found %s as a conflict for %s"
 msgstr "comparaison cibles / base de données : trouve %s comme conflit pour %s"
 
-#. CHECK 2: check targets against targets
-#: ../conflict.c:107
+#: lib/libalpm/conflict.c:114
 #, c-format
 msgid "checkconflicts: targ '%s' vs targs"
 msgstr "analyse des conflits: cible '%s' comparée aux cibles"
 
-#. otp is listed in tp's conflict list
-#: ../conflict.c:116 ../conflict.c:129
+#: lib/libalpm/conflict.c:123 lib/libalpm/conflict.c:136
 #, c-format
 msgid "targs vs targs: found %s as a conflict for %s"
 msgstr "comparaison cible / liste de cibles : trouve %s comme conflit pour %s"
 
-#. CHECK 3: check database against targets
-#: ../conflict.c:143
+#: lib/libalpm/conflict.c:150
 #, c-format
 msgid "checkconflicts: db vs targ '%s'"
 msgstr "analyse des conflits: base de donnes comparée a la cible '%s'"
 
-#: ../conflict.c:170 ../conflict.c:185
+#: lib/libalpm/conflict.c:177 lib/libalpm/conflict.c:192
 #, c-format
 msgid "db vs targs: found %s as a conflict for %s"
 msgstr "comparaison base de donnée / cibles: trouve %s en conflit avec %s"
 
-#: ../conflict.c:234 ../conflict.c:335 ../deps.c:54 ../deps.c:601
-#: ../deps.c:641 ../group.c:42 ../handle.c:62 ../package.c:98 ../sync.c:65
-#: ../sync.c:635 ../sync.c:651 ../sync.c:747 ../trans.c:49 ../util.c:598
-#: ../util.c:605
+#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
+#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr "problème malloc: n'a pas pu allouer %d bytes"
 
-#: ../db.c:57 ../db.c:64
+#: lib/libalpm/db.c:62 lib/libalpm/db.c:69
 #, c-format
 msgid "malloc failed: could not allocate %d bytes"
 msgstr "malloc à echoué: n'a pas pu allouer %d bytes"
 
-#: ../deps.c:118
+#: lib/libalpm/db.c:163
+msgid "attempt to re-register the 'local' DB"
+msgstr ""
+
+#: lib/libalpm/db.c:171
+#, c-format
+msgid "attempt to re-register the '%s' database, using existing"
+msgstr ""
+
+#: lib/libalpm/db.c:177
+#, c-format
+msgid "registering database '%s'"
+msgstr "enregistre la base de données '%s'"
+
+#: lib/libalpm/db.c:182
+#, c-format
+msgid "database directory '%s' does not exist -- try creating it"
+msgstr ""
+"le répertoire de base de données '%s' n'existe pas -- tentative de création"
+
+#: lib/libalpm/db.c:193
+#, c-format
+msgid "opening database '%s'"
+msgstr "ouvre la base de données '%s'"
+
+#: lib/libalpm/deps.c:128
 msgid "started sorting dependencies"
 msgstr "début du tri des dépendances"
 
-#: ../deps.c:123
+#: lib/libalpm/deps.c:133
 msgid "possible dependency cycle detected"
 msgstr "possible cycle de dépendances détecte"
 
-#: ../deps.c:166
+#: lib/libalpm/deps.c:178
 msgid "sorting dependencies finished"
 msgstr "fin du tri des dépendances"
 
-#: ../deps.c:260 ../deps.c:406
+#: lib/libalpm/deps.c:219 lib/libalpm/deps.c:276
+msgid "null package found in package list"
+msgstr ""
+
+#: lib/libalpm/deps.c:224
+#, fuzzy, c-format
+msgid "cannot find package installed '%s'"
+msgstr "ne peut ouvrir le fichier de paquet"
+
+#: lib/libalpm/deps.c:258 lib/libalpm/deps.c:379
 #, c-format
 msgid "checkdeps: found %s as required by %s"
 msgstr "analyse des dépendances: trouve %s comme besoin pour %s"
 
-#: ../deps.c:370
+#: lib/libalpm/deps.c:284
+#, fuzzy, c-format
+msgid "no dependencies for target '%s'"
+msgstr "ne peut résoudre les dépendances pour \"%s\""
+
+#: lib/libalpm/deps.c:330
 #, c-format
 msgid "checkdeps: found %s as a dependency for %s"
 msgstr "analyse des dépendances: trouve %s comme dépendance pour %s"
 
-#: ../deps.c:494
+#: lib/libalpm/deps.c:478
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr "ne peut trouver le paquet \"%s\" ou quoique ce soit qui le fournisse!"
 
-#: ../deps.c:499
+#: lib/libalpm/deps.c:483
 msgid "dep is NULL!"
 msgstr "dep est NULL!"
 
-#: ../deps.c:511
+#: lib/libalpm/deps.c:498
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr "exclue %s -- explicitement installe"
 
-#. add it to the target list
-#: ../deps.c:528
+#: lib/libalpm/deps.c:515
 #, c-format
 msgid "loading ALL info for '%s'"
 msgstr "chargement de TOUTES les infos pour '%s'"
 
-#: ../deps.c:531
+#: lib/libalpm/deps.c:518
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr "ajoute '%s' aux cibles"
 
-#: ../deps.c:573
+#: lib/libalpm/deps.c:546
+#, fuzzy
+msgid "started resolving dependencies"
+msgstr "début du tri des dépendances"
+
+#: lib/libalpm/deps.c:564
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr "%s fourni la dépendance %s -- ignore"
 
-#: ../deps.c:597
+#: lib/libalpm/deps.c:589
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
@@ -618,754 +726,733 @@ msgstr ""
 "ne peut résoudre les dépendances pour \"%s\" (\"%s\" n'est pas dans le jeu "
 "de paquet)"
 
-#. this dep is already in the target list
-#: ../deps.c:614
+#: lib/libalpm/deps.c:606
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr "la dépendance %s est déjà dans la liste de cible -- ignorée"
 
-#: ../deps.c:634
+#: lib/libalpm/deps.c:626
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr "récupère la dépendance %s (requise par %s)"
 
-#: ../deps.c:638
+#: lib/libalpm/deps.c:630
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr "ne peut résoudre les dépendances pour \"%s\""
 
-#. cycle detected -- skip it
-#: ../deps.c:654
+#: lib/libalpm/deps.c:646
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr "cycle de dépendances détecte: %s"
 
-#: ../error.c:34
+#: lib/libalpm/deps.c:650
+#, fuzzy
+msgid "finished resolving dependencies"
+msgstr "début du tri des dépendances"
+
+#: lib/libalpm/error.c:34
 msgid "out of memory!"
 msgstr "dépassement de mémoire!"
 
-#: ../error.c:36 ../error.c:135
-msgid "unexpected error"
+#: lib/libalpm/error.c:36
+#, fuzzy
+msgid "unexpected system error"
 msgstr "erreur non prévue"
 
-#: ../error.c:38
+#: lib/libalpm/error.c:38
 msgid "insufficient privileges"
 msgstr "autorisation insuffisante"
 
-#: ../error.c:40
+#: lib/libalpm/error.c:40
 msgid "wrong or NULL argument passed"
 msgstr "mauvais argument ou NULL passé"
 
-#: ../error.c:42
+#: lib/libalpm/error.c:42
 msgid "could not find or read file"
 msgstr "ne peut trouver ou lire le fichier"
 
-#: ../error.c:45
+#: lib/libalpm/error.c:45
 msgid "library not initialized"
 msgstr "librairie non initialisée"
 
-#: ../error.c:47
+#: lib/libalpm/error.c:47
 msgid "library already initialized"
 msgstr "librairie déjà initialisée"
 
-#: ../error.c:49
+#: lib/libalpm/error.c:49
 msgid "unable to lock database"
 msgstr "incapable de verrouiller la base de données"
 
-#: ../error.c:52
+#: lib/libalpm/error.c:52
 msgid "could not open database"
 msgstr "n'a pas pu ouvrir la base de données"
 
-#: ../error.c:54
+#: lib/libalpm/error.c:54
 msgid "could not create database"
 msgstr "n'a pas pu créer la base de données"
 
-#: ../error.c:56
+#: lib/libalpm/error.c:56
 msgid "database not initialized"
 msgstr "base de données non initialisée"
 
-#: ../error.c:58
+#: lib/libalpm/error.c:58
 msgid "database already registered"
 msgstr "base de données déjà enregistrées"
 
-#: ../error.c:60
+#: lib/libalpm/error.c:60
 msgid "could not find database"
 msgstr "n'a pas pu trouver la base de données"
 
-#: ../error.c:62
+#: lib/libalpm/error.c:62
 msgid "could not update database"
 msgstr "n'a pas pu mettre a jour la base de données"
 
-#: ../error.c:64
+#: lib/libalpm/error.c:64
 msgid "could not remove database entry"
 msgstr "n'a pas pu retirer l'entrée de base de données"
 
-#: ../error.c:71
+#: lib/libalpm/error.c:71
 msgid "could not set parameter"
 msgstr "n'a pas pu définir le paramètre"
 
-#: ../error.c:74 ../error.c:80
+#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
 msgid "transaction not initialized"
 msgstr "transaction non initialisée"
 
-#: ../error.c:76
+#: lib/libalpm/error.c:76
 msgid "transaction already initialized"
 msgstr "transaction déjà initialisée"
 
-#: ../error.c:78
+#: lib/libalpm/error.c:78
 msgid "duplicate target"
 msgstr "cible répétée"
 
-#: ../error.c:82
+#: lib/libalpm/error.c:82
 msgid "transaction not prepared"
 msgstr "transaction non préparée"
 
-#: ../error.c:84
+#: lib/libalpm/error.c:84
 msgid "transaction aborted"
 msgstr "transaction annulée"
 
-#: ../error.c:86
+#: lib/libalpm/error.c:86
 msgid "operation not compatible with the transaction type"
 msgstr "opération incompatible avec le type de transaction"
 
-#: ../error.c:89
+#: lib/libalpm/error.c:89
 msgid "could not find or read package"
 msgstr "ne peut trouver ou lire le paquet"
 
-#: ../error.c:91
+#: lib/libalpm/error.c:91
 msgid "invalid or corrupted package"
 msgstr "paquet invalide ou corrompu"
 
-#: ../error.c:93
+#: lib/libalpm/error.c:93
 msgid "cannot open package file"
 msgstr "ne peut ouvrir le fichier de paquet"
 
-#: ../error.c:95
+#: lib/libalpm/error.c:95
 msgid "cannot load package data"
 msgstr "ne peut charger les données du paquet"
 
-#: ../error.c:97
+#: lib/libalpm/error.c:97
 msgid "package already installed"
 msgstr "paquet déjà installé"
 
-#: ../error.c:99
+#: lib/libalpm/error.c:99
 msgid "package not installed or lesser version"
 msgstr "paquet non installé ou version plus ancienne"
 
-#: ../error.c:101
+#: lib/libalpm/error.c:101
 msgid "package name is not valid"
 msgstr "nom de paquet invalide"
 
-#: ../error.c:103
+#: lib/libalpm/error.c:103
 msgid "corrupted package"
 msgstr "paquet corrompu"
 
-#: ../error.c:106
+#: lib/libalpm/error.c:105
+msgid "no such repository"
+msgstr ""
+
+#: lib/libalpm/error.c:108
 msgid "group not found"
 msgstr "groupe non trouvé"
 
-#: ../error.c:109
+#: lib/libalpm/error.c:111
 msgid "could not satisfy dependencies"
 msgstr "n'a pas pu satisfaire les dépendances"
 
-#: ../error.c:111
+#: lib/libalpm/error.c:113
 msgid "conflicting dependencies"
 msgstr "conflit de dépendances"
 
-#: ../error.c:113
+#: lib/libalpm/error.c:115
 msgid "conflicting files"
 msgstr "conflit de fichier"
 
-#: ../error.c:116
+#: lib/libalpm/error.c:118
 msgid "user aborted"
 msgstr "annulation utilisateur"
 
-#: ../error.c:118
+#: lib/libalpm/error.c:120
 msgid "libarchive error"
 msgstr "erreur de libarchive"
 
-#: ../error.c:120
+#: lib/libalpm/error.c:122
 msgid "internal error"
 msgstr "erreur interne"
 
-#: ../error.c:122
+#: lib/libalpm/error.c:124
 msgid "not enough space"
 msgstr ""
 
-#: ../error.c:124
+#: lib/libalpm/error.c:126
 msgid "not confirmed"
 msgstr ""
 
-#: ../error.c:127
+#: lib/libalpm/error.c:129
 msgid "bad section name"
 msgstr ""
 
-#: ../error.c:129
+#: lib/libalpm/error.c:131
 msgid "'local' is reserved and cannot be used as a package tree"
 msgstr ""
 
-#: ../error.c:131
+#: lib/libalpm/error.c:133
 #, fuzzy
 msgid "syntax error"
 msgstr "erreur interne"
 
-#: ../error.c:133
+#: lib/libalpm/error.c:135
 msgid "all directives must belong to a section"
 msgstr ""
 
-#: ../handle.c:143
-#, c-format
-msgid "PM_OPT_DBPATH set to '%s'"
-msgstr "PM_OPT_DBPATH défini à '%s'"
-
-#: ../handle.c:150
-#, c-format
-msgid "PM_OPT_CACHEDIR set to '%s'"
-msgstr "PM_OPT_CACHEDIR défini à '%s'"
-
-#: ../handle.c:167
-#, c-format
-msgid "can't open log file %s"
-msgstr "ne peut ouvrir le fichier de log %s"
-
-#: ../handle.c:171
-#, c-format
-msgid "PM_OPT_LOGFILE set to '%s'"
-msgstr "PM_OPT_LOGFILE défini à '%s'"
-
-#: ../handle.c:176
-#, c-format
-msgid "'%s' added to PM_OPT_NOUPGRADE"
-msgstr "'%s' ajouté à PM_OPT_NOUPGRADE"
-
-#: ../handle.c:179
-msgid "PM_OPT_NOUPGRADE flushed"
-msgstr "PM_OPT_NOUPGRADE rechargé"
-
-#: ../handle.c:185
-#, c-format
-msgid "'%s' added to PM_OPT_NOEXTRACT"
-msgstr "'%s' ajouté à PM_OPT_NOEXTRACT"
-
-#: ../handle.c:188
-msgid "PM_OPT_NOEXTRACT flushed"
-msgstr "PM_OPT_NOEXTRACT rechargé"
-
-#: ../handle.c:194
-#, c-format
-msgid "'%s' added to PM_OPT_IGNOREPKG"
-msgstr "'%s' ajouté à PM_OPT_IGNOREPKG"
-
-#: ../handle.c:197
-msgid "PM_OPT_IGNOREPKG flushed"
-msgstr "PM_OPT_IGNOREPKG rechargé"
-
-#: ../handle.c:203
-#, fuzzy, c-format
-msgid "'%s' added to PM_OPT_HOLDPKG"
-msgstr "'%s' ajouté à PM_OPT_IGNOREPKG"
+#: lib/libalpm/error.c:137
+msgid "invalid regular expression"
+msgstr ""
 
-#: ../handle.c:206
+#: lib/libalpm/error.c:139
 #, fuzzy
-msgid "PM_OPT_HOLDPKG flushed"
-msgstr "PM_OPT_IGNOREPKG rechargé"
-
-#: ../handle.c:222
-#, c-format
-msgid "PM_OPT_USESYSLOG set to '%d'"
-msgstr "PM_OPT_USESYSLOG défini à '%d'"
-
-#: ../handle.c:262
-#, c-format
-msgid "PM_OPT_LOGMASK set to '%02x'"
-msgstr "PM_OPT_LOGMASK défini à '%02x'"
-
-#: ../handle.c:281
-#, fuzzy, c-format
-msgid "PM_OPT_PROXYHOST set to '%s'"
-msgstr "PM_OPT_DBPATH défini à '%s'"
-
-#: ../handle.c:285
-#, fuzzy, c-format
-msgid "PM_OPT_PROXYPORT set to '%d'"
-msgstr "PM_OPT_DBPATH défini à '%s'"
-
-#: ../handle.c:296
-#, fuzzy, c-format
-msgid "PM_OPT_XFERCOMMAND set to '%s'"
-msgstr "PM_OPT_CACHEDIR défini à '%s'"
+msgid "connection to remote host failed"
+msgstr "ne peut effacer le fichier %s"
 
-#: ../handle.c:300
-#, fuzzy, c-format
-msgid "PM_OPT_NOPASSIVEFTP set to '%d'"
-msgstr "PM_OPT_DBPATH défini à '%s'"
+#: lib/libalpm/error.c:141
+msgid "forking process failed"
+msgstr ""
 
-#: ../handle.c:304
-#, fuzzy, c-format
-msgid "PM_OPT_CHOMP set to '%d'"
-msgstr "PM_OPT_CACHEDIR défini à '%s'"
+#: lib/libalpm/error.c:143
+msgid "unexpected error"
+msgstr "erreur non prévue"
 
-#: ../md5driver.c:48 ../sha1.c:395
+#: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398
 #, c-format
 msgid "%s can't be opened\n"
 msgstr "%s ne peut etre ouvert\n"
 
-#: ../package.c:185
-#, c-format
-msgid "could not open file %s"
-msgstr "ne peut ouvrir le fichier %s"
-
-#: ../package.c:202 ../package.c:262
+#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr "%s: erreur de syntaxe dans le fichier de description à la ligne %d"
 
-#: ../package.c:319
+#: lib/libalpm/package.c:331
 msgid "could not parse the package description file"
 msgstr "n'a pas pu analyser le fichier de description"
 
-#: ../package.c:327
+#: lib/libalpm/package.c:335
 #, c-format
 msgid "missing package name in %s"
 msgstr "nom de paquet manquant dans %s"
 
-#: ../package.c:335
+#: lib/libalpm/package.c:339
 #, c-format
 msgid "missing package version in %s"
 msgstr "version de paquet manquant dans %s"
 
-#: ../package.c:374
+#: lib/libalpm/package.c:374
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr "ne peut effacer le fichier temporaire %s"
 
-#: ../package.c:391
-#, c-format
-msgid "bad package file in %s"
-msgstr "mauvais fichier de paquet dans %s"
+#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#, fuzzy, c-format
+msgid "error while reading package: %s"
+msgstr "mise a jour du paquet %s-%s"
 
-#: ../package.c:399
-#, c-format
-msgid "missing package info file in %s"
+#: lib/libalpm/package.c:400
+#, fuzzy
+msgid "missing package metadata"
+msgstr "nom de paquet manquant dans %s"
+
+#: lib/libalpm/package.c:407
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one"
 msgstr "fichier d'information manquant dans le paquet %s"
 
-#: ../remove.c:76
+#: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
 msgstr "ne peut trouver %s dans la base de données"
 
-#: ../remove.c:88
+#: lib/libalpm/remove.c:92
 #, c-format
 msgid "adding %s in the targets list"
 msgstr "ajoute %s dans la liste de cibles"
 
-#: ../remove.c:114
+#: lib/libalpm/remove.c:120
 #, c-format
 msgid "pulling %s in the targets list"
 msgstr "envoie %s dans la liste de destination"
 
-#: ../remove.c:117
+#: lib/libalpm/remove.c:123
 #, c-format
 msgid "could not find %s in database -- skipping"
 msgstr "ne peut trouver %s dans la base de données -- ignoré"
 
-#: ../remove.c:135
+#: lib/libalpm/remove.c:141
 msgid "finding removable dependencies"
 msgstr "trouve les dépendances dispensables"
 
-#: ../remove.c:180
-#, c-format
-msgid "removing package %s-%s"
-msgstr "retrait du paquet %s-%s"
-
-#: ../remove.c:191
-msgid "removing files"
-msgstr "efface les fichiers"
-
-#: ../remove.c:217
+#: lib/libalpm/remove.c:193
 #, c-format
 msgid "file %s does not exist"
 msgstr "le fichier %s n'existe pas"
 
-#. this is okay, other packages are probably using it.
-#: ../remove.c:223
+#: lib/libalpm/remove.c:199
 #, c-format
 msgid "keeping directory %s"
 msgstr "conserve le répertoire %s"
 
-#: ../remove.c:225
+#: lib/libalpm/remove.c:201
 #, c-format
 msgid "removing directory %s"
 msgstr "efface le répertoire %s"
 
-#: ../remove.c:239
+#: lib/libalpm/remove.c:215
 #, c-format
 msgid "skipping removal of %s as it has moved to another package"
 msgstr "ignore l'effacement de %s car il a été déplacé dans un autre paquet"
 
-#: ../remove.c:251 ../remove.c:252
+#: lib/libalpm/remove.c:227
 #, c-format
 msgid "%s saved as %s"
 msgstr "%s sauve en tant que %s"
 
-#: ../remove.c:254 ../remove.c:261
+#: lib/libalpm/remove.c:231
 #, c-format
 msgid "unlinking %s"
 msgstr "suppression %s"
 
-#: ../remove.c:256 ../remove.c:266
-#, c-format
-msgid "cannot remove file %s"
+#: lib/libalpm/remove.c:237
+#, fuzzy, c-format
+msgid "cannot remove file %s: %s"
 msgstr "ne peut effacer le fichier %s"
 
-#: ../remove.c:285
+#: lib/libalpm/remove.c:265
+#, c-format
+msgid "removing package %s-%s"
+msgstr "retrait du paquet %s-%s"
+
+#: lib/libalpm/remove.c:276
+msgid "removing files"
+msgstr "efface les fichiers"
+
+#: lib/libalpm/remove.c:294
 #, c-format
 msgid "removing database entry '%s'"
 msgstr "ne peut effacer l'entrée de base de de données %s"
 
-#: ../remove.c:287
+#: lib/libalpm/remove.c:296
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr "ne peut retirer l'entrée de base de donnée %s-%s"
 
-#: ../remove.c:290
+#: lib/libalpm/remove.c:299
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr "ne peut retirer l'entrée '%s' du cache"
 
-#: ../remove.c:330
+#: lib/libalpm/remove.c:333
+#, fuzzy, c-format
+msgid "could not find dependency '%s' for removal"
+msgstr "n'a pas pu trouver la dépendance '%s'"
+
+#: lib/libalpm/remove.c:343
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr "mise à jour du champ 'requit par' pour le paquet '%s'"
 
-#. check for "recommended" package replacements
-#: ../sync.c:160
-msgid "checking for package replacements"
-msgstr "vérification des remplacements pour le paquet"
-
-#: ../sync.c:169
-#, c-format
-msgid "checking replacement '%s' for package '%s'"
-msgstr "analyse du remplacement '%s' pour le paquet '%s'"
-
-#: ../sync.c:171
-#, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
-msgstr "%s-%s: ignore la mise a jour du paquet (à remplacer par %s-%s)"
-
-#: ../sync.c:205
-#, c-format
-msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
-msgstr "%s-%s sélectionné pour mise à jour (à remplacer par %s-%s)"
-
-#. match installed packages with the sync dbs and compare versions
-#: ../sync.c:217
+#: lib/libalpm/sync.c:200
 msgid "checking for package upgrades"
 msgstr "vérification des mises à jour de paquets"
 
-#: ../sync.c:229
-#, c-format
-msgid "'%s' not found in sync db -- skipping"
-msgstr "'%s' non trouvé dans la liste de synchronisation -- ignoré"
-
-#: ../sync.c:243 ../sync.c:530
-#, c-format
-msgid "'%s' is already elected for removal -- skipping"
-msgstr "'%s' est déjà sélectionné pour retrait -- ignoré"
-
-#. local version is newer
-#: ../sync.c:252
-#, c-format
-msgid "%s-%s: local version is newer"
-msgstr "%s-%s: la version locale est plus récente"
-
-#. package should be ignored (IgnorePkg)
-#: ../sync.c:258
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: ignore la mise à jour du paquet (%s)"
-
-#. package too new (UpgradeDelay)
-#: ../sync.c:262
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: repousse la mise à jour du paquet (%s)\n"
-
-#: ../sync.c:266
-#, c-format
-msgid "%s-%s elected for upgrade (%s => %s)"
-msgstr "%s-%s sélectionné pour mise à jour (%s => %s)"
+#: lib/libalpm/sync.c:278
+#, fuzzy, c-format
+msgid "searching for target in repo '%s'"
+msgstr "charge la cible  '%s'"
 
-#. Search provides
-#: ../sync.c:317 ../sync.c:336
+#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr "cible '%s' non trouvée -- recherche des dispositions"
 
-#: ../sync.c:322 ../sync.c:341
+#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr "trouvé '%s' comme disposition pour '%s'"
 
-#: ../sync.c:360
-#, c-format
-msgid "%s-%s: local version is newer -- skipping"
-msgstr "%s-%s: la version locale est plus récente -- ignoré"
+#: lib/libalpm/sync.c:299
+#, fuzzy, c-format
+msgid "repository '%s' not found"
+msgstr "groupe non trouvé"
 
-#: ../sync.c:368
+#: lib/libalpm/sync.c:333
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr "%s-%s est à jour -- ignoré"
 
-#: ../sync.c:388
+#: lib/libalpm/sync.c:353
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr "ajout de la cible '%s' au jeu de transaction"
 
-#: ../sync.c:433
-msgid "resolving targets dependencies"
+#: lib/libalpm/sync.c:401
+#, fuzzy
+msgid "resolving target's dependencies"
 msgstr "résolution des dépendances pour les cibles"
 
-#: ../sync.c:453
+#: lib/libalpm/sync.c:421
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr "ajout du paquet %s-%s à la liste de transactions"
 
-#: ../sync.c:485
+#: lib/libalpm/sync.c:456
 msgid "looking for unresolvable dependencies"
 msgstr "recherche de dépendancea non soluble"
 
-#: ../sync.c:515
+#: lib/libalpm/sync.c:487
 #, c-format
 msgid "package '%s' is conflicting with '%s'"
 msgstr "le paquet '%s' est en conflit avec '%s'"
 
-#: ../sync.c:537
+#: lib/libalpm/sync.c:509
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr "'%s' non trouve dans le jeu de transaction -- ignoré"
 
-#. so just treat it like a "replaces" item so the REQUIREDBY
-#. * fields are inherited properly.
-#.
-#: ../sync.c:548
+#: lib/libalpm/sync.c:520
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr "le paquet '%s' génère son propre conflit"
 
-#: ../sync.c:571 ../sync.c:576
+#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr "'%s' est dans la la liste de cibles -- conservation"
 
-#: ../sync.c:588 ../sync.c:625
+#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
 #, c-format
 msgid "removing '%s' from target list"
 msgstr "retire '%s' de la liste de cibles"
 
-#. It's a conflict -- see if they want to remove it
-#.
-#: ../sync.c:597
+#: lib/libalpm/sync.c:569
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr "résolution du conflit de paquet '%s'"
 
-#. append to the replaces list
-#: ../sync.c:620
+#: lib/libalpm/sync.c:592
 #, c-format
 msgid "electing '%s' for removal"
 msgstr "sélection de  '%s' pour retrait"
 
-#. abort
-#: ../sync.c:631 ../sync.c:647
+#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
 msgid "unresolvable package conflicts detected"
 msgstr "conflit de paquets non soluble détecté"
 
-#: ../sync.c:699
+#: lib/libalpm/sync.c:671
 msgid "checking dependencies of packages designated for removal"
 msgstr "analyse des dépendances pour les paquets marques à retirer"
 
-#: ../sync.c:713
+#: lib/libalpm/sync.c:685
 msgid "something has gone horribly wrong"
 msgstr "quelque chose s'est horriblement mal passé"
 
-#. found matching provisio -- we're good to go
-#: ../sync.c:732
+#: lib/libalpm/sync.c:704
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr "trouvé '%s' comme disposition pour '%s' -- conflit annulé"
 
-#: ../sync.c:825
+#: lib/libalpm/sync.c:800
 #, c-format
-msgid "%s-%s-%s%s is already in the cache\n"
+msgid "%s is already in the cache\n"
 msgstr ""
 
-#. no cache directory.... try creating it
-#: ../sync.c:837
+#: lib/libalpm/sync.c:811
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: ../sync.c:838
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#. couldn't mkdir the cache directory, so fall back to /tmp and unlink
-#. * the package afterwards.
-#.
-#: ../sync.c:843
+#: lib/libalpm/sync.c:817
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: ../sync.c:844
+#: lib/libalpm/sync.c:818
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: ../sync.c:847
-#, c-format
-msgid "failed to set option CACHEDIR (%s)\n"
-msgstr ""
-
-#: ../sync.c:854
+#: lib/libalpm/sync.c:825
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: ../sync.c:883 ../sync.c:895
+#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr "ne peut obtenir la 'signature' md5 ou sha1 pour le paquet %s\n"
 
-#: ../sync.c:914
+#: lib/libalpm/sync.c:885
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr "l'archive %s était corrompue (mauvaise somme MD5 ou SHA1)\n"
 
-#: ../sync.c:916
+#: lib/libalpm/sync.c:887
 #, 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"
 
-#: ../sync.c:936
+#: lib/libalpm/sync.c:908
 msgid "could not create removal transaction"
 msgstr "n'a pas pu créer la transaction de retrait"
 
-#: ../sync.c:942
+#: lib/libalpm/sync.c:914
 msgid "could not initialize the removal transaction"
 msgstr "n'a pas pu initialiser la transaction de retrait"
 
-#: ../sync.c:962
+#: lib/libalpm/sync.c:934
 msgid "removing conflicting and to-be-replaced packages"
 msgstr "efface les paquets en conflit et ceux à remplacer"
 
-#: ../sync.c:964
+#: lib/libalpm/sync.c:936
 msgid "could not prepare removal transaction"
 msgstr "n'a pas pu préparer la transaction de retrait"
 
-#: ../sync.c:970
+#: lib/libalpm/sync.c:942
 msgid "could not commit removal transaction"
 msgstr "n'a pas pu appliquer la transaction de retrait"
 
-#. install targets
-#: ../sync.c:977
+#: lib/libalpm/sync.c:949
 msgid "installing packages"
 msgstr "installe les paquets"
 
-#: ../sync.c:980
+#: lib/libalpm/sync.c:952
 msgid "could not create transaction"
 msgstr "n'a pas pu créer la transaction"
 
-#: ../sync.c:985
+#: lib/libalpm/sync.c:957
 msgid "could not initialize transaction"
 msgstr "n'a pas pu initialiser la transaction"
 
-#: ../sync.c:1004
+#: lib/libalpm/sync.c:980
 msgid "could not prepare transaction"
 msgstr "n'a pas pu préparer la transaction"
 
-#: ../sync.c:1009
+#: lib/libalpm/sync.c:985
 msgid "could not commit transaction"
 msgstr "n'a pas pu appliquer la transaction"
 
-#: ../sync.c:1016
+#: lib/libalpm/sync.c:992
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 "mise a jour de la base de données concernant les dépendances de paquets "
 "remplaces"
 
-#: ../sync.c:1045
+#: lib/libalpm/sync.c:1021
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""
 "n'a pas pu mettre a jour les pré-requis pour l'entrée de base de données %s-%"
 "s"
 
-#: ../sync.c:1054
+#: lib/libalpm/sync.c:1030
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr "n'a pu mettre a jour la nouvelle entrée de base de données %s-%s"
 
-#: ../util.c:285
+#: lib/libalpm/util.c:278
+#, fuzzy, c-format
+msgid "could not open %s: %s\n"
+msgstr "ne peut ouvrir le fichier %s"
+
+#: lib/libalpm/util.c:291
 #, c-format
 msgid "could not extract %s: %s\n"
 msgstr "n'a pas pu extraire %s: %s\n"
 
-#: ../util.c:436
+#: lib/libalpm/util.c:349
+#, fuzzy, c-format
+msgid "logaction called: %s"
+msgstr "original:   %s"
+
+#: lib/libalpm/util.c:441
 msgid "could not create temp directory"
 msgstr "n'a pas pu créer le répertoire temporaire"
 
-#: ../util.c:463
+#: lib/libalpm/util.c:468
 #, c-format
 msgid "could not change directory to %s (%s)"
 msgstr "n'a pas pu changer de répertoire pour %s (%s)"
 
-#: ../util.c:466
+#: lib/libalpm/util.c:471
 #, c-format
 msgid "executing %s script..."
 msgstr "exécute le script %s ..."
 
-#: ../util.c:479
+#: lib/libalpm/util.c:484
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr "n'a pas pu générer un nouveau processus (%s)"
 
-#: ../util.c:486
+#: lib/libalpm/util.c:491
 #, c-format
 msgid "chrooting in %s"
 msgstr "chroot dans %s"
 
-#: ../util.c:488
+#: lib/libalpm/util.c:493
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr "n'a pas pu changer le répertoire racine (%s)"
 
-#: ../util.c:492
+#: lib/libalpm/util.c:497
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr "n'a pas pu changer de répertoire vers / (%s)"
 
-#: ../util.c:496
+#: lib/libalpm/util.c:501
 #, c-format
 msgid "executing \"%s\""
 msgstr "exécute \"%s\""
 
-#: ../util.c:499
+#: lib/libalpm/util.c:504
 #, fuzzy, c-format
 msgid "call to popen failed (%s)"
 msgstr "la demande de mise en attente du pid a échouée (%s)"
 
-#: ../util.c:521
+#: lib/libalpm/util.c:529
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr "la demande de mise en attente du pid a échouée (%s)"
 
-#: ../util.c:529
+#: lib/libalpm/util.c:537
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr "n'a pas pu effacer tmpdir %s"
 
-#: ../util.c:593
+#: lib/libalpm/util.c:594
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
+
+#: lib/libalpm/versioncmp.c:277
+#, c-format
+msgid "depcmp: %s-%s %s %s-%s => %s"
+msgstr ""
+
+#: lib/libalpm/versioncmp.c:281
+#, c-format
+msgid "depcmp: %s-%s %s %s => %s"
+msgstr ""
+
+#~ msgid "unpacking %s"
+#~ msgstr "décompacte %s"
+
+#~ msgid "loading SCRIPLET info for '%s'"
+#~ msgstr "charge les infos de SCRIPLET pour '%s'"
+
+#, fuzzy
+#~ msgid "config: %s: server: %s\n"
+#~ msgstr "avertissement: %s sauve en tant que %s"
+
+#~ msgid "db_write: could not open file %s/desc"
+#~ msgstr "db_write: n'a pas pu ouvrir le fichier %s/desc"
+
+#~ msgid "db_write: could not open file %s/files"
+#~ msgstr "db_write: n'a pas pu ouvrir le fichier %s/files"
+
+#~ msgid "db_write: could not open file %s/depends"
+#~ msgstr "db_write: n' pas pu ouvrir le fichier %s/depends"
+
+#~ msgid "PM_OPT_DBPATH set to '%s'"
+#~ msgstr "PM_OPT_DBPATH défini à '%s'"
+
+#~ msgid "PM_OPT_CACHEDIR set to '%s'"
+#~ msgstr "PM_OPT_CACHEDIR défini à '%s'"
+
+#~ msgid "can't open log file %s"
+#~ msgstr "ne peut ouvrir le fichier de log %s"
+
+#~ msgid "PM_OPT_LOGFILE set to '%s'"
+#~ msgstr "PM_OPT_LOGFILE défini à '%s'"
+
+#~ msgid "'%s' added to PM_OPT_NOUPGRADE"
+#~ msgstr "'%s' ajouté à PM_OPT_NOUPGRADE"
+
+#~ msgid "PM_OPT_NOUPGRADE flushed"
+#~ msgstr "PM_OPT_NOUPGRADE rechargé"
+
+#~ msgid "'%s' added to PM_OPT_NOEXTRACT"
+#~ msgstr "'%s' ajouté à PM_OPT_NOEXTRACT"
+
+#~ msgid "PM_OPT_NOEXTRACT flushed"
+#~ msgstr "PM_OPT_NOEXTRACT rechargé"
+
+#~ msgid "'%s' added to PM_OPT_IGNOREPKG"
+#~ msgstr "'%s' ajouté à PM_OPT_IGNOREPKG"
+
+#~ msgid "PM_OPT_IGNOREPKG flushed"
+#~ msgstr "PM_OPT_IGNOREPKG rechargé"
+
+#, fuzzy
+#~ msgid "'%s' added to PM_OPT_HOLDPKG"
+#~ msgstr "'%s' ajouté à PM_OPT_IGNOREPKG"
+
+#, fuzzy
+#~ msgid "PM_OPT_HOLDPKG flushed"
+#~ msgstr "PM_OPT_IGNOREPKG rechargé"
+
+#~ msgid "PM_OPT_USESYSLOG set to '%d'"
+#~ msgstr "PM_OPT_USESYSLOG défini à '%d'"
+
+#~ msgid "PM_OPT_LOGMASK set to '%02x'"
+#~ msgstr "PM_OPT_LOGMASK défini à '%02x'"
+
+#, fuzzy
+#~ msgid "PM_OPT_PROXYHOST set to '%s'"
+#~ msgstr "PM_OPT_DBPATH défini à '%s'"
+
+#, fuzzy
+#~ msgid "PM_OPT_PROXYPORT set to '%d'"
+#~ msgstr "PM_OPT_DBPATH défini à '%s'"
+
+#, fuzzy
+#~ msgid "PM_OPT_XFERCOMMAND set to '%s'"
+#~ msgstr "PM_OPT_CACHEDIR défini à '%s'"
+
+#, fuzzy
+#~ msgid "PM_OPT_NOPASSIVEFTP set to '%d'"
+#~ msgstr "PM_OPT_DBPATH défini à '%s'"
+
+#, fuzzy
+#~ msgid "PM_OPT_CHOMP set to '%d'"
+#~ msgstr "PM_OPT_CACHEDIR défini à '%s'"
+
+#~ msgid "bad package file in %s"
+#~ msgstr "mauvais fichier de paquet dans %s"
+
+#~ msgid "%s-%s: local version is newer -- skipping"
+#~ msgstr "%s-%s: la version locale est plus récente -- ignoré"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index 1c73837d..176e0df2 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -1,325 +1,304 @@
 # translation of hu.po to Hungarian
 # Hungarian translations for libalpm package.
-# Copyright (C) 2006 THE libalpm'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the libalpm package.
-#
+# Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
 # Miklos Vajna <vmiklos@frugalware.org>, 2006.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: hu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 13:36+0200\n"
+"Project-Id-Version: Pacman package manager 3.0.0\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2007-02-06 20:43-0500\n"
 "PO-Revision-Date: 2006-09-03 13:49+0200\n"
 "Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
-"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../add.c:95
+#: lib/libalpm/add.c:95
 #, c-format
 msgid "could not parse token %s"
 msgstr "értelmezhetetlen token %s"
 
-#: ../add.c:127
+#: lib/libalpm/add.c:129
 #, c-format
 msgid "loading target '%s'"
 msgstr "cél betöltése '%s'"
 
-#: ../add.c:169
+#: lib/libalpm/add.c:175
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr "a %s-%s-t lecseréli a %s a cél listában"
 
-#: ../add.c:178
+#: lib/libalpm/add.c:184
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr "az újabb verzió (%s-%s) már elérhetõ a cél listában -- kihagyás"
 
-#: ../add.c:185
+#: lib/libalpm/add.c:191
 #, c-format
 msgid "reading '%s' metadata"
 msgstr "'%s' metaadat olvasása"
 
-#. look for unsatisfied dependencies
-#: ../add.c:227 ../remove.c:104
+#: lib/libalpm/add.c:244 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr "elégtelen függõségek keresése"
 
-#. no unsatisfied deps, so look for conflicts
-#: ../add.c:239 ../sync.c:504
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
 msgid "looking for conflicts"
 msgstr "konfliktusok keresése"
 
-#. re-order w.r.t. dependencies
-#: ../add.c:251 ../remove.c:140
+#: lib/libalpm/add.c:295 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr "rendezés függõségek szerint"
 
-#: ../add.c:263
+#: lib/libalpm/add.c:307
 msgid "cleaning up"
 msgstr "tisztítás"
 
-#: ../add.c:280
+#: lib/libalpm/add.c:324
 msgid "looking for file conflicts"
 msgstr "fájl konfliktusok keresése"
 
-#: ../add.c:345
+#: lib/libalpm/add.c:391
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr "csomag frissítése: %s-%s"
 
-#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304
+#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
 #, c-format
 msgid "loading FILES info for '%s'"
 msgstr "a FILE infó betöltése a '%s' számára"
 
-#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726
-#, c-format
-msgid "loading DESC info for '%s'"
-msgstr "a DESC infó betöltése a '%s' számára"
-
-#: ../add.c:378
+#: lib/libalpm/add.c:423
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr "elsõként a régi csomag eltávolítása (%s-%s)"
 
-#: ../add.c:408
+#: lib/libalpm/add.c:453
 #, c-format
 msgid "adding package %s-%s"
 msgstr "csomag hozzáadása %s-%s"
 
-#: ../add.c:419
+#: lib/libalpm/add.c:464
 #, c-format
 msgid "adding new package %s-%s"
 msgstr "új csomag hozzáadása %s-%s"
 
-#: ../add.c:423
+#: lib/libalpm/add.c:468
 msgid "extracting files"
 msgstr "fájlok kifejtése"
 
-#: ../add.c:438 ../util.c:456
+#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
 msgid "could not get current working directory"
 msgstr "a jelenlegi munkakönyvtár nem kapható meg"
 
-#: ../add.c:492
+#: lib/libalpm/add.c:529
 #, c-format
 msgid "notice: %s is in NoExtract -- skipping extraction"
 msgstr "figyelmeztetés: %s a NoExtractben van -- kifejtés kihagyása"
 
-#: ../add.c:528 ../add.c:681
+#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr "nem sikerült kifejteni: %s (%s)"
 
-#: ../add.c:571
+#: lib/libalpm/add.c:608
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr "md5 összegek vizsgálata a %s számára"
 
-#: ../add.c:572 ../add.c:579
+#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
 #, c-format
 msgid "current:  %s"
 msgstr "jelenlegi: %s"
 
-#: ../add.c:573 ../add.c:580
+#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
 #, c-format
 msgid "new:      %s"
 msgstr "új:       %s"
 
-#: ../add.c:575 ../add.c:582
+#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
 #, c-format
 msgid "original: %s"
 msgstr "eredeti:  %s"
 
-#: ../add.c:578
+#: lib/libalpm/add.c:615
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr "sha1 összegek vizsgálata a %s számára"
 
-#: ../add.c:596
+#: lib/libalpm/add.c:633
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr "nem sikerült átnevezni: %s (%s)"
 
-#: ../add.c:597
+#: lib/libalpm/add.c:634
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr "hiba: nem sikerült átnevezni: %s (%s)"
 
-#: ../add.c:601 ../add.c:645
+#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
 #, c-format
 msgid "could not copy %s to %s (%s)"
 msgstr "nem sikerült másolni: %s-t ide: %s (%s)"
 
-#: ../add.c:602
+#: lib/libalpm/add.c:639
 #, c-format
 msgid "error: could not copy %s to %s (%s)"
 msgstr "hiba: nem sikerült másolni: %s-t ide: %s (%s)"
 
-#: ../add.c:606
+#: lib/libalpm/add.c:643
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr "a %s elmentve %s.pacorig néven"
 
-#: ../add.c:607
+#: lib/libalpm/add.c:644
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "figyelmeztetés: a %s elmentve %s néven"
 
-#: ../add.c:617 ../add.c:620 ../add.c:626
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
 msgid "action: installing new file"
 msgstr "folyamat: az új fájl telepítése"
 
-#: ../add.c:624
+#: lib/libalpm/add.c:661
 msgid "action: leaving existing file in place"
 msgstr "folyamat: a jelenlegi fájl megtartása"
 
-#: ../add.c:630
+#: lib/libalpm/add.c:667
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 "folyamat: a jelenlegi fájl megtartása és az új .pacnew végzõdéssel való "
 "telepítése"
 
-#: ../add.c:634
+#: lib/libalpm/add.c:671
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr "nem sikerült telepíteni a %s-t %s-ként: %s"
 
-#: ../add.c:635
+#: lib/libalpm/add.c:672
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr "hiba: nem sikerült telepíteni a %s-t %s-ként: %s"
 
-#: ../add.c:637
+#: lib/libalpm/add.c:674
 #, c-format
 msgid "%s installed as %s"
 msgstr "a %s %s néven lett telepítve"
 
-#: ../add.c:638
+#: lib/libalpm/add.c:675
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr "figyelmeztetés: a %s néven %s lett telepítve"
 
-#: ../add.c:643 ../add.c:663
+#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
 #, c-format
 msgid "extracting %s"
 msgstr "a %s kifejtése"
 
-#: ../add.c:665
+#: lib/libalpm/add.c:702
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr "%s a NoUpgrade-ben van -- kihagyás"
 
-#: ../add.c:667
+#: lib/libalpm/add.c:704
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr "%s kifejtése %s.pacnew néven"
 
-#: ../add.c:668
+#: lib/libalpm/add.c:705
 #, c-format
 msgid "warning: extracting %s%s as %s"
 msgstr "figyelmeztetés: %s%s kifejtése %s.pacnew néven"
 
-#: ../add.c:682
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr "hiba: nem sikerült kifejteni: %s (%s)"
 
-#: ../add.c:693
+#: lib/libalpm/add.c:729
 msgid "appending backup entry"
 msgstr "hozzáfûzés a biztonsági bejegyzéshez"
 
-#: ../add.c:725 ../add.c:727
+#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr "hiba %s közben: %s"
 
-#: ../add.c:726 ../add.c:728
+#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
 msgid "upgrading"
 msgstr "frissítés"
 
-#: ../add.c:726 ../add.c:728
+#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
 msgid "installing"
 msgstr "telepítés"
 
-#: ../add.c:749 ../add.c:800
+#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr "a '%s' hozzáadása \"függ tõle\" mezõként a '%s' számára"
 
-#. remove the package from the database
-#: ../add.c:760 ../remove.c:284
+#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
 msgid "updating database"
 msgstr "az adatbázis frissítése"
 
-#: ../add.c:761
+#: lib/libalpm/add.c:796
 #, c-format
 msgid "adding database entry '%s'"
 msgstr "adatbázis mezõ hozzáadása '%s'"
 
-#: ../add.c:763
+#: lib/libalpm/add.c:798
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr "sikertelen a '%s-%s' adatbázis-bejegyzés frissítése"
 
-#: ../add.c:765
+#: lib/libalpm/add.c:800
 #, c-format
 msgid "error updating database for %s-%s!"
 msgstr "hiba a %s-%s adatbázis-frissítése során"
 
-#: ../add.c:769
+#: lib/libalpm/add.c:804
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz"
 
-#. update dependency packages' REQUIREDBY fields
-#: ../add.c:774 ../remove.c:294
+#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
 msgid "updating dependency packages 'requiredby' fields"
 msgstr "a függõ csomagok 'függ tõle' mezõjének frissítése"
 
-#: ../add.c:795 ../remove.c:322
+#: lib/libalpm/add.c:832
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr "nem található a '%s' függõség"
 
-#: ../add.c:803 ../remove.c:332
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
 #, 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"
 
-#: ../add.c:830 ../remove.c:345
+#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "az \"ldconfig -r %s\" futtatása"
 
-#: ../alpm.c:201
+#: lib/libalpm/alpm.c:113
 #, c-format
-msgid "registering database '%s'"
-msgstr "adatbázis regisztrálása: '%s'"
-
-#: ../alpm.c:206
-#, c-format
-msgid "database directory '%s' does not exist -- try creating it"
-msgstr "'%s' adatbázis-könyvtár nem létezik -- kísérlet a létrehozásra"
-
-#: ../alpm.c:217
-#, c-format
-msgid "opening database '%s'"
-msgstr "adatbázis megnyitása: '%s'"
+msgid "removing DB %s, %d remaining..."
+msgstr ""
 
-#: ../alpm.c:261
+#: lib/libalpm/alpm.c:178
 #, c-format
 msgid "unregistering database '%s'"
 msgstr "adatbázis eltávolítása: '%s'"
 
-#: ../alpm.c:266
+#: lib/libalpm/alpm.c:183
 #, c-format
 msgid "closing database '%s'"
 msgstr "adatbázis bezárása: '%s'"
 
-#: ../alpm.c:344
+#: lib/libalpm/alpm.c:229
 #, c-format
 msgid ""
 "adding new server to database '%s': protocol '%s', server '%s', path '%s'"
@@ -327,290 +306,424 @@ msgstr ""
 "új szerver hozzáadása a(z) '%s' adatbázishoz: protokoll '%s', szerver '%s', "
 "út '%s'"
 
-#: ../alpm.c:348
+#: lib/libalpm/alpm.c:233
 #, c-format
 msgid "serverlist flushed for '%s'"
 msgstr "a szerverlista ürítve a(z) '%s' számára"
 
-#: ../alpm.c:383
-#, c-format
-msgid "failed to get lastupdate time for %s (no big deal)\n"
-msgstr "nem sikerült megkapni az utolsó módosítási idõpontját a következõnek: %s "
+#: lib/libalpm/alpm.c:276
+#, fuzzy, c-format
+msgid "failed to get lastupdate time for %s (no big deal)"
+msgstr ""
+"nem sikerült megkapni az utolsó módosítási idõpontját a következõnek: %s "
 "(nincs sok esély)\n"
 
-#: ../alpm.c:402
+#: lib/libalpm/alpm.c:295
 #, c-format
-msgid "sync: new mtime for %s: %s\n"
+msgid "failed to sync db: %s [%d]"
+msgstr ""
+
+#: lib/libalpm/alpm.c:299
+#, fuzzy, c-format
+msgid "sync: new mtime for %s: %s"
 msgstr "szinkronizálás: új módosítási dátum a %s számára: %s\n"
 
-#. remove the old dir
-#: ../alpm.c:408
+#: lib/libalpm/alpm.c:305
 #, c-format
 msgid "flushing database %s/%s"
 msgstr "adatbázis frissítése: %s/%s"
 
-#: ../alpm.c:412
+#: lib/libalpm/alpm.c:309
 #, c-format
 msgid "could not remove database entry %s/%s"
 msgstr "sikertelen a %s/%s adatbázis-bejegyzés eltávolítása"
 
-#. uncompress the sync database
-#. ORE
-#. we should not simply unpack the archive, but better parse it and
-#. db_write each entry (see sync_load_dbarchive to get archive content)
-#: ../alpm.c:426
-#, c-format
-msgid "unpacking %s"
-msgstr "%s kitömörítése"
-
-#: ../alpm.c:574
-#, c-format
-msgid "loading SCRIPLET info for '%s'"
-msgstr "a SCRIPLET infó betöltése a '%s' számára"
+#: lib/libalpm/alpm.c:479
+#, fuzzy, c-format
+msgid "could not get sha1 checksum for package %s-%s"
+msgstr "sikertelen az sha1 ellenõrzõ összeg elérése a %s-%s csomag számára\n"
 
-#: ../alpm.c:673
+#: lib/libalpm/alpm.c:485 lib/libalpm/alpm.c:534
 #, c-format
-msgid "could not get sha1 checksum for package %s-%s\n"
-msgstr "sikertelen az sha1 ellenõrzõ összeg elérése a %s-%s csomag számára\n"
+msgid "loading DESC info for '%s'"
+msgstr "a DESC infó betöltése a '%s' számára"
 
-#: ../alpm.c:684 ../alpm.c:731
+#: lib/libalpm/alpm.c:490 lib/libalpm/alpm.c:539
 #, c-format
 msgid "checksums for package %s-%s are matching"
 msgstr "a %s-%s csomag ellenõrzõ összegei megegyeznek"
 
-#: ../alpm.c:687
-#, c-format
-msgid "sha1sums do not match for package %s-%s\n"
+#: lib/libalpm/alpm.c:493
+#, fuzzy, c-format
+msgid "sha1sums do not match for package %s-%s"
 msgstr "%s-%s csomag sha1 ellenõrzõ összegei nem egyeznek meg\n"
 
-#: ../alpm.c:720
-#, c-format
-msgid "could not get md5 checksum for package %s-%s\n"
+#: lib/libalpm/alpm.c:528
+#, fuzzy, c-format
+msgid "could not get md5 checksum for package %s-%s"
 msgstr "sikertelen az md5 ellenõrzõ összeg elérése a %s-%s csomag számára\n"
 
-#: ../alpm.c:734
-#, c-format
-msgid "md5sums do not match for package %s-%s\n"
+#: lib/libalpm/alpm.c:542
+#, fuzzy, c-format
+msgid "md5sums do not match for package %s-%s"
 msgstr "%s-%s csomag md5 ellenõrzõ összegei nem egyeznek meg\n"
 
-#: ../alpm.c:993
+#: lib/libalpm/alpm.c:791
 #, c-format
 msgid "could not remove lock file %s"
 msgstr "nem sikerült a zároló fájl (%s) eltávolítása"
 
-#: ../alpm.c:994
+#: lib/libalpm/alpm.c:792
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr "figyelmeztetés: nem sikerült a zároló fájl (%s) eltávolítása"
 
-#: ../alpm.c:1232
-#, c-format
-msgid "config: new section '%s'\n"
+#: lib/libalpm/alpm.c:929
+#, fuzzy, c-format
+msgid "config: new section '%s'"
 msgstr "beállítások: új szekció '%s'\n"
 
-#: ../alpm.c:1275
-msgid "config: usesyslog\n"
+#: lib/libalpm/alpm.c:958
+#, fuzzy
+msgid "config: nopassiveftp"
+msgstr "beállítások: nem fog frissülni: %s\n"
+
+#: lib/libalpm/alpm.c:961
+#, fuzzy
+msgid "config: usesyslog"
 msgstr "beállítások: syslog használata\n"
 
-#: ../alpm.c:1286
-#, c-format
-msgid "config: including %s\n"
+#: lib/libalpm/alpm.c:964
+#, fuzzy
+msgid "config: chomp"
+msgstr "beállítások: ez a csomag mindenképp meg lesz tartva: %s\n"
+
+#: lib/libalpm/alpm.c:967
+#, fuzzy
+msgid "config: usecolor"
+msgstr "beállítások: syslog használata\n"
+
+#: lib/libalpm/alpm.c:976
+#, fuzzy, c-format
+msgid "config: including %s"
 msgstr "beállítások: a %s beolvasása\n"
 
-#: ../alpm.c:1298 ../alpm.c:1306
-#, c-format
-msgid "config: noupgrade: %s\n"
+#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#, fuzzy, c-format
+msgid "config: noupgrade: %s"
 msgstr "beállítások: nem fog frissülni: %s\n"
 
-#: ../alpm.c:1316 ../alpm.c:1324
-#, c-format
-msgid "config: noextract: %s\n"
+#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#, fuzzy, c-format
+msgid "config: noextract: %s"
 msgstr "nem sikerült kifejteni: %s\n"
 
-#: ../alpm.c:1334 ../alpm.c:1342
-#, c-format
-msgid "config: ignorepkg: %s\n"
+#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#, fuzzy, c-format
+msgid "config: ignorepkg: %s"
 msgstr "beállítások: a %s csomag figyelmen kívül hagyása\n"
 
-#: ../alpm.c:1352 ../alpm.c:1360
-#, c-format
-msgid "config: holdpkg: %s\n"
+#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#, fuzzy, c-format
+msgid "config: holdpkg: %s"
 msgstr "beállítások: ez a csomag mindenképp meg lesz tartva: %s\n"
 
-#: ../alpm.c:1370
-#, c-format
-msgid "config: dbpath: %s\n"
+#: lib/libalpm/alpm.c:1037
+#, fuzzy, c-format
+msgid "config: dbpath: %s"
 msgstr "beállítások: adatbázis útvonala: %s\n"
 
-#: ../alpm.c:1380
-#, c-format
-msgid "config: cachedir: %s\n"
+#: lib/libalpm/alpm.c:1044
+#, fuzzy, c-format
+msgid "config: cachedir: %s"
 msgstr "beállítások: gyorsítótár könyvtára: %s\n"
 
-#: ../alpm.c:1386
-#, c-format
-msgid "config: log file: %s\n"
+#: lib/libalpm/alpm.c:1047
+#, fuzzy, c-format
+msgid "config: logfile: %s"
 msgstr "beállítások: naplófájl: %s\n"
 
-#. The config value is in days, we use seconds
-#: ../alpm.c:1394
-#, c-format
-msgid "config: UpgradeDelay: %i\n"
+#: lib/libalpm/alpm.c:1050
+#, fuzzy, c-format
+msgid "config: xfercommand: %s"
+msgstr "beállítások: gyorsítótár könyvtára: %s\n"
+
+#: lib/libalpm/alpm.c:1055
+#, fuzzy, c-format
+msgid "config: upgradedelay: %d"
 msgstr "beállítások: frissítés késleltetése: %i\n"
 
-#. add to the list
-#: ../alpm.c:1415
+#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+msgid "checking for package replacements"
+msgstr "csomagcserék ellenõrzése"
+
+#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
 #, c-format
-msgid "config: %s: server: %s\n"
-msgstr "beállítások: %s: kiszolgáló: %s\n"
+msgid "checking replacement '%s' for package '%s'"
+msgstr "csere vizsgálata: '%s' -> '%s'"
+
+#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
+#, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
+msgstr "%s-%s: frissítés figyelmen kívül hagyása (a %s-%s fogja lecserélni)"
 
-#: ../be_files.c:151
+#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
+#, c-format
+msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
+msgstr "a %s-%s kiválasztva frissítésre (a %s-%s fogja lecserélni)"
+
+#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#, c-format
+msgid "'%s' not found in sync db -- skipping"
+msgstr "a '%s' nem található a távoli adatbázisban -- kihagyás"
+
+#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#, c-format
+msgid "'%s' is already elected for removal -- skipping"
+msgstr "a '%s' már kijelölve eltávolításra -- kihagyás"
+
+#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
+#, fuzzy, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr "%s-%s: a helyi verzió újabb"
+
+#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
+#, c-format
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr "%s-%s: a csomagfrissítés figyelmen kívül hagyása (%s)"
+
+#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
+#, fuzzy, c-format
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr "%s-%s: a csomag frissítésének késleltetése (%s)\n"
+
+#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#, c-format
+msgid "%s-%s elected for upgrade (%s => %s)"
+msgstr "%s-%s kiválasztva frissítésre (%s => %s)"
+
+#: lib/libalpm/be_files.c:59
+#, fuzzy, c-format
+msgid "unpacking database '%s'"
+msgstr "adatbázis megnyitása: '%s'"
+
+#: lib/libalpm/be_files.c:183
 #, c-format
 msgid "invalid name for dabatase entry '%s'"
 msgstr "érvénytelen név a '%s' adatbázis-bejegyzés számára"
 
-#: ../be_files.c:432
+#: lib/libalpm/be_files.c:211
+msgid "invalid package entry provided to _alpm_db_read, skipping"
+msgstr ""
+
+#: lib/libalpm/be_files.c:216
 #, c-format
-msgid "db_write: could not open file %s/desc"
-msgstr "db_write: sikertelen a %s/desc fájl megnyitása"
+msgid ""
+"request to read database info for a file-based package '%s', skipping..."
+msgstr ""
 
-#: ../be_files.c:517
+#: lib/libalpm/be_files.c:224
 #, c-format
-msgid "db_write: could not open file %s/files"
-msgstr "db_write: sikertelen a %s/files fájl megnyitása"
+msgid "loading package data for %s : level=%d"
+msgstr ""
+
+#: lib/libalpm/be_files.c:232
+#, fuzzy, c-format
+msgid "cannot find '%s-%s' in db '%s'"
+msgstr "nem található a %s az adatbázisban"
 
-#: ../be_files.c:543
+#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
+#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
+#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
+#: lib/libalpm/package.c:185
+#, fuzzy, c-format
+msgid "could not open file %s: %s"
+msgstr "nem sikerült megnyitni a %s fájlt"
+
+#: lib/libalpm/be_files.c:492
+#, c-format
+msgid "writing %s-%s DESC information back to db"
+msgstr ""
+
+#: lib/libalpm/be_files.c:578
+#, c-format
+msgid "writing %s-%s FILES information back to db"
+msgstr ""
+
+#: lib/libalpm/be_files.c:605
 #, c-format
-msgid "db_write: could not open file %s/depends"
-msgstr "db_write: sikertelen a %s/depends fájl megnyitása"
+msgid "writing %s-%s DEPENDS information back to db"
+msgstr ""
 
-#: ../cache.c:57
+#: lib/libalpm/cache.c:59
 #, c-format
 msgid "loading package cache (infolevel=%#x) for repository '%s'"
 msgstr "csomagok gyorsítótárának betöltése (infószint=%#x) a '%s' repó számára"
 
-#: ../cache.c:77
+#: lib/libalpm/cache.c:83
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr "csomagok gyorsítótárának felszabadítása a '%s' repó számára"
 
-#: ../cache.c:112
+#: lib/libalpm/cache.c:132
+#, fuzzy, c-format
+msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
+msgstr "csomagok gyorsítótárának betöltése (infószint=%#x) a '%s' repó számára"
+
+#: lib/libalpm/cache.c:152
 #, c-format
 msgid "adding entry '%s' in '%s' cache"
 msgstr "a '%s' bejegyzés hozzáadása a '%s' gyorsítótárhoz"
 
-#: ../cache.c:134
+#: lib/libalpm/cache.c:178
 #, c-format
 msgid "removing entry '%s' from '%s' cache"
 msgstr "a '%s' bejegyzés eltávolítása a '%s' gyorsítótárból"
 
-#: ../cache.c:165
+#: lib/libalpm/cache.c:213
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr "csoportgyorsítótár betöltése a '%s' repó számára"
 
-#. CHECK 1: check targets against database
-#: ../conflict.c:71
+#: lib/libalpm/conflict.c:78
 #, c-format
 msgid "checkconflicts: targ '%s' vs db"
 msgstr "checkconflicts: cél '%s' vs db"
 
-#. conflict
-#. confict
-#: ../conflict.c:80 ../conflict.c:94
+#: lib/libalpm/conflict.c:87 lib/libalpm/conflict.c:101
 #, c-format
 msgid "targs vs db: found %s as a conflict for %s"
 msgstr "targs vs db: a %s ütközik a következõvel: %s"
 
-#. CHECK 2: check targets against targets
-#: ../conflict.c:107
+#: lib/libalpm/conflict.c:114
 #, c-format
 msgid "checkconflicts: targ '%s' vs targs"
 msgstr "checkconflicts: cél '%s' vs célok"
 
-#. otp is listed in tp's conflict list
-#: ../conflict.c:116 ../conflict.c:129
+#: lib/libalpm/conflict.c:123 lib/libalpm/conflict.c:136
 #, c-format
 msgid "targs vs targs: found %s as a conflict for %s"
 msgstr "targs vs targs: a %s ütközik a következõvel: %s"
 
-#. CHECK 3: check database against targets
-#: ../conflict.c:143
+#: lib/libalpm/conflict.c:150
 #, c-format
 msgid "checkconflicts: db vs targ '%s'"
 msgstr "checkconflicts: db vs cél '%s'"
 
-#: ../conflict.c:170 ../conflict.c:185
+#: lib/libalpm/conflict.c:177 lib/libalpm/conflict.c:192
 #, c-format
 msgid "db vs targs: found %s as a conflict for %s"
 msgstr "db vs targs: a %s ütközik a következõvel: %s"
 
-#: ../conflict.c:234 ../conflict.c:335 ../deps.c:54 ../deps.c:601
-#: ../deps.c:641 ../group.c:42 ../handle.c:62 ../package.c:98 ../sync.c:65
-#: ../sync.c:635 ../sync.c:651 ../sync.c:747 ../trans.c:49 ../util.c:598
-#: ../util.c:605
+#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
+#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr "malloc probléma: nem sikerült allokálni %d byte-ot"
 
-#: ../db.c:57 ../db.c:64
+#: lib/libalpm/db.c:62 lib/libalpm/db.c:69
 #, c-format
 msgid "malloc failed: could not allocate %d bytes"
 msgstr "malloc probléma: nem sikerült allokálni %d byte-ot"
 
-#: ../deps.c:118
+#: lib/libalpm/db.c:163
+msgid "attempt to re-register the 'local' DB"
+msgstr ""
+
+#: lib/libalpm/db.c:171
+#, c-format
+msgid "attempt to re-register the '%s' database, using existing"
+msgstr ""
+
+#: lib/libalpm/db.c:177
+#, c-format
+msgid "registering database '%s'"
+msgstr "adatbázis regisztrálása: '%s'"
+
+#: lib/libalpm/db.c:182
+#, c-format
+msgid "database directory '%s' does not exist -- try creating it"
+msgstr "'%s' adatbázis-könyvtár nem létezik -- kísérlet a létrehozásra"
+
+#: lib/libalpm/db.c:193
+#, c-format
+msgid "opening database '%s'"
+msgstr "adatbázis megnyitása: '%s'"
+
+#: lib/libalpm/deps.c:128
 msgid "started sorting dependencies"
 msgstr "a függõségek rendezése elkezdõdött"
 
-#: ../deps.c:123
+#: lib/libalpm/deps.c:133
 msgid "possible dependency cycle detected"
 msgstr "lehetséges körkörös függõségi probléma észlelve"
 
-#: ../deps.c:166
+#: lib/libalpm/deps.c:178
 msgid "sorting dependencies finished"
 msgstr "a függõségek rendezése befejezõdött"
 
-#: ../deps.c:260 ../deps.c:406
+#: lib/libalpm/deps.c:219 lib/libalpm/deps.c:276
+msgid "null package found in package list"
+msgstr ""
+
+#: lib/libalpm/deps.c:224
+#, fuzzy, c-format
+msgid "cannot find package installed '%s'"
+msgstr "nem sikerült megnyitni a csomagfájlt"
+
+#: lib/libalpm/deps.c:258 lib/libalpm/deps.c:379
 #, c-format
 msgid "checkdeps: found %s as required by %s"
 msgstr "checkdeps: a %s igényelt a %s által"
 
-#: ../deps.c:370
+#: lib/libalpm/deps.c:284
+#, fuzzy, c-format
+msgid "no dependencies for target '%s'"
+msgstr "nem sikerült feloldani a függõségeket a \"%s\" számára"
+
+#: lib/libalpm/deps.c:330
 #, c-format
 msgid "checkdeps: found %s as a dependency for %s"
 msgstr "checkdeps: a %s egy függõség a %s számára"
 
-#: ../deps.c:494
+#: lib/libalpm/deps.c:478
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr "nem található a \"%s\" csomag és nem is szolgáltatja semmi!"
 
-#: ../deps.c:499
+#: lib/libalpm/deps.c:483
 msgid "dep is NULL!"
 msgstr "a dep NULL!"
 
-#: ../deps.c:511
+#: lib/libalpm/deps.c:498
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr "a %s kihagyása -- explicit módon lett telepítve"
 
-#. add it to the target list
-#: ../deps.c:528
+#: lib/libalpm/deps.c:515
 #, c-format
 msgid "loading ALL info for '%s'"
 msgstr "minden infó betöltése a '%s' számára"
 
-#: ../deps.c:531
+#: lib/libalpm/deps.c:518
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr "a '%s' hozzáadása a célcsomagokhoz"
 
-#: ../deps.c:573
+#: lib/libalpm/deps.c:546
+#, fuzzy
+msgid "started resolving dependencies"
+msgstr "a függõségek rendezése elkezdõdött"
+
+#: lib/libalpm/deps.c:564
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr "a %s szolgáltatja a %s függõséget -- kihagyás"
 
-#: ../deps.c:597
+#: lib/libalpm/deps.c:589
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
@@ -618,518 +731,727 @@ 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)"
 
-#. this dep is already in the target list
-#: ../deps.c:614
+#: lib/libalpm/deps.c:606
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr "a %s függõség már a célcsomagok között szerepel -- kihagyás"
 
-#: ../deps.c:634
+#: lib/libalpm/deps.c:626
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr "a %s függõség behozása (a %s igényli)"
 
-#: ../deps.c:638
+#: lib/libalpm/deps.c:630
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr "nem sikerült feloldani a függõségeket a \"%s\" számára"
 
-#. cycle detected -- skip it
-#: ../deps.c:654
+#: lib/libalpm/deps.c:646
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr "körkörös függõség észlelve: %s"
 
-#: ../error.c:34
+#: lib/libalpm/deps.c:650
+#, fuzzy
+msgid "finished resolving dependencies"
+msgstr "a függõségek rendezése elkezdõdött"
+
+#: lib/libalpm/error.c:34
 msgid "out of memory!"
 msgstr "elfogyott a memória!"
 
-#: ../error.c:36 ../error.c:135
-msgid "unexpected error"
+#: lib/libalpm/error.c:36
+#, fuzzy
+msgid "unexpected system error"
 msgstr "nemvárt hiba"
 
-#: ../error.c:38
+#: lib/libalpm/error.c:38
 msgid "insufficient privileges"
 msgstr "elégtelen jogosultságok"
 
-#: ../error.c:40
+#: lib/libalpm/error.c:40
 msgid "wrong or NULL argument passed"
 msgstr "rossz vagy NULL argumentum érkezett"
 
-#: ../error.c:42
+#: lib/libalpm/error.c:42
 msgid "could not find or read file"
 msgstr "nem található vagy nem olvasható a fájl"
 
-#: ../error.c:45
+#: lib/libalpm/error.c:45
 msgid "library not initialized"
 msgstr "a könyvtár nem inicializált"
 
-#: ../error.c:47
+#: lib/libalpm/error.c:47
 msgid "library already initialized"
 msgstr "a könyvtár már inicializált"
 
-#: ../error.c:49
+#: lib/libalpm/error.c:49
 msgid "unable to lock database"
 msgstr "nem sikerült zárolni az adatbázist"
 
-#: ../error.c:52
+#: lib/libalpm/error.c:52
 msgid "could not open database"
 msgstr "nem sikerült megnyitni az adatbázist"
 
-#: ../error.c:54
+#: lib/libalpm/error.c:54
 msgid "could not create database"
 msgstr "nem sikerült létrehozni az adatbázist"
 
-#: ../error.c:56
+#: lib/libalpm/error.c:56
 msgid "database not initialized"
 msgstr "az adatbázis nem inicializált"
 
-#: ../error.c:58
+#: lib/libalpm/error.c:58
 msgid "database already registered"
 msgstr "az adatbázis már regisztrált"
 
-#: ../error.c:60
+#: lib/libalpm/error.c:60
 msgid "could not find database"
 msgstr "nem található az adatbázis"
 
-#: ../error.c:62
+#: lib/libalpm/error.c:62
 msgid "could not update database"
 msgstr "nem sikerült megnyitni az adatbázist"
 
-#: ../error.c:64
+#: lib/libalpm/error.c:64
 msgid "could not remove database entry"
 msgstr "nem sikerült eltávolítani az adatbázis-bejegyzést"
 
-#: ../error.c:71
+#: lib/libalpm/error.c:71
 msgid "could not set parameter"
 msgstr "nem sikerült beállítani a paramétert"
 
-#: ../error.c:74 ../error.c:80
+#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
 msgid "transaction not initialized"
 msgstr "a tranzakció nem inicializált"
 
-#: ../error.c:76
+#: lib/libalpm/error.c:76
 msgid "transaction already initialized"
 msgstr "a tranzakció már inicializált"
 
-#: ../error.c:78
+#: lib/libalpm/error.c:78
 msgid "duplicate target"
 msgstr "két azonos célcsomag"
 
-#: ../error.c:82
+#: lib/libalpm/error.c:82
 msgid "transaction not prepared"
 msgstr "a tranzakció nincs elõkészítve"
 
-#: ../error.c:84
+#: lib/libalpm/error.c:84
 msgid "transaction aborted"
 msgstr "a tranzakció félbeszakítva"
 
-#: ../error.c:86
+#: lib/libalpm/error.c:86
 msgid "operation not compatible with the transaction type"
 msgstr "a mûvelet nem egyeztethetõ össze a jelenlegi tranzakciótípussal"
 
-#: ../error.c:89
+#: lib/libalpm/error.c:89
 msgid "could not find or read package"
 msgstr "nem található vagy nem olvasható a csomag"
 
-#: ../error.c:91
+#: lib/libalpm/error.c:91
 msgid "invalid or corrupted package"
 msgstr "nem érvényes vagy sérült csomag"
 
-#: ../error.c:93
+#: lib/libalpm/error.c:93
 msgid "cannot open package file"
 msgstr "nem sikerült megnyitni a csomagfájlt"
 
-#: ../error.c:95
+#: lib/libalpm/error.c:95
 msgid "cannot load package data"
 msgstr "nem sikerült betölteni a csomagadatokat"
 
-#: ../error.c:97
+#: lib/libalpm/error.c:97
 msgid "package already installed"
 msgstr "a csomag már telepítve van"
 
-#: ../error.c:99
+#: lib/libalpm/error.c:99
 msgid "package not installed or lesser version"
 msgstr "a csomag nincs telepítve vagy kisebb verziójú"
 
-#: ../error.c:101
+#: lib/libalpm/error.c:101
 msgid "package name is not valid"
 msgstr "nem érvényes a csomagnév"
 
-#: ../error.c:103
+#: lib/libalpm/error.c:103
 msgid "corrupted package"
 msgstr "sérült csomag"
 
-#: ../error.c:106
+#: lib/libalpm/error.c:105
+msgid "no such repository"
+msgstr ""
+
+#: lib/libalpm/error.c:108
 msgid "group not found"
 msgstr "a csoport nem található"
 
-#: ../error.c:109
+#: lib/libalpm/error.c:111
 msgid "could not satisfy dependencies"
 msgstr "nem sikerült kielégíteni a függõségeket"
 
-#: ../error.c:111
+#: lib/libalpm/error.c:113
 msgid "conflicting dependencies"
 msgstr "ütközõ függõségek"
 
-#: ../error.c:113
+#: lib/libalpm/error.c:115
 msgid "conflicting files"
 msgstr "ütközõ fájlok"
 
-#: ../error.c:116
+#: lib/libalpm/error.c:118
 msgid "user aborted"
 msgstr "felhasználói megszakítás"
 
-#: ../error.c:118
+#: lib/libalpm/error.c:120
 msgid "libarchive error"
 msgstr "libarchive hiba"
 
-#: ../error.c:120
+#: lib/libalpm/error.c:122
 msgid "internal error"
 msgstr "belsõ hiba"
 
-#: ../error.c:122
+#: lib/libalpm/error.c:124
 msgid "not enough space"
 msgstr "nincs elég hely"
 
-#: ../error.c:124
+#: lib/libalpm/error.c:126
 msgid "not confirmed"
 msgstr "nem megerõsített"
 
-#: ../error.c:127
+#: lib/libalpm/error.c:129
 msgid "bad section name"
 msgstr "rossz szekciónév"
 
-#: ../error.c:129
+#: lib/libalpm/error.c:131
 msgid "'local' is reserved and cannot be used as a package tree"
 msgstr "a 'local' név fenntartott és nem használható csomagfaként"
 
-#: ../error.c:131
+#: lib/libalpm/error.c:133
 msgid "syntax error"
 msgstr "szintaktikai hiba"
 
-#: ../error.c:133
+#: lib/libalpm/error.c:135
 msgid "all directives must belong to a section"
 msgstr "minden direktívának egy szekcióhoz kell tartoznia"
 
-#: ../handle.c:143
-#, c-format
-msgid "PM_OPT_DBPATH set to '%s'"
-msgstr "PM_OPT_DBPATH beállítva a '%s' értékre"
-
-#: ../handle.c:150
-#, c-format
-msgid "PM_OPT_CACHEDIR set to '%s'"
-msgstr "PM_OPT_CACHEDIR beállítva a '%s' értékre"
-
-#: ../handle.c:167
-#, c-format
-msgid "can't open log file %s"
-msgstr "nem sikerült megnyitni a %s naplófájlt"
-
-#: ../handle.c:171
-#, c-format
-msgid "PM_OPT_LOGFILE set to '%s'"
-msgstr "PM_OPT_LOGFILE beállítva a '%s' értékre"
-
-#: ../handle.c:176
-#, c-format
-msgid "'%s' added to PM_OPT_NOUPGRADE"
-msgstr "'%s' hozzáadva a PM_OPT_NOUPGRADE listához"
-
-#: ../handle.c:179
-msgid "PM_OPT_NOUPGRADE flushed"
-msgstr "a PM_OPT_NOUPGRADE lista ürítve"
-
-#: ../handle.c:185
-#, c-format
-msgid "'%s' added to PM_OPT_NOEXTRACT"
-msgstr "'%s' hozzáadva a PM_OPT_NOEXTRACT listához"
-
-#: ../handle.c:188
-msgid "PM_OPT_NOEXTRACT flushed"
-msgstr "a PM_OPT_NOEXTRACT lista ürítve"
-
-#: ../handle.c:194
-#, c-format
-msgid "'%s' added to PM_OPT_IGNOREPKG"
-msgstr "'%s' hozzáadva a PM_OPT_IGNOREPKG listához"
-
-#: ../handle.c:197
-msgid "PM_OPT_IGNOREPKG flushed"
-msgstr "a PM_OPT_IGNOREPKG lista ürítve"
-
-#: ../handle.c:203
-#, c-format
-msgid "'%s' added to PM_OPT_HOLDPKG"
-msgstr "'%s' hozzáadva a PM_OPT_HOLDPKG listához"
-
-#: ../handle.c:206
-msgid "PM_OPT_HOLDPKG flushed"
-msgstr "a PM_OPT_HOLDPKG lista ürítve"
-
-#: ../handle.c:222
-#, c-format
-msgid "PM_OPT_USESYSLOG set to '%d'"
-msgstr "PM_OPT_USESYSLOG beállítva a '%d' értékre"
-
-#: ../handle.c:262
-#, c-format
-msgid "PM_OPT_LOGMASK set to '%02x'"
-msgstr "PM_OPT_LOGMASK beállítva a '%02x' értékre"
-
-#: ../handle.c:281
-#, c-format
-msgid "PM_OPT_PROXYHOST set to '%s'"
-msgstr "PM_OPT_PROXYHOST beállítva a '%s' értékre"
-
-#: ../handle.c:285
-#, c-format
-msgid "PM_OPT_PROXYPORT set to '%d'"
-msgstr "PM_OPT_PROXYPORT beállítva a '%d' értékre"
+#: lib/libalpm/error.c:137
+msgid "invalid regular expression"
+msgstr ""
 
-#: ../handle.c:296
-#, c-format
-msgid "PM_OPT_XFERCOMMAND set to '%s'"
-msgstr "PM_OPT_XFERCOMMAND beállítva a '%s' értékre"
+#: lib/libalpm/error.c:139
+#, fuzzy
+msgid "connection to remote host failed"
+msgstr "nem sikerült eltávolítani a %s fájlt"
 
-#: ../handle.c:300
-#, c-format
-msgid "PM_OPT_NOPASSIVEFTP set to '%d'"
-msgstr "PM_OPT_NOPASSIVEFTP beállítva a '%d' értékre"
+#: lib/libalpm/error.c:141
+msgid "forking process failed"
+msgstr ""
 
-#: ../handle.c:304
-#, c-format
-msgid "PM_OPT_CHOMP set to '%d'"
-msgstr "PM_OPT_CHOMP beállítva a '%d' értékre"
+#: lib/libalpm/error.c:143
+msgid "unexpected error"
+msgstr "nemvárt hiba"
 
-#: ../md5driver.c:48 ../sha1.c:395
+#: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398
 #, c-format
 msgid "%s can't be opened\n"
 msgstr "nem sikerült megnyitni a következõt: %s\n"
 
-#: ../package.c:185
-#, c-format
-msgid "could not open file %s"
-msgstr "nem sikerült megnyitni a %s fájlt"
-
-#: ../package.c:202 ../package.c:262
+#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr "%s: szintaktikai hiba a leírófájl %d. sorában"
 
-#: ../package.c:319
+#: lib/libalpm/package.c:331
 msgid "could not parse the package description file"
 msgstr "nem sikerült értelmezni a csomagleíró fájlt"
 
-#: ../package.c:327
+#: lib/libalpm/package.c:335
 #, c-format
 msgid "missing package name in %s"
 msgstr "hiányzó csomagnév itt: %s"
 
-#: ../package.c:335
+#: lib/libalpm/package.c:339
 #, c-format
 msgid "missing package version in %s"
 msgstr "hiányzó csomagverzió itt: %s"
 
-#: ../package.c:374
+#: lib/libalpm/package.c:374
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr "nem sikerült eltávolítani a %s ideiglenes fájlt"
 
-#: ../package.c:391
-#, c-format
-msgid "bad package file in %s"
-msgstr "rossz csomagfájl itt: %s"
+#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#, fuzzy, c-format
+msgid "error while reading package: %s"
+msgstr "csomag frissítése: %s-%s"
 
-#: ../package.c:399
-#, c-format
-msgid "missing package info file in %s"
+#: lib/libalpm/package.c:400
+#, fuzzy
+msgid "missing package metadata"
+msgstr "hiányzó csomagnév itt: %s"
+
+#: lib/libalpm/package.c:407
+#, fuzzy, c-format
+msgid "missing package filelist in %s, generating one"
 msgstr "hiányzó csomaginformáció-fájl ebben: %s"
 
-#: ../remove.c:76
+#: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
 msgstr "nem található a %s az adatbázisban"
 
-#: ../remove.c:88
+#: lib/libalpm/remove.c:92
 #, c-format
 msgid "adding %s in the targets list"
 msgstr "a %s hozzáadása a céllistához"
 
-#: ../remove.c:114
+#: lib/libalpm/remove.c:120
 #, c-format
 msgid "pulling %s in the targets list"
 msgstr "a %s behozása a céllistába"
 
-#: ../remove.c:117
+#: lib/libalpm/remove.c:123
 #, c-format
 msgid "could not find %s in database -- skipping"
 msgstr "nem található a %s az adatbázisban -- kihagyás"
 
-#: ../remove.c:135
+#: lib/libalpm/remove.c:141
 msgid "finding removable dependencies"
 msgstr "eltávolítható függõségek keresése"
 
-#: ../remove.c:180
-#, c-format
-msgid "removing package %s-%s"
-msgstr "a %s-%s csomag eltávolítása"
-
-#: ../remove.c:191
-msgid "removing files"
-msgstr "fájlok törlése"
-
-#: ../remove.c:217
+#: lib/libalpm/remove.c:193
 #, c-format
 msgid "file %s does not exist"
 msgstr "a %s fájl nemlétezik"
 
-#. this is okay, other packages are probably using it.
-#: ../remove.c:223
+#: lib/libalpm/remove.c:199
 #, c-format
 msgid "keeping directory %s"
 msgstr "a %s könyvtár megtartása"
 
-#: ../remove.c:225
+#: lib/libalpm/remove.c:201
 #, c-format
 msgid "removing directory %s"
 msgstr "a %s könyvtár törlése"
 
-#: ../remove.c:239
+#: lib/libalpm/remove.c:215
 #, c-format
 msgid "skipping removal of %s as it has moved to another package"
 msgstr "a %s törlésének kihagyása, mivel az egy másik csomagba került át"
 
-#: ../remove.c:251 ../remove.c:252
+#: lib/libalpm/remove.c:227
 #, c-format
 msgid "%s saved as %s"
 msgstr "a %s elmentve %s néven"
 
-#: ../remove.c:254 ../remove.c:261
+#: lib/libalpm/remove.c:231
 #, c-format
 msgid "unlinking %s"
 msgstr "a %s törlése"
 
-#: ../remove.c:256 ../remove.c:266
-#, c-format
-msgid "cannot remove file %s"
+#: lib/libalpm/remove.c:237
+#, fuzzy, c-format
+msgid "cannot remove file %s: %s"
 msgstr "nem sikerült eltávolítani a %s fájlt"
 
-#: ../remove.c:285
+#: lib/libalpm/remove.c:265
+#, c-format
+msgid "removing package %s-%s"
+msgstr "a %s-%s csomag eltávolítása"
+
+#: lib/libalpm/remove.c:276
+msgid "removing files"
+msgstr "fájlok törlése"
+
+#: lib/libalpm/remove.c:294
 #, c-format
 msgid "removing database entry '%s'"
 msgstr "a '%s' adatbázis-bejegyzés eltávolítása"
 
-#: ../remove.c:287
+#: lib/libalpm/remove.c:296
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr "nem sikerült eltávolítani a %s-%s adatbázis-bejegyzést"
 
-#: ../remove.c:290
+#: lib/libalpm/remove.c:299
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr "nem sikerült eltávolítani a '%s' bejegyzést a gyorsítótárból"
 
-#: ../remove.c:330
+#: lib/libalpm/remove.c:333
+#, fuzzy, c-format
+msgid "could not find dependency '%s' for removal"
+msgstr "nem található a '%s' függõség"
+
+#: lib/libalpm/remove.c:343
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr "a '%s' csomag 'függ tõle' mezõjének frissítése"
 
-#. check for "recommended" package replacements
-#: ../sync.c:160
-msgid "checking for package replacements"
-msgstr "csomagcserék ellenõrzése"
+#: lib/libalpm/sync.c:200
+msgid "checking for package upgrades"
+msgstr "csomagfrissítések vizsgálata"
 
-#: ../sync.c:169
+#: lib/libalpm/sync.c:278
+#, fuzzy, c-format
+msgid "searching for target in repo '%s'"
+msgstr "cél betöltése '%s'"
+
+#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
 #, c-format
-msgid "checking replacement '%s' for package '%s'"
-msgstr "csere vizsgálata: '%s' -> '%s'"
+msgid "target '%s' not found -- looking for provisions"
+msgstr "a '%s' cél nem található -- csomagok keresése amik szolgáltatják"
 
-#: ../sync.c:171
+#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
 #, 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)"
+msgid "found '%s' as a provision for '%s'"
+msgstr "a '%s' szolgáltatja a következõt: '%s'"
+
+#: lib/libalpm/sync.c:299
+#, fuzzy, c-format
+msgid "repository '%s' not found"
+msgstr "a csoport nem található"
 
-#: ../sync.c:205
+#: lib/libalpm/sync.c:333
 #, c-format
-msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
-msgstr "a %s-%s kiválasztva frissítésre (a %s-%s fogja lecserélni)"
+msgid "%s-%s is up to date -- skipping"
+msgstr "%s-%s naprakész -- kihagyás"
 
-#. match installed packages with the sync dbs and compare versions
-#: ../sync.c:217
-msgid "checking for package upgrades"
-msgstr "csomagfrissítések vizsgálata"
+#: lib/libalpm/sync.c:353
+#, c-format
+msgid "adding target '%s' to the transaction set"
+msgstr "a '%s' cél hozzáadása a tranzakcióhoz"
+
+#: lib/libalpm/sync.c:401
+#, fuzzy
+msgid "resolving target's dependencies"
+msgstr "a célok függõségeinek feloldása"
 
-#: ../sync.c:229
+#: lib/libalpm/sync.c:421
 #, c-format
-msgid "'%s' not found in sync db -- skipping"
+msgid "adding package %s-%s to the transaction targets"
+msgstr "a %s-%s csomag hozzáadása a tranzakció céljaihoz"
+
+#: lib/libalpm/sync.c:456
+msgid "looking for unresolvable dependencies"
+msgstr "feloldhatatlan függõségek keresése"
+
+#: lib/libalpm/sync.c:487
+#, c-format
+msgid "package '%s' is conflicting with '%s'"
+msgstr ""
+
+#: lib/libalpm/sync.c:509
+#, fuzzy, c-format
+msgid "'%s' not found in transaction set -- skipping"
 msgstr "a '%s' nem található a távoli adatbázisban -- kihagyás"
 
-#: ../sync.c:243 ../sync.c:530
+#: lib/libalpm/sync.c:520
 #, c-format
-msgid "'%s' is already elected for removal -- skipping"
-msgstr "a '%s' már kijelölve eltávolításra -- kihagyás"
+msgid "package '%s' provides its own conflict"
+msgstr ""
+
+#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#, fuzzy, c-format
+msgid "'%s' is in the target list -- keeping it"
+msgstr "az újabb verzió (%s-%s) már elérhetõ a cél listában -- kihagyás"
+
+#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#, fuzzy, c-format
+msgid "removing '%s' from target list"
+msgstr "a '%s' bejegyzés eltávolítása a '%s' gyorsítótárból"
 
-#. local version is newer
-#: ../sync.c:252
+#: lib/libalpm/sync.c:569
+#, fuzzy, c-format
+msgid "resolving package '%s' conflict"
+msgstr "a %s-%s csomag eltávolítása"
+
+#: lib/libalpm/sync.c:592
 #, c-format
-msgid "%s-%s: local version is newer"
-msgstr "%s-%s: a helyi verzió újabb"
+msgid "electing '%s' for removal"
+msgstr ""
+
+#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+msgid "unresolvable package conflicts detected"
+msgstr ""
 
-#. package should be ignored (IgnorePkg)
-#: ../sync.c:258
+#: lib/libalpm/sync.c:671
+msgid "checking dependencies of packages designated for removal"
+msgstr ""
+
+#: lib/libalpm/sync.c:685
+msgid "something has gone horribly wrong"
+msgstr ""
+
+#: lib/libalpm/sync.c:704
+#, fuzzy, c-format
+msgid "found '%s' as a provision for '%s' -- conflict aborted"
+msgstr "a '%s' szolgáltatja a következõt: '%s'"
+
+#: lib/libalpm/sync.c:800
 #, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr "%s-%s: a csomagfrissítés figyelmen kívül hagyása (%s)"
+msgid "%s is already in the cache\n"
+msgstr ""
 
-#. package too new (UpgradeDelay)
-#: ../sync.c:262
+#: lib/libalpm/sync.c:811
 #, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr "%s-%s: a csomag frissítésének késleltetése (%s)\n"
+msgid "no %s cache exists.  creating...\n"
+msgstr ""
 
-#: ../sync.c:266
+#: lib/libalpm/sync.c:812
 #, c-format
-msgid "%s-%s elected for upgrade (%s => %s)"
-msgstr "%s-%s kiválasztva frissítésre (%s => %s)"
+msgid "warning: no %s cache exists.  creating..."
+msgstr ""
 
-#. Search provides
-#: ../sync.c:317 ../sync.c:336
+#: lib/libalpm/sync.c:817
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:818
+msgid "warning: couldn't create package cache, using /tmp instead"
+msgstr ""
+
+#: lib/libalpm/sync.c:825
 #, c-format
-msgid "target '%s' not found -- looking for provisions"
-msgstr "a '%s' cél nem található -- csomagok keresése amik szolgáltatják"
+msgid "failed to retrieve some files from %s\n"
+msgstr ""
+
+#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#, fuzzy, c-format
+msgid "can't get md5 or sha1 checksum for package %s\n"
+msgstr "sikertelen az sha1 ellenõrzõ összeg elérése a %s-%s csomag számára\n"
 
-#: ../sync.c:322 ../sync.c:341
+#: lib/libalpm/sync.c:885
 #, c-format
-msgid "found '%s' as a provision for '%s'"
-msgstr "a '%s' szolgáltatja a következõt: '%s'"
+msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
+msgstr ""
 
-#: ../sync.c:360
+#: lib/libalpm/sync.c:887
 #, c-format
-msgid "%s-%s: local version is newer -- skipping"
-msgstr "%s-%s: a helyi verzió újabb -- kihagyás"
+msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
+msgstr ""
 
-#: ../sync.c:368
+#: lib/libalpm/sync.c:908
+#, fuzzy
+msgid "could not create removal transaction"
+msgstr "nem sikerült létrehozni az adatbázist"
+
+#: lib/libalpm/sync.c:914
+msgid "could not initialize the removal transaction"
+msgstr ""
+
+#: lib/libalpm/sync.c:934
+msgid "removing conflicting and to-be-replaced packages"
+msgstr ""
+
+#: lib/libalpm/sync.c:936
+#, fuzzy
+msgid "could not prepare removal transaction"
+msgstr "nem sikerült létrehozni az adatbázist"
+
+#: lib/libalpm/sync.c:942
+msgid "could not commit removal transaction"
+msgstr ""
+
+#: lib/libalpm/sync.c:949
+#, fuzzy
+msgid "installing packages"
+msgstr "telepítés"
+
+#: lib/libalpm/sync.c:952
+#, fuzzy
+msgid "could not create transaction"
+msgstr "nem sikerült létrehozni az adatbázist"
+
+#: lib/libalpm/sync.c:957
+msgid "could not initialize transaction"
+msgstr ""
+
+#: lib/libalpm/sync.c:980
+#, fuzzy
+msgid "could not prepare transaction"
+msgstr "értelmezhetetlen token %s"
+
+#: lib/libalpm/sync.c:985
+#, fuzzy
+msgid "could not commit transaction"
+msgstr "nem sikerült létrehozni az adatbázist"
+
+#: lib/libalpm/sync.c:992
+msgid "updating database for replaced packages' dependencies"
+msgstr ""
+
+#: lib/libalpm/sync.c:1021
+#, fuzzy, c-format
+msgid "could not update requiredby for database entry %s-%s"
+msgstr "sikertelen a %s-%s 'függ tõle' adatbázis-bejegyzésének frissítése"
+
+#: lib/libalpm/sync.c:1030
+#, fuzzy, 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/util.c:278
+#, fuzzy, c-format
+msgid "could not open %s: %s\n"
+msgstr "nem sikerült megnyitni a %s fájlt"
+
+#: lib/libalpm/util.c:291
+#, fuzzy, c-format
+msgid "could not extract %s: %s\n"
+msgstr "nem sikerült kifejteni: %s (%s)"
+
+#: lib/libalpm/util.c:349
+#, fuzzy, c-format
+msgid "logaction called: %s"
+msgstr "eredeti:  %s"
+
+#: lib/libalpm/util.c:441
+#, fuzzy
+msgid "could not create temp directory"
+msgstr "a jelenlegi munkakönyvtár nem kapható meg"
+
+#: lib/libalpm/util.c:468
+#, fuzzy, c-format
+msgid "could not change directory to %s (%s)"
+msgstr "nem sikerült másolni: %s-t ide: %s (%s)"
+
+#: lib/libalpm/util.c:471
 #, c-format
-msgid "%s-%s is up to date -- skipping"
-msgstr "%s-%s naprakész -- kihagyás"
+msgid "executing %s script..."
+msgstr ""
+
+#: lib/libalpm/util.c:484
+#, fuzzy, c-format
+msgid "could not fork a new process (%s)"
+msgstr "nem sikerült átnevezni: %s (%s)"
 
-#: ../sync.c:388
+#: lib/libalpm/util.c:491
 #, c-format
-msgid "adding target '%s' to the transaction set"
-msgstr "a '%s' cél hozzáadása a tranzakcióhoz"
+msgid "chrooting in %s"
+msgstr ""
 
-#: ../sync.c:433
-msgid "resolving targets dependencies"
-msgstr "a célok függõségeinek feloldása"
+#: lib/libalpm/util.c:493
+#, fuzzy, c-format
+msgid "could not change the root directory (%s)"
+msgstr "a jelenlegi munkakönyvtár nem kapható meg"
+
+#: lib/libalpm/util.c:497
+#, fuzzy, c-format
+msgid "could not change directory to / (%s)"
+msgstr "nem sikerült másolni: %s-t ide: %s (%s)"
 
-#: ../sync.c:453
+#: lib/libalpm/util.c:501
+#, fuzzy, c-format
+msgid "executing \"%s\""
+msgstr "a %s kifejtése"
+
+#: lib/libalpm/util.c:504
+#, fuzzy, c-format
+msgid "call to popen failed (%s)"
+msgstr "nem sikerült megnyitni a %s fájlt"
+
+#: lib/libalpm/util.c:529
 #, c-format
-msgid "adding package %s-%s to the transaction targets"
-msgstr "a %s-%s csomag hozzáadása a tranzakció céljaihoz"
+msgid "call to waitpid failed (%s)"
+msgstr ""
 
-#: ../sync.c:485
-msgid "looking for unresolvable dependencies"
-msgstr "feloldhatatlan függõségek keresése"
+#: lib/libalpm/util.c:537
+#, fuzzy, c-format
+msgid "could not remove tmpdir %s"
+msgstr "nem sikerült eltávolítani a %s ideiglenes fájlt"
+
+#: lib/libalpm/util.c:594
+#, c-format
+msgid "check_freespace: total pkg size: %lld, disk space: %lld"
+msgstr ""
+
+#: lib/libalpm/versioncmp.c:277
+#, c-format
+msgid "depcmp: %s-%s %s %s-%s => %s"
+msgstr ""
+
+#: lib/libalpm/versioncmp.c:281
+#, c-format
+msgid "depcmp: %s-%s %s %s => %s"
+msgstr ""
+
+#~ msgid "unpacking %s"
+#~ msgstr "%s kitömörítése"
+
+#~ msgid "loading SCRIPLET info for '%s'"
+#~ msgstr "a SCRIPLET infó betöltése a '%s' számára"
+
+#~ msgid "config: %s: server: %s\n"
+#~ msgstr "beállítások: %s: kiszolgáló: %s\n"
+
+#~ msgid "db_write: could not open file %s/desc"
+#~ msgstr "db_write: sikertelen a %s/desc fájl megnyitása"
+
+#~ msgid "db_write: could not open file %s/files"
+#~ msgstr "db_write: sikertelen a %s/files fájl megnyitása"
+
+#~ msgid "db_write: could not open file %s/depends"
+#~ msgstr "db_write: sikertelen a %s/depends fájl megnyitása"
+
+#~ msgid "PM_OPT_DBPATH set to '%s'"
+#~ msgstr "PM_OPT_DBPATH beállítva a '%s' értékre"
+
+#~ msgid "PM_OPT_CACHEDIR set to '%s'"
+#~ msgstr "PM_OPT_CACHEDIR beállítva a '%s' értékre"
+
+#~ msgid "can't open log file %s"
+#~ msgstr "nem sikerült megnyitni a %s naplófájlt"
+
+#~ msgid "PM_OPT_LOGFILE set to '%s'"
+#~ msgstr "PM_OPT_LOGFILE beállítva a '%s' értékre"
+
+#~ msgid "'%s' added to PM_OPT_NOUPGRADE"
+#~ msgstr "'%s' hozzáadva a PM_OPT_NOUPGRADE listához"
+
+#~ msgid "PM_OPT_NOUPGRADE flushed"
+#~ msgstr "a PM_OPT_NOUPGRADE lista ürítve"
+
+#~ msgid "'%s' added to PM_OPT_NOEXTRACT"
+#~ msgstr "'%s' hozzáadva a PM_OPT_NOEXTRACT listához"
+
+#~ msgid "PM_OPT_NOEXTRACT flushed"
+#~ msgstr "a PM_OPT_NOEXTRACT lista ürítve"
+
+#~ msgid "'%s' added to PM_OPT_IGNOREPKG"
+#~ msgstr "'%s' hozzáadva a PM_OPT_IGNOREPKG listához"
+
+#~ msgid "PM_OPT_IGNOREPKG flushed"
+#~ msgstr "a PM_OPT_IGNOREPKG lista ürítve"
+
+#~ msgid "'%s' added to PM_OPT_HOLDPKG"
+#~ msgstr "'%s' hozzáadva a PM_OPT_HOLDPKG listához"
+
+#~ msgid "PM_OPT_HOLDPKG flushed"
+#~ msgstr "a PM_OPT_HOLDPKG lista ürítve"
+
+#~ msgid "PM_OPT_USESYSLOG set to '%d'"
+#~ msgstr "PM_OPT_USESYSLOG beállítva a '%d' értékre"
+
+#~ msgid "PM_OPT_LOGMASK set to '%02x'"
+#~ msgstr "PM_OPT_LOGMASK beállítva a '%02x' értékre"
+
+#~ msgid "PM_OPT_PROXYHOST set to '%s'"
+#~ msgstr "PM_OPT_PROXYHOST beállítva a '%s' értékre"
+
+#~ msgid "PM_OPT_PROXYPORT set to '%d'"
+#~ msgstr "PM_OPT_PROXYPORT beállítva a '%d' értékre"
+
+#~ msgid "PM_OPT_XFERCOMMAND set to '%s'"
+#~ msgstr "PM_OPT_XFERCOMMAND beállítva a '%s' értékre"
+
+#~ msgid "PM_OPT_NOPASSIVEFTP set to '%d'"
+#~ msgstr "PM_OPT_NOPASSIVEFTP beállítva a '%d' értékre"
+
+#~ msgid "PM_OPT_CHOMP set to '%d'"
+#~ msgstr "PM_OPT_CHOMP beállítva a '%d' értékre"
+
+#~ msgid "bad package file in %s"
+#~ msgstr "rossz csomagfájl itt: %s"
 
+#~ msgid "%s-%s: local version is newer -- skipping"
+#~ msgstr "%s-%s: a helyi verzió újabb -- kihagyás"
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 2b294973..33bc7fe4 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 13:36+0200\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2007-02-06 20:43-0500\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,1342 +16,1336 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../add.c:95
+#: lib/libalpm/add.c:95
 #, c-format
 msgid "could not parse token %s"
 msgstr ""
 
-#: ../add.c:127
+#: lib/libalpm/add.c:129
 #, c-format
 msgid "loading target '%s'"
 msgstr ""
 
-#: ../add.c:169
+#: lib/libalpm/add.c:175
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr ""
 
-#: ../add.c:178
+#: lib/libalpm/add.c:184
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr ""
 
-#: ../add.c:185
+#: lib/libalpm/add.c:191
 #, c-format
 msgid "reading '%s' metadata"
 msgstr ""
 
-#. look for unsatisfied dependencies
-#: ../add.c:227 ../remove.c:104
+#: lib/libalpm/add.c:244 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr ""
 
-#. no unsatisfied deps, so look for conflicts
-#: ../add.c:239 ../sync.c:504
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
 msgid "looking for conflicts"
 msgstr ""
 
-#. re-order w.r.t. dependencies
-#: ../add.c:251 ../remove.c:140
+#: lib/libalpm/add.c:295 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr ""
 
-#: ../add.c:263
+#: lib/libalpm/add.c:307
 msgid "cleaning up"
 msgstr ""
 
-#: ../add.c:280
+#: lib/libalpm/add.c:324
 msgid "looking for file conflicts"
 msgstr ""
 
-#: ../add.c:345
+#: lib/libalpm/add.c:391
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr ""
 
-#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304
+#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
 #, c-format
 msgid "loading FILES info for '%s'"
 msgstr ""
 
-#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726
-#, c-format
-msgid "loading DESC info for '%s'"
-msgstr ""
-
-#: ../add.c:378
+#: lib/libalpm/add.c:423
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr ""
 
-#: ../add.c:408
+#: lib/libalpm/add.c:453
 #, c-format
 msgid "adding package %s-%s"
 msgstr ""
 
-#: ../add.c:419
+#: lib/libalpm/add.c:464
 #, c-format
 msgid "adding new package %s-%s"
 msgstr ""
 
-#: ../add.c:423
+#: lib/libalpm/add.c:468
 msgid "extracting files"
 msgstr ""
 
-#: ../add.c:438 ../util.c:456
+#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
 msgid "could not get current working directory"
 msgstr ""
 
-#: ../add.c:492
+#: lib/libalpm/add.c:529
 #, c-format
 msgid "notice: %s is in NoExtract -- skipping extraction"
 msgstr ""
 
-#: ../add.c:528 ../add.c:681
+#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr ""
 
-#: ../add.c:571
+#: lib/libalpm/add.c:608
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr ""
 
-#: ../add.c:572 ../add.c:579
+#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
 #, c-format
 msgid "current:  %s"
 msgstr ""
 
-#: ../add.c:573 ../add.c:580
+#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
 #, c-format
 msgid "new:      %s"
 msgstr ""
 
-#: ../add.c:575 ../add.c:582
+#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
 #, c-format
 msgid "original: %s"
 msgstr ""
 
-#: ../add.c:578
+#: lib/libalpm/add.c:615
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr ""
 
-#: ../add.c:596
+#: lib/libalpm/add.c:633
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr ""
 
-#: ../add.c:597
+#: lib/libalpm/add.c:634
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr ""
 
-#: ../add.c:601 ../add.c:645
+#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
 #, c-format
 msgid "could not copy %s to %s (%s)"
 msgstr ""
 
-#: ../add.c:602
+#: lib/libalpm/add.c:639
 #, c-format
 msgid "error: could not copy %s to %s (%s)"
 msgstr ""
 
-#: ../add.c:606
+#: lib/libalpm/add.c:643
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr ""
 
-#: ../add.c:607
+#: lib/libalpm/add.c:644
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: ../add.c:617 ../add.c:620 ../add.c:626
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
 msgid "action: installing new file"
 msgstr ""
 
-#: ../add.c:624
+#: lib/libalpm/add.c:661
 msgid "action: leaving existing file in place"
 msgstr ""
 
-#: ../add.c:630
+#: lib/libalpm/add.c:667
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 
-#: ../add.c:634
+#: lib/libalpm/add.c:671
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr ""
 
-#: ../add.c:635
+#: lib/libalpm/add.c:672
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr ""
 
-#: ../add.c:637
+#: lib/libalpm/add.c:674
 #, c-format
 msgid "%s installed as %s"
 msgstr ""
 
-#: ../add.c:638
+#: lib/libalpm/add.c:675
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr ""
 
-#: ../add.c:643 ../add.c:663
+#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
 #, c-format
 msgid "extracting %s"
 msgstr ""
 
-#: ../add.c:665
+#: lib/libalpm/add.c:702
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr ""
 
-#: ../add.c:667
+#: lib/libalpm/add.c:704
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr ""
 
-#: ../add.c:668
+#: lib/libalpm/add.c:705
 #, c-format
 msgid "warning: extracting %s%s as %s"
 msgstr ""
 
-#: ../add.c:682
+#: lib/libalpm/add.c:719
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr ""
 
-#: ../add.c:693
+#: lib/libalpm/add.c:729
 msgid "appending backup entry"
 msgstr ""
 
-#: ../add.c:725 ../add.c:727
+#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr ""
 
-#: ../add.c:726 ../add.c:728
+#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
 msgid "upgrading"
 msgstr ""
 
-#: ../add.c:726 ../add.c:728
+#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
 msgid "installing"
 msgstr ""
 
-#: ../add.c:749 ../add.c:800
+#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr ""
 
-#. remove the package from the database
-#: ../add.c:760 ../remove.c:284
+#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
 msgid "updating database"
 msgstr ""
 
-#: ../add.c:761
+#: lib/libalpm/add.c:796
 #, c-format
 msgid "adding database entry '%s'"
 msgstr ""
 
-#: ../add.c:763
+#: lib/libalpm/add.c:798
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr ""
 
-#: ../add.c:765
+#: lib/libalpm/add.c:800
 #, c-format
 msgid "error updating database for %s-%s!"
 msgstr ""
 
-#: ../add.c:769
+#: lib/libalpm/add.c:804
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr ""
 
-#. update dependency packages' REQUIREDBY fields
-#: ../add.c:774 ../remove.c:294
+#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
 msgid "updating dependency packages 'requiredby' fields"
 msgstr ""
 
-#: ../add.c:795 ../remove.c:322
+#: lib/libalpm/add.c:832
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr ""
 
-#: ../add.c:803 ../remove.c:332
+#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr ""
 
-#: ../add.c:830 ../remove.c:345
+#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr ""
 
-#: ../alpm.c:201
-#, c-format
-msgid "registering database '%s'"
-msgstr ""
-
-#: ../alpm.c:206
+#: lib/libalpm/alpm.c:113
 #, c-format
-msgid "database directory '%s' does not exist -- try creating it"
+msgid "removing DB %s, %d remaining..."
 msgstr ""
 
-#: ../alpm.c:217
-#, c-format
-msgid "opening database '%s'"
-msgstr ""
-
-#: ../alpm.c:261
+#: lib/libalpm/alpm.c:178
 #, c-format
 msgid "unregistering database '%s'"
 msgstr ""
 
-#: ../alpm.c:266
+#: lib/libalpm/alpm.c:183
 #, c-format
 msgid "closing database '%s'"
 msgstr ""
 
-#: ../alpm.c:344
+#: lib/libalpm/alpm.c:229
 #, c-format
 msgid ""
 "adding new server to database '%s': protocol '%s', server '%s', path '%s'"
 msgstr ""
 
-#: ../alpm.c:348
+#: lib/libalpm/alpm.c:233
 #, c-format
 msgid "serverlist flushed for '%s'"
 msgstr ""
 
-#: ../alpm.c:383
+#: lib/libalpm/alpm.c:276
 #, c-format
-msgid "failed to get lastupdate time for %s (no big deal)\n"
+msgid "failed to get lastupdate time for %s (no big deal)"
 msgstr ""
 
-#: ../alpm.c:402
+#: lib/libalpm/alpm.c:295
 #, c-format
-msgid "sync: new mtime for %s: %s\n"
+msgid "failed to sync db: %s [%d]"
 msgstr ""
 
-#. remove the old dir
-#: ../alpm.c:408
+#: lib/libalpm/alpm.c:299
 #, c-format
-msgid "flushing database %s/%s"
+msgid "sync: new mtime for %s: %s"
 msgstr ""
 
-#: ../alpm.c:412
+#: lib/libalpm/alpm.c:305
 #, c-format
-msgid "could not remove database entry %s/%s"
+msgid "flushing database %s/%s"
 msgstr ""
 
-#. uncompress the sync database
-#. ORE
-#. we should not simply unpack the archive, but better parse it and
-#. db_write each entry (see sync_load_dbarchive to get archive content)
-#: ../alpm.c:426
+#: lib/libalpm/alpm.c:309
 #, c-format
-msgid "unpacking %s"
+msgid "could not remove database entry %s/%s"
 msgstr ""
 
-#: ../alpm.c:574
+#: lib/libalpm/alpm.c:479
 #, c-format
-msgid "loading SCRIPLET info for '%s'"
+msgid "could not get sha1 checksum for package %s-%s"
 msgstr ""
 
-#: ../alpm.c:673
+#: lib/libalpm/alpm.c:485 lib/libalpm/alpm.c:534
 #, c-format
-msgid "could not get sha1 checksum for package %s-%s\n"
+msgid "loading DESC info for '%s'"
 msgstr ""
 
-#: ../alpm.c:684 ../alpm.c:731
+#: lib/libalpm/alpm.c:490 lib/libalpm/alpm.c:539
 #, c-format
 msgid "checksums for package %s-%s are matching"
 msgstr ""
 
-#: ../alpm.c:687
+#: lib/libalpm/alpm.c:493
 #, c-format
-msgid "sha1sums do not match for package %s-%s\n"
+msgid "sha1sums do not match for package %s-%s"
 msgstr ""
 
-#: ../alpm.c:720
+#: lib/libalpm/alpm.c:528
 #, c-format
-msgid "could not get md5 checksum for package %s-%s\n"
+msgid "could not get md5 checksum for package %s-%s"
 msgstr ""
 
-#: ../alpm.c:734
+#: lib/libalpm/alpm.c:542
 #, c-format
-msgid "md5sums do not match for package %s-%s\n"
+msgid "md5sums do not match for package %s-%s"
 msgstr ""
 
-#: ../alpm.c:993
+#: lib/libalpm/alpm.c:791
 #, c-format
 msgid "could not remove lock file %s"
 msgstr ""
 
-#: ../alpm.c:994
+#: lib/libalpm/alpm.c:792
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr ""
 
-#: ../alpm.c:1232
+#: lib/libalpm/alpm.c:929
+#, c-format
+msgid "config: new section '%s'"
+msgstr ""
+
+#: lib/libalpm/alpm.c:958
+msgid "config: nopassiveftp"
+msgstr ""
+
+#: lib/libalpm/alpm.c:961
+msgid "config: usesyslog"
+msgstr ""
+
+#: lib/libalpm/alpm.c:964
+msgid "config: chomp"
+msgstr ""
+
+#: lib/libalpm/alpm.c:967
+msgid "config: usecolor"
+msgstr ""
+
+#: lib/libalpm/alpm.c:976
+#, c-format
+msgid "config: including %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#, c-format
+msgid "config: noupgrade: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#, c-format
+msgid "config: noextract: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#, c-format
+msgid "config: ignorepkg: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#, c-format
+msgid "config: holdpkg: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:1037
+#, c-format
+msgid "config: dbpath: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:1044
+#, c-format
+msgid "config: cachedir: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:1047
+#, c-format
+msgid "config: logfile: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:1050
+#, c-format
+msgid "config: xfercommand: %s"
+msgstr ""
+
+#: lib/libalpm/alpm.c:1055
 #, c-format
-msgid "config: new section '%s'\n"
+msgid "config: upgradedelay: %d"
 msgstr ""
 
-#: ../alpm.c:1275
-msgid "config: usesyslog\n"
+#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+msgid "checking for package replacements"
 msgstr ""
 
-#: ../alpm.c:1286
+#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
 #, c-format
-msgid "config: including %s\n"
+msgid "checking replacement '%s' for package '%s'"
 msgstr ""
 
-#: ../alpm.c:1298 ../alpm.c:1306
+#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
 #, c-format
-msgid "config: noupgrade: %s\n"
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: ../alpm.c:1316 ../alpm.c:1324
+#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
 #, c-format
-msgid "config: noextract: %s\n"
+msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: ../alpm.c:1334 ../alpm.c:1342
+#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
 #, c-format
-msgid "config: ignorepkg: %s\n"
+msgid "'%s' not found in sync db -- skipping"
 msgstr ""
 
-#: ../alpm.c:1352 ../alpm.c:1360
+#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
 #, c-format
-msgid "config: holdpkg: %s\n"
+msgid "'%s' is already elected for removal -- skipping"
 msgstr ""
 
-#: ../alpm.c:1370
+#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
 #, c-format
-msgid "config: dbpath: %s\n"
+msgid "%s: local (%s) is newer than %s (%s)"
 msgstr ""
 
-#: ../alpm.c:1380
+#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
 #, c-format
-msgid "config: cachedir: %s\n"
+msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr ""
 
-#: ../alpm.c:1386
+#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
 #, c-format
-msgid "config: log file: %s\n"
+msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr ""
 
-#. The config value is in days, we use seconds
-#: ../alpm.c:1394
+#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
 #, c-format
-msgid "config: UpgradeDelay: %i\n"
+msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr ""
 
-#. add to the list
-#: ../alpm.c:1415
+#: lib/libalpm/be_files.c:59
 #, c-format
-msgid "config: %s: server: %s\n"
+msgid "unpacking database '%s'"
 msgstr ""
 
-#: ../be_files.c:151
+#: lib/libalpm/be_files.c:183
 #, c-format
 msgid "invalid name for dabatase entry '%s'"
 msgstr ""
 
-#: ../be_files.c:432
+#: lib/libalpm/be_files.c:211
+msgid "invalid package entry provided to _alpm_db_read, skipping"
+msgstr ""
+
+#: lib/libalpm/be_files.c:216
+#, c-format
+msgid ""
+"request to read database info for a file-based package '%s', skipping..."
+msgstr ""
+
+#: lib/libalpm/be_files.c:224
 #, c-format
-msgid "db_write: could not open file %s/desc"
+msgid "loading package data for %s : level=%d"
 msgstr ""
 
-#: ../be_files.c:517
+#: lib/libalpm/be_files.c:232
 #, c-format
-msgid "db_write: could not open file %s/files"
+msgid "cannot find '%s-%s' in db '%s'"
 msgstr ""
 
-#: ../be_files.c:543
+#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
+#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
+#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
+#: lib/libalpm/package.c:185
 #, c-format
-msgid "db_write: could not open file %s/depends"
+msgid "could not open file %s: %s"
 msgstr ""
 
-#: ../cache.c:57
+#: lib/libalpm/be_files.c:492
+#, c-format
+msgid "writing %s-%s DESC information back to db"
+msgstr ""
+
+#: lib/libalpm/be_files.c:578
+#, c-format
+msgid "writing %s-%s FILES information back to db"
+msgstr ""
+
+#: lib/libalpm/be_files.c:605
+#, c-format
+msgid "writing %s-%s DEPENDS information back to db"
+msgstr ""
+
+#: lib/libalpm/cache.c:59
 #, c-format
 msgid "loading package cache (infolevel=%#x) for repository '%s'"
 msgstr ""
 
-#: ../cache.c:77
+#: lib/libalpm/cache.c:83
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr ""
 
-#: ../cache.c:112
+#: lib/libalpm/cache.c:132
+#, c-format
+msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
+msgstr ""
+
+#: lib/libalpm/cache.c:152
 #, c-format
 msgid "adding entry '%s' in '%s' cache"
 msgstr ""
 
-#: ../cache.c:134
+#: lib/libalpm/cache.c:178
 #, c-format
 msgid "removing entry '%s' from '%s' cache"
 msgstr ""
 
-#: ../cache.c:165
+#: lib/libalpm/cache.c:213
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr ""
 
-#. CHECK 1: check targets against database
-#: ../conflict.c:71
+#: lib/libalpm/conflict.c:78
 #, c-format
 msgid "checkconflicts: targ '%s' vs db"
 msgstr ""
 
-#. conflict
-#. confict
-#: ../conflict.c:80 ../conflict.c:94
+#: lib/libalpm/conflict.c:87 lib/libalpm/conflict.c:101
 #, c-format
 msgid "targs vs db: found %s as a conflict for %s"
 msgstr ""
 
-#. CHECK 2: check targets against targets
-#: ../conflict.c:107
+#: lib/libalpm/conflict.c:114
 #, c-format
 msgid "checkconflicts: targ '%s' vs targs"
 msgstr ""
 
-#. otp is listed in tp's conflict list
-#: ../conflict.c:116 ../conflict.c:129
+#: lib/libalpm/conflict.c:123 lib/libalpm/conflict.c:136
 #, c-format
 msgid "targs vs targs: found %s as a conflict for %s"
 msgstr ""
 
-#. CHECK 3: check database against targets
-#: ../conflict.c:143
+#: lib/libalpm/conflict.c:150
 #, c-format
 msgid "checkconflicts: db vs targ '%s'"
 msgstr ""
 
-#: ../conflict.c:170 ../conflict.c:185
+#: lib/libalpm/conflict.c:177 lib/libalpm/conflict.c:192
 #, c-format
 msgid "db vs targs: found %s as a conflict for %s"
 msgstr ""
 
-#: ../conflict.c:234 ../conflict.c:335 ../deps.c:54 ../deps.c:601
-#: ../deps.c:641 ../group.c:42 ../handle.c:62 ../package.c:98 ../sync.c:65
-#: ../sync.c:635 ../sync.c:651 ../sync.c:747 ../trans.c:49 ../util.c:598
-#: ../util.c:605
+#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
+#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr ""
 
-#: ../db.c:57 ../db.c:64
+#: lib/libalpm/db.c:62 lib/libalpm/db.c:69
 #, c-format
 msgid "malloc failed: could not allocate %d bytes"
 msgstr ""
 
-#: ../deps.c:118
+#: lib/libalpm/db.c:163
+msgid "attempt to re-register the 'local' DB"
+msgstr ""
+
+#: lib/libalpm/db.c:171
+#, c-format
+msgid "attempt to re-register the '%s' database, using existing"
+msgstr ""
+
+#: lib/libalpm/db.c:177
+#, c-format
+msgid "registering database '%s'"
+msgstr ""
+
+#: lib/libalpm/db.c:182
+#, c-format
+msgid "database directory '%s' does not exist -- try creating it"
+msgstr ""
+
+#: lib/libalpm/db.c:193
+#, c-format
+msgid "opening database '%s'"
+msgstr ""
+
+#: lib/libalpm/deps.c:128
 msgid "started sorting dependencies"
 msgstr ""
 
-#: ../deps.c:123
+#: lib/libalpm/deps.c:133
 msgid "possible dependency cycle detected"
 msgstr ""
 
-#: ../deps.c:166
+#: lib/libalpm/deps.c:178
 msgid "sorting dependencies finished"
 msgstr ""
 
-#: ../deps.c:260 ../deps.c:406
+#: lib/libalpm/deps.c:219 lib/libalpm/deps.c:276
+msgid "null package found in package list"
+msgstr ""
+
+#: lib/libalpm/deps.c:224
+#, c-format
+msgid "cannot find package installed '%s'"
+msgstr ""
+
+#: lib/libalpm/deps.c:258 lib/libalpm/deps.c:379
 #, c-format
 msgid "checkdeps: found %s as required by %s"
 msgstr ""
 
-#: ../deps.c:370
+#: lib/libalpm/deps.c:284
+#, c-format
+msgid "no dependencies for target '%s'"
+msgstr ""
+
+#: lib/libalpm/deps.c:330
 #, c-format
 msgid "checkdeps: found %s as a dependency for %s"
 msgstr ""
 
-#: ../deps.c:494
+#: lib/libalpm/deps.c:478
 #, c-format
 msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr ""
 
-#: ../deps.c:499
+#: lib/libalpm/deps.c:483
 msgid "dep is NULL!"
 msgstr ""
 
-#: ../deps.c:511
+#: lib/libalpm/deps.c:498
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr ""
 
-#. add it to the target list
-#: ../deps.c:528
+#: lib/libalpm/deps.c:515
 #, c-format
 msgid "loading ALL info for '%s'"
 msgstr ""
 
-#: ../deps.c:531
+#: lib/libalpm/deps.c:518
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr ""
 
-#: ../deps.c:573
+#: lib/libalpm/deps.c:546
+msgid "started resolving dependencies"
+msgstr ""
+
+#: lib/libalpm/deps.c:564
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr ""
 
-#: ../deps.c:597
+#: lib/libalpm/deps.c:589
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
 msgstr ""
 
-#. this dep is already in the target list
-#: ../deps.c:614
+#: lib/libalpm/deps.c:606
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr ""
 
-#: ../deps.c:634
+#: lib/libalpm/deps.c:626
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr ""
 
-#: ../deps.c:638
+#: lib/libalpm/deps.c:630
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr ""
 
-#. cycle detected -- skip it
-#: ../deps.c:654
+#: lib/libalpm/deps.c:646
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr ""
 
-#: ../error.c:34
+#: lib/libalpm/deps.c:650
+msgid "finished resolving dependencies"
+msgstr ""
+
+#: lib/libalpm/error.c:34
 msgid "out of memory!"
 msgstr ""
 
-#: ../error.c:36 ../error.c:135
-msgid "unexpected error"
+#: lib/libalpm/error.c:36
+msgid "unexpected system error"
 msgstr ""
 
-#: ../error.c:38
+#: lib/libalpm/error.c:38
 msgid "insufficient privileges"
 msgstr ""
 
-#: ../error.c:40
+#: lib/libalpm/error.c:40
 msgid "wrong or NULL argument passed"
 msgstr ""
 
-#: ../error.c:42
+#: lib/libalpm/error.c:42
 msgid "could not find or read file"
 msgstr ""
 
-#: ../error.c:45
+#: lib/libalpm/error.c:45
 msgid "library not initialized"
 msgstr ""
 
-#: ../error.c:47
+#: lib/libalpm/error.c:47
 msgid "library already initialized"
 msgstr ""
 
-#: ../error.c:49
+#: lib/libalpm/error.c:49
 msgid "unable to lock database"
 msgstr ""
 
-#: ../error.c:52
+#: lib/libalpm/error.c:52
 msgid "could not open database"
 msgstr ""
 
-#: ../error.c:54
+#: lib/libalpm/error.c:54
 msgid "could not create database"
 msgstr ""
 
-#: ../error.c:56
+#: lib/libalpm/error.c:56
 msgid "database not initialized"
 msgstr ""
 
-#: ../error.c:58
+#: lib/libalpm/error.c:58
 msgid "database already registered"
 msgstr ""
 
-#: ../error.c:60
+#: lib/libalpm/error.c:60
 msgid "could not find database"
 msgstr ""
 
-#: ../error.c:62
+#: lib/libalpm/error.c:62
 msgid "could not update database"
 msgstr ""
 
-#: ../error.c:64
+#: lib/libalpm/error.c:64
 msgid "could not remove database entry"
 msgstr ""
 
-#: ../error.c:71
+#: lib/libalpm/error.c:71
 msgid "could not set parameter"
 msgstr ""
 
-#: ../error.c:74 ../error.c:80
+#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
 msgid "transaction not initialized"
 msgstr ""
 
-#: ../error.c:76
+#: lib/libalpm/error.c:76
 msgid "transaction already initialized"
 msgstr ""
 
-#: ../error.c:78
+#: lib/libalpm/error.c:78
 msgid "duplicate target"
 msgstr ""
 
-#: ../error.c:82
+#: lib/libalpm/error.c:82
 msgid "transaction not prepared"
 msgstr ""
 
-#: ../error.c:84
+#: lib/libalpm/error.c:84
 msgid "transaction aborted"
 msgstr ""
 
-#: ../error.c:86
+#: lib/libalpm/error.c:86
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: ../error.c:89
+#: lib/libalpm/error.c:89
 msgid "could not find or read package"
 msgstr ""
 
-#: ../error.c:91
+#: lib/libalpm/error.c:91
 msgid "invalid or corrupted package"
 msgstr ""
 
-#: ../error.c:93
+#: lib/libalpm/error.c:93
 msgid "cannot open package file"
 msgstr ""
 
-#: ../error.c:95
+#: lib/libalpm/error.c:95
 msgid "cannot load package data"
 msgstr ""
 
-#: ../error.c:97
+#: lib/libalpm/error.c:97
 msgid "package already installed"
 msgstr ""
 
-#: ../error.c:99
+#: lib/libalpm/error.c:99
 msgid "package not installed or lesser version"
 msgstr ""
 
-#: ../error.c:101
+#: lib/libalpm/error.c:101
 msgid "package name is not valid"
 msgstr ""
 
-#: ../error.c:103
+#: lib/libalpm/error.c:103
 msgid "corrupted package"
 msgstr ""
 
-#: ../error.c:106
+#: lib/libalpm/error.c:105
+msgid "no such repository"
+msgstr ""
+
+#: lib/libalpm/error.c:108
 msgid "group not found"
 msgstr ""
 
-#: ../error.c:109
+#: lib/libalpm/error.c:111
 msgid "could not satisfy dependencies"
 msgstr ""
 
-#: ../error.c:111
+#: lib/libalpm/error.c:113
 msgid "conflicting dependencies"
 msgstr ""
 
-#: ../error.c:113
+#: lib/libalpm/error.c:115
 msgid "conflicting files"
 msgstr ""
 
-#: ../error.c:116
+#: lib/libalpm/error.c:118
 msgid "user aborted"
 msgstr ""
 
-#: ../error.c:118
+#: lib/libalpm/error.c:120
 msgid "libarchive error"
 msgstr ""
 
-#: ../error.c:120
+#: lib/libalpm/error.c:122
 msgid "internal error"
 msgstr ""
 
-#: ../error.c:122
+#: lib/libalpm/error.c:124
 msgid "not enough space"
 msgstr ""
 
-#: ../error.c:124
+#: lib/libalpm/error.c:126
 msgid "not confirmed"
 msgstr ""
 
-#: ../error.c:127
+#: lib/libalpm/error.c:129
 msgid "bad section name"
 msgstr ""
 
-#: ../error.c:129
+#: lib/libalpm/error.c:131
 msgid "'local' is reserved and cannot be used as a package tree"
 msgstr ""
 
-#: ../error.c:131
+#: lib/libalpm/error.c:133
 msgid "syntax error"
 msgstr ""
 
-#: ../error.c:133
+#: lib/libalpm/error.c:135
 msgid "all directives must belong to a section"
 msgstr ""
 
-#: ../handle.c:143
-#, c-format
-msgid "PM_OPT_DBPATH set to '%s'"
-msgstr ""
-
-#: ../handle.c:150
-#, c-format
-msgid "PM_OPT_CACHEDIR set to '%s'"
-msgstr ""
-
-#: ../handle.c:167
-#, c-format
-msgid "can't open log file %s"
-msgstr ""
-
-#: ../handle.c:171
-#, c-format
-msgid "PM_OPT_LOGFILE set to '%s'"
-msgstr ""
-
-#: ../handle.c:176
-#, c-format
-msgid "'%s' added to PM_OPT_NOUPGRADE"
-msgstr ""
-
-#: ../handle.c:179
-msgid "PM_OPT_NOUPGRADE flushed"
-msgstr ""
-
-#: ../handle.c:185
-#, c-format
-msgid "'%s' added to PM_OPT_NOEXTRACT"
-msgstr ""
-
-#: ../handle.c:188
-msgid "PM_OPT_NOEXTRACT flushed"
-msgstr ""
-
-#: ../handle.c:194
-#, c-format
-msgid "'%s' added to PM_OPT_IGNOREPKG"
-msgstr ""
-
-#: ../handle.c:197
-msgid "PM_OPT_IGNOREPKG flushed"
-msgstr ""
-
-#: ../handle.c:203
-#, c-format
-msgid "'%s' added to PM_OPT_HOLDPKG"
-msgstr ""
-
-#: ../handle.c:206
-msgid "PM_OPT_HOLDPKG flushed"
-msgstr ""
-
-#: ../handle.c:222
-#, c-format
-msgid "PM_OPT_USESYSLOG set to '%d'"
-msgstr ""
-
-#: ../handle.c:262
-#, c-format
-msgid "PM_OPT_LOGMASK set to '%02x'"
-msgstr ""
-
-#: ../handle.c:281
-#, c-format
-msgid "PM_OPT_PROXYHOST set to '%s'"
-msgstr ""
-
-#: ../handle.c:285
-#, c-format
-msgid "PM_OPT_PROXYPORT set to '%d'"
+#: lib/libalpm/error.c:137
+msgid "invalid regular expression"
 msgstr ""
 
-#: ../handle.c:296
-#, c-format
-msgid "PM_OPT_XFERCOMMAND set to '%s'"
+#: lib/libalpm/error.c:139
+msgid "connection to remote host failed"
 msgstr ""
 
-#: ../handle.c:300
-#, c-format
-msgid "PM_OPT_NOPASSIVEFTP set to '%d'"
+#: lib/libalpm/error.c:141
+msgid "forking process failed"
 msgstr ""
 
-#: ../handle.c:304
-#, c-format
-msgid "PM_OPT_CHOMP set to '%d'"
+#: lib/libalpm/error.c:143
+msgid "unexpected error"
 msgstr ""
 
-#: ../md5driver.c:48 ../sha1.c:395
+#: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398
 #, c-format
 msgid "%s can't be opened\n"
 msgstr ""
 
-#: ../package.c:185
-#, c-format
-msgid "could not open file %s"
-msgstr ""
-
-#: ../package.c:202 ../package.c:262
+#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr ""
 
-#: ../package.c:319
+#: lib/libalpm/package.c:331
 msgid "could not parse the package description file"
 msgstr ""
 
-#: ../package.c:327
+#: lib/libalpm/package.c:335
 #, c-format
 msgid "missing package name in %s"
 msgstr ""
 
-#: ../package.c:335
+#: lib/libalpm/package.c:339
 #, c-format
 msgid "missing package version in %s"
 msgstr ""
 
-#: ../package.c:374
+#: lib/libalpm/package.c:374
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr ""
 
-#: ../package.c:391
+#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
 #, c-format
-msgid "bad package file in %s"
+msgid "error while reading package: %s"
+msgstr ""
+
+#: lib/libalpm/package.c:400
+msgid "missing package metadata"
 msgstr ""
 
-#: ../package.c:399
+#: lib/libalpm/package.c:407
 #, c-format
-msgid "missing package info file in %s"
+msgid "missing package filelist in %s, generating one"
 msgstr ""
 
-#: ../remove.c:76
+#: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
 msgstr ""
 
-#: ../remove.c:88
+#: lib/libalpm/remove.c:92
 #, c-format
 msgid "adding %s in the targets list"
 msgstr ""
 
-#: ../remove.c:114
+#: lib/libalpm/remove.c:120
 #, c-format
 msgid "pulling %s in the targets list"
 msgstr ""
 
-#: ../remove.c:117
+#: lib/libalpm/remove.c:123
 #, c-format
 msgid "could not find %s in database -- skipping"
 msgstr ""
 
-#: ../remove.c:135
+#: lib/libalpm/remove.c:141
 msgid "finding removable dependencies"
 msgstr ""
 
-#: ../remove.c:180
-#, c-format
-msgid "removing package %s-%s"
-msgstr ""
-
-#: ../remove.c:191
-msgid "removing files"
-msgstr ""
-
-#: ../remove.c:217
+#: lib/libalpm/remove.c:193
 #, c-format
 msgid "file %s does not exist"
 msgstr ""
 
-#. this is okay, other packages are probably using it.
-#: ../remove.c:223
+#: lib/libalpm/remove.c:199
 #, c-format
 msgid "keeping directory %s"
 msgstr ""
 
-#: ../remove.c:225
+#: lib/libalpm/remove.c:201
 #, c-format
 msgid "removing directory %s"
 msgstr ""
 
-#: ../remove.c:239
+#: lib/libalpm/remove.c:215
 #, c-format
 msgid "skipping removal of %s as it has moved to another package"
 msgstr ""
 
-#: ../remove.c:251 ../remove.c:252
+#: lib/libalpm/remove.c:227
 #, c-format
 msgid "%s saved as %s"
 msgstr ""
 
-#: ../remove.c:254 ../remove.c:261
+#: lib/libalpm/remove.c:231
 #, c-format
 msgid "unlinking %s"
 msgstr ""
 
-#: ../remove.c:256 ../remove.c:266
+#: lib/libalpm/remove.c:237
 #, c-format
-msgid "cannot remove file %s"
+msgid "cannot remove file %s: %s"
 msgstr ""
 
-#: ../remove.c:285
+#: lib/libalpm/remove.c:265
 #, c-format
-msgid "removing database entry '%s'"
+msgid "removing package %s-%s"
 msgstr ""
 
-#: ../remove.c:287
-#, c-format
-msgid "could not remove database entry %s-%s"
+#: lib/libalpm/remove.c:276
+msgid "removing files"
 msgstr ""
 
-#: ../remove.c:290
+#: lib/libalpm/remove.c:294
 #, c-format
-msgid "could not remove entry '%s' from cache"
+msgid "removing database entry '%s'"
 msgstr ""
 
-#: ../remove.c:330
+#: lib/libalpm/remove.c:296
 #, c-format
-msgid "updating 'requiredby' field for package '%s'"
-msgstr ""
-
-#. check for "recommended" package replacements
-#: ../sync.c:160
-msgid "checking for package replacements"
+msgid "could not remove database entry %s-%s"
 msgstr ""
 
-#: ../sync.c:169
+#: lib/libalpm/remove.c:299
 #, c-format
-msgid "checking replacement '%s' for package '%s'"
+msgid "could not remove entry '%s' from cache"
 msgstr ""
 
-#: ../sync.c:171
+#: lib/libalpm/remove.c:333
 #, c-format
-msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
+msgid "could not find dependency '%s' for removal"
 msgstr ""
 
-#: ../sync.c:205
+#: lib/libalpm/remove.c:343
 #, c-format
-msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
+msgid "updating 'requiredby' field for package '%s'"
 msgstr ""
 
-#. match installed packages with the sync dbs and compare versions
-#: ../sync.c:217
+#: lib/libalpm/sync.c:200
 msgid "checking for package upgrades"
 msgstr ""
 
-#: ../sync.c:229
+#: lib/libalpm/sync.c:278
 #, c-format
-msgid "'%s' not found in sync db -- skipping"
+msgid "searching for target in repo '%s'"
 msgstr ""
 
-#: ../sync.c:243 ../sync.c:530
-#, c-format
-msgid "'%s' is already elected for removal -- skipping"
-msgstr ""
-
-#. local version is newer
-#: ../sync.c:252
-#, c-format
-msgid "%s-%s: local version is newer"
-msgstr ""
-
-#. package should be ignored (IgnorePkg)
-#: ../sync.c:258
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr ""
-
-#. package too new (UpgradeDelay)
-#: ../sync.c:262
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)\n"
-msgstr ""
-
-#: ../sync.c:266
-#, c-format
-msgid "%s-%s elected for upgrade (%s => %s)"
-msgstr ""
-
-#. Search provides
-#: ../sync.c:317 ../sync.c:336
+#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr ""
 
-#: ../sync.c:322 ../sync.c:341
+#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr ""
 
-#: ../sync.c:360
+#: lib/libalpm/sync.c:299
 #, c-format
-msgid "%s-%s: local version is newer -- skipping"
+msgid "repository '%s' not found"
 msgstr ""
 
-#: ../sync.c:368
+#: lib/libalpm/sync.c:333
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr ""
 
-#: ../sync.c:388
+#: lib/libalpm/sync.c:353
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr ""
 
-#: ../sync.c:433
-msgid "resolving targets dependencies"
+#: lib/libalpm/sync.c:401
+msgid "resolving target's dependencies"
 msgstr ""
 
-#: ../sync.c:453
+#: lib/libalpm/sync.c:421
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr ""
 
-#: ../sync.c:485
+#: lib/libalpm/sync.c:456
 msgid "looking for unresolvable dependencies"
 msgstr ""
 
-#: ../sync.c:515
+#: lib/libalpm/sync.c:487
 #, c-format
 msgid "package '%s' is conflicting with '%s'"
 msgstr ""
 
-#: ../sync.c:537
+#: lib/libalpm/sync.c:509
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr ""
 
-#. so just treat it like a "replaces" item so the REQUIREDBY
-#. * fields are inherited properly.
-#.
-#: ../sync.c:548
+#: lib/libalpm/sync.c:520
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr ""
 
-#: ../sync.c:571 ../sync.c:576
+#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr ""
 
-#: ../sync.c:588 ../sync.c:625
+#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
 #, c-format
 msgid "removing '%s' from target list"
 msgstr ""
 
-#. It's a conflict -- see if they want to remove it
-#.
-#: ../sync.c:597
+#: lib/libalpm/sync.c:569
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr ""
 
-#. append to the replaces list
-#: ../sync.c:620
+#: lib/libalpm/sync.c:592
 #, c-format
 msgid "electing '%s' for removal"
 msgstr ""
 
-#. abort
-#: ../sync.c:631 ../sync.c:647
+#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
 msgid "unresolvable package conflicts detected"
 msgstr ""
 
-#: ../sync.c:699
+#: lib/libalpm/sync.c:671
 msgid "checking dependencies of packages designated for removal"
 msgstr ""
 
-#: ../sync.c:713
+#: lib/libalpm/sync.c:685
 msgid "something has gone horribly wrong"
 msgstr ""
 
-#. found matching provisio -- we're good to go
-#: ../sync.c:732
+#: lib/libalpm/sync.c:704
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr ""
 
-#: ../sync.c:825
+#: lib/libalpm/sync.c:800
 #, c-format
-msgid "%s-%s-%s%s is already in the cache\n"
+msgid "%s is already in the cache\n"
 msgstr ""
 
-#. no cache directory.... try creating it
-#: ../sync.c:837
+#: lib/libalpm/sync.c:811
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: ../sync.c:838
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#. couldn't mkdir the cache directory, so fall back to /tmp and unlink
-#. * the package afterwards.
-#.
-#: ../sync.c:843
+#: lib/libalpm/sync.c:817
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: ../sync.c:844
+#: lib/libalpm/sync.c:818
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: ../sync.c:847
-#, c-format
-msgid "failed to set option CACHEDIR (%s)\n"
-msgstr ""
-
-#: ../sync.c:854
+#: lib/libalpm/sync.c:825
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: ../sync.c:883 ../sync.c:895
+#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr ""
 
-#: ../sync.c:914
+#: lib/libalpm/sync.c:885
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: ../sync.c:916
+#: lib/libalpm/sync.c:887
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: ../sync.c:936
+#: lib/libalpm/sync.c:908
 msgid "could not create removal transaction"
 msgstr ""
 
-#: ../sync.c:942
+#: lib/libalpm/sync.c:914
 msgid "could not initialize the removal transaction"
 msgstr ""
 
-#: ../sync.c:962
+#: lib/libalpm/sync.c:934
 msgid "removing conflicting and to-be-replaced packages"
 msgstr ""
 
-#: ../sync.c:964
+#: lib/libalpm/sync.c:936
 msgid "could not prepare removal transaction"
 msgstr ""
 
-#: ../sync.c:970
+#: lib/libalpm/sync.c:942
 msgid "could not commit removal transaction"
 msgstr ""
 
-#. install targets
-#: ../sync.c:977
+#: lib/libalpm/sync.c:949
 msgid "installing packages"
 msgstr ""
 
-#: ../sync.c:980
+#: lib/libalpm/sync.c:952
 msgid "could not create transaction"
 msgstr ""
 
-#: ../sync.c:985
+#: lib/libalpm/sync.c:957
 msgid "could not initialize transaction"
 msgstr ""
 
-#: ../sync.c:1004
+#: lib/libalpm/sync.c:980
 msgid "could not prepare transaction"
 msgstr ""
 
-#: ../sync.c:1009
+#: lib/libalpm/sync.c:985
 msgid "could not commit transaction"
 msgstr ""
 
-#: ../sync.c:1016
+#: lib/libalpm/sync.c:992
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 
-#: ../sync.c:1045
+#: lib/libalpm/sync.c:1021
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""
 
-#: ../sync.c:1054
+#: lib/libalpm/sync.c:1030
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr ""
 
-#: ../util.c:285
+#: lib/libalpm/util.c:278
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr ""
+
+#: lib/libalpm/util.c:291
 #, c-format
 msgid "could not extract %s: %s\n"
 msgstr ""
 
-#: ../util.c:436
+#: lib/libalpm/util.c:349
+#, c-format
+msgid "logaction called: %s"
+msgstr ""
+
+#: lib/libalpm/util.c:441
 msgid "could not create temp directory"
 msgstr ""
 
-#: ../util.c:463
+#: lib/libalpm/util.c:468
 #, c-format
 msgid "could not change directory to %s (%s)"
 msgstr ""
 
-#: ../util.c:466
+#: lib/libalpm/util.c:471
 #, c-format
 msgid "executing %s script..."
 msgstr ""
 
-#: ../util.c:479
+#: lib/libalpm/util.c:484
 #, c-format
 msgid "could not fork a new process (%s)"
 msgstr ""
 
-#: ../util.c:486
+#: lib/libalpm/util.c:491
 #, c-format
 msgid "chrooting in %s"
 msgstr ""
 
-#: ../util.c:488
+#: lib/libalpm/util.c:493
 #, c-format
 msgid "could not change the root directory (%s)"
 msgstr ""
 
-#: ../util.c:492
+#: lib/libalpm/util.c:497
 #, c-format
 msgid "could not change directory to / (%s)"
 msgstr ""
 
-#: ../util.c:496
+#: lib/libalpm/util.c:501
 #, c-format
 msgid "executing \"%s\""
 msgstr ""
 
-#: ../util.c:499
+#: lib/libalpm/util.c:504
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""
 
-#: ../util.c:521
+#: lib/libalpm/util.c:529
 #, c-format
 msgid "call to waitpid failed (%s)"
 msgstr ""
 
-#: ../util.c:529
+#: lib/libalpm/util.c:537
 #, c-format
 msgid "could not remove tmpdir %s"
 msgstr ""
 
-#: ../util.c:593
+#: lib/libalpm/util.c:594
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""
+
+#: lib/libalpm/versioncmp.c:277
+#, c-format
+msgid "depcmp: %s-%s %s %s-%s => %s"
+msgstr ""
+
+#: lib/libalpm/versioncmp.c:281
+#, c-format
+msgid "depcmp: %s-%s %s %s => %s"
+msgstr ""
diff --git a/src/pacman/po/LINGUAS b/src/pacman/po/LINGUAS
index cc891622..0f3f0ccb 100644
--- a/src/pacman/po/LINGUAS
+++ b/src/pacman/po/LINGUAS
@@ -1,8 +1,6 @@
-# Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
-# This file is in the public domain.
-#
 # Set of available languages.
 de
 fr
 hu
+it
+pt_BR
diff --git a/src/pacman/po/Makevars b/src/pacman/po/Makevars
index c85b8993..dd4e84b4 100644
--- a/src/pacman/po/Makevars
+++ b/src/pacman/po/Makevars
@@ -13,30 +13,12 @@ XGETTEXT_OPTIONS = \
   --keyword=N_ --flag=N_:1:pass-c-format
 
 # This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Yoyodyne, Inc.
+# $(DOMAIN).pot file.
+COPYRIGHT_HOLDER = Judd Vinet <jvinet@zeroflux.org>
 
 # This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
+# bugs in the untranslated strings.
+MSGID_BUGS_ADDRESS = pacman-dev@archlinux.org
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
diff --git a/src/pacman/po/POTFILES.in b/src/pacman/po/POTFILES.in
index bd22902e..fb86a51e 100644
--- a/src/pacman/po/POTFILES.in
+++ b/src/pacman/po/POTFILES.in
@@ -1,14 +1,16 @@
-add.c
-conf.c
-deptest.c
-download.c
-list.c
-log.c
-log.h
-package.c
-pacman.c
-query.c
-remove.c
-sync.c
-trans.c
-util.c
+# List of source files with translatable strings
+
+src/pacman/add.c
+src/pacman/conf.c
+src/pacman/deptest.c
+src/pacman/downloadprog.c
+src/pacman/log.c
+src/pacman/log.h
+src/pacman/package.c
+src/pacman/pacman.c
+src/pacman/query.c
+src/pacman/remove.c
+src/pacman/sync.c
+src/pacman/trans.c
+src/pacman/upgrade.c
+src/pacman/util.c
diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po
index a6922bb2..5108782d 100644
--- a/src/pacman/po/de.po
+++ b/src/pacman/po/de.po
@@ -1,13 +1,13 @@
 # German translations for pacman package.
-# Copyright (C) 2006 THE pacman'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the pacman package.
+# Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
 # Marcus Habermehl <bmh1980@frugalware.org>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bmh 1980\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 13:36+0200\n"
+"Project-Id-Version: Pacman package manager 3.0.0\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2007-02-06 20:43-0500\n"
 "PO-Revision-Date: 2006-05-04 17:10+0200\n"
 "Last-Translator: Marcus Habermehl <bmh1980@frugalware.org>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:378 ../sync.c:417
+#: src/pacman/add.c:69 src/pacman/deptest.c:69 src/pacman/remove.c:79
+#: src/pacman/sync.c:442 src/pacman/sync.c:491
 #, fuzzy, c-format
 msgid ""
 "       if you're sure a package manager is not already running,\n"
@@ -25,46 +26,47 @@ msgstr ""
 "       Wenn Sie sicher sind, dass nicht bereits ein Paketmanager\n"
 "       gestartet ist, können Sie %s entfernen\n"
 
-#. and add targets to it
-#: ../add.c:76
+#: src/pacman/add.c:76
 msgid "loading package data... "
 msgstr "Lade Paketdaten ... "
 
-#: ../add.c:79 ../remove.c:92
-#, c-format
-msgid "failed to add target '%s' (%s)\n"
+#: src/pacman/add.c:80
+#, fuzzy, c-format
+msgid "failed to add target '%s' (%s)"
 msgstr "Konnte Paket '%s' nicht hinzufügen (%s)\n"
 
-#: ../add.c:84
-msgid "done."
-msgstr "erledigt."
+#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:86
+#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
+#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+msgid "done.\n"
+msgstr "beendet.\n"
 
-#: ../add.c:92 ../remove.c:102 ../sync.c:505
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "Konnte Durchführung nicht vorbereiten (%s)\n"
 
-#: ../add.c:97
+#: src/pacman/add.c:97
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ":: %s: Benötigt %s"
 
-#: ../add.c:111 ../sync.c:526
+#: src/pacman/add.c:118 src/pacman/sync.c:605
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: Steht im Konflikt mit %s"
 
-#: ../add.c:121 ../sync.c:649
-#, c-format
-msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)"
+#: src/pacman/add.c:127 src/pacman/sync.c:669
+#, fuzzy, c-format
+msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
 msgstr "%s%s existiert in \"%s\" (Paket) und \"%s\" (Paket)"
 
-#: ../add.c:128 ../sync.c:656
-#, c-format
-msgid "%s: %s%s exists in filesystem"
+#: src/pacman/add.c:134 src/pacman/sync.c:676
+#, fuzzy, c-format
+msgid "%s: %s%s exists in filesystem\n"
 msgstr "%s: %s%s existiert im Dateisystem"
 
-#: ../add.c:136 ../sync.c:664 ../sync.c:671
+#: src/pacman/add.c:141 src/pacman/sync.c:683 src/pacman/sync.c:689
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -72,351 +74,302 @@ msgstr ""
 "\n"
 "Fehler aufgetreten, kein Paket wird aktualisiert.\n"
 
-#: ../add.c:143 ../sync.c:536
+#: src/pacman/add.c:151 src/pacman/sync.c:612
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ""
 
-#: ../add.c:157 ../remove.c:142 ../sync.c:642
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr ""
 
-#: ../add.c:164 ../remove.c:152 ../sync.c:410 ../sync.c:684
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:484
+#: src/pacman/sync.c:705
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr ""
 
-#: ../deptest.c:77
+#: src/pacman/deptest.c:82
 msgid "memory allocation failure\n"
 msgstr ""
 
-#: ../deptest.c:87
+#: src/pacman/deptest.c:93
 #, c-format
 msgid "add target %s\n"
 msgstr "Paket hinzufügen %s\n"
 
-#: ../deptest.c:90
+#: src/pacman/deptest.c:96
 #, c-format
 msgid "could not add target (%s)\n"
 msgstr "Konnte Paket nicht hinzufügen (%s)\n"
 
-#: ../deptest.c:110
+#: src/pacman/deptest.c:115
 #, c-format
 msgid "requires: %s"
 msgstr "Erfordert: %s"
 
-#: ../deptest.c:126
+#: src/pacman/deptest.c:139
 #, c-format
 msgid "conflict: %s"
 msgstr "Konflikt: %s"
 
-#: ../deptest.c:140 ../deptest.c:158
+#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
 #, c-format
 msgid "could not release transaction (%s)"
 msgstr ""
 
-#: ../list.c:143 ../list.c:171
-#, c-format
-msgid "None\n"
-msgstr "Nichts\n"
-
-#: ../log.c:55
+#: src/pacman/log.c:61
 #, c-format
 msgid "debug"
 msgstr "Fehlersuche"
 
-#: ../log.c:58
+#: src/pacman/log.c:64
 #, c-format
 msgid "error"
 msgstr "Fehler"
 
-#: ../log.c:61
+#: src/pacman/log.c:67
 #, c-format
 msgid "warning"
 msgstr "Warnung"
 
-#: ../log.c:64
-#, c-format
-msgid "flow1"
-msgstr ""
-
-#: ../log.c:67
-#, c-format
-msgid "flow2"
-msgstr ""
-
-#: ../log.c:70
+#: src/pacman/log.c:73
 #, c-format
 msgid "function"
 msgstr "Funktion"
 
-#: ../log.c:154
+#: src/pacman/log.c:199
 msgid "Y"
 msgstr "J"
 
-#: ../log.c:154
+#: src/pacman/log.c:199
 msgid "YES"
 msgstr "JA"
 
-#: ../log.h:26
+#: src/pacman/log.h:26
 #, fuzzy
 msgid "error: "
 msgstr "Fehler"
 
-#: ../log.h:30
+#: src/pacman/log.h:30
 #, fuzzy
 msgid "warning: "
 msgstr "Warnung"
 
-#: ../package.c:46
+#: src/pacman/package.c:57
+#, fuzzy
+msgid "Explicitly installed"
+msgstr "Ausdrücklich installiert\n"
+
+#: src/pacman/package.c:60
+#, fuzzy
+msgid "Installed as a dependency for another package"
+msgstr "Installiert als Abhängigkeit für ein anderes Paket\n"
+
+#: src/pacman/package.c:63 src/pacman/package.c:85
+#, fuzzy
+msgid "Unknown"
+msgstr "Unbekannt\n"
+
+#: src/pacman/package.c:68 src/pacman/package.c:118
 #, c-format
 msgid "Name           : %s\n"
 msgstr ""
 
-#: ../package.c:47
+#: src/pacman/package.c:69 src/pacman/package.c:119
 #, c-format
 msgid "Version        : %s\n"
 msgstr ""
 
-#: ../package.c:49
+#: src/pacman/package.c:70
+#, fuzzy, c-format
+msgid "URL            : %s\n"
+msgstr ""
+"\n"
+"MD5 Summe         : %s"
+
+#: src/pacman/package.c:71
+msgid "License        :"
+msgstr "Lizenz         :"
+
+#: src/pacman/package.c:72 src/pacman/package.c:120
 msgid "Groups         :"
 msgstr "Gruppen        :"
 
-#: ../package.c:51
+#: src/pacman/package.c:73 src/pacman/package.c:121
+msgid "Provides       :"
+msgstr "Stellt bereit  :"
+
+#: src/pacman/package.c:74 src/pacman/package.c:122
+msgid "Depends On     :"
+msgstr "Hängt ab von   :"
+
+#: src/pacman/package.c:75 src/pacman/package.c:123
+msgid "Removes        :"
+msgstr "Entfernt       :"
+
+#: src/pacman/package.c:78
+msgid "Required By    :"
+msgstr "Benötigt von   :"
+
+#: src/pacman/package.c:80 src/pacman/package.c:124
+msgid "Conflicts With :"
+msgstr "Konflikt mit   :"
+
+#: src/pacman/package.c:81
+#, fuzzy, c-format
+msgid "Installed Size : %ld K\n"
+msgstr "Inst. Skript   : %s\n"
+
+#: src/pacman/package.c:82
 #, c-format
 msgid "Packager       : %s\n"
 msgstr "Paketersteller : %s\n"
 
-#: ../package.c:53
-msgid "License        :"
-msgstr "Lizenz         :"
-
-#: ../package.c:54
+#: src/pacman/package.c:83
 #, c-format
 msgid "Architecture   : %s\n"
 msgstr "Architektur    : %s\n"
 
-#: ../package.c:55
-#, c-format
-msgid "Size           : %ld\n"
-msgstr "Größe          : %ld\n"
-
-#: ../package.c:58
+#: src/pacman/package.c:84
 #, c-format
 msgid "Build Date     : %s %s\n"
 msgstr "Erstellt       : %s %s\n"
 
-#: ../package.c:60
+#: src/pacman/package.c:85
 #, fuzzy, c-format
 msgid "Build Type     : %s\n"
 msgstr "Erstellt       : %s %s\n"
 
-#: ../package.c:60
-#, fuzzy
-msgid "Unknown"
-msgstr "Unbekannt\n"
-
-#: ../package.c:62
+#: src/pacman/package.c:87
 #, c-format
 msgid "Install Date   : %s %s\n"
 msgstr "Installiert    : %s %s\n"
 
-#: ../package.c:64
+#: src/pacman/package.c:88
+#, fuzzy, c-format
+msgid "Install Reason : %s\n"
+msgstr "Inst. Skript   : %s\n"
+
+#: src/pacman/package.c:90
 #, c-format
 msgid "Install Script : %s\n"
 msgstr "Inst. Skript   : %s\n"
 
-#: ../package.c:64
+#: src/pacman/package.c:91
 msgid "Yes"
 msgstr "Ja"
 
-#: ../package.c:64
+#: src/pacman/package.c:91
 msgid "No"
 msgstr "Nein"
 
-#: ../package.c:66
-#, fuzzy, c-format
-msgid "Reason         : "
-msgstr "Grund          : "
-
-#: ../package.c:69
-#, c-format
-msgid "Explicitly installed\n"
-msgstr "Ausdrücklich installiert\n"
-
-#: ../package.c:72
-#, c-format
-msgid "Installed as a dependency for another package\n"
-msgstr "Installiert als Abhängigkeit für ein anderes Paket\n"
-
-#: ../package.c:75
-#, c-format
-msgid "Unknown\n"
-msgstr "Unbekannt\n"
-
-#: ../package.c:79
-msgid "Provides       :"
-msgstr "Stellt bereit  :"
-
-#: ../package.c:80
-msgid "Depends On     :"
-msgstr "Hängt ab von   :"
-
-#: ../package.c:81
-msgid "Removes        :"
-msgstr "Entfernt       :"
-
-#: ../package.c:82
-msgid "Required By    :"
-msgstr "Benötigt von   :"
-
-#: ../package.c:83
-msgid "Conflicts With :"
-msgstr "Konflikt mit   :"
-
-#: ../package.c:85
+#: src/pacman/package.c:93 src/pacman/package.c:129
 #, c-format
 msgid "Description    : "
 msgstr "Beschreibung   : "
 
-#: ../package.c:110
-#, c-format
-msgid "error calculating md5sum or sha1sum for %s\n"
-msgstr "Fehler beim Berechnen der MD5 oder SHA1 Summen für %s\n"
-
-#: ../package.c:115 ../package.c:117
-#, c-format
-msgid "%sMODIFIED\t%s\n"
-msgstr "%sMODIFIZIERT\t%s\n"
-
-#: ../package.c:115 ../package.c:117
-msgid "NOT "
-msgstr "NICHT"
+#: src/pacman/package.c:117
+#, fuzzy, c-format
+msgid "Repository     : %s\n"
+msgstr "Paketersteller : %s\n"
 
-#: ../package.c:121
-#, c-format
-msgid "MISSING\t\t%s\n"
-msgstr "FEHLEND\t\t%s\n"
+#: src/pacman/package.c:125
+#, fuzzy
+msgid "Replaces       :"
+msgstr "Ersetzt           :"
 
-#: ../package.c:139
+#: src/pacman/package.c:126
 #, c-format
-msgid "Repository        : %s\n"
+msgid "Download Size  : %6.2f K\n"
 msgstr ""
 
-#: ../package.c:140
-#, c-format
-msgid "Name              : %s\n"
-msgstr ""
+#: src/pacman/package.c:127
+#, fuzzy, c-format
+msgid "Installed Size : %6.2f K\n"
+msgstr "Inst. Skript   : %s\n"
 
-#: ../package.c:141
-#, c-format
-msgid "Version           : %s\n"
+#: src/pacman/package.c:134
+#, fuzzy, c-format
+msgid "MD5 Sum        : %s"
 msgstr ""
+"\n"
+"MD5 Summe         : %s"
 
-#: ../package.c:143
-msgid "Groups            :"
-msgstr "Gruppen           :"
-
-#: ../package.c:144
-msgid "Provides          :"
-msgstr "Stellt bereit     :"
-
-#: ../package.c:145
-msgid "Depends On        :"
-msgstr "Hängt ab von      :"
-
-#: ../package.c:146
-msgid "Removes           :"
-msgstr "Entfernt          :"
-
-#: ../package.c:147
-msgid "Conflicts With    :"
-msgstr "Konflikt mit      :"
-
-#: ../package.c:148
-msgid "Replaces          :"
-msgstr "Ersetzt           :"
-
-#: ../package.c:150
-#, c-format
-msgid "Size (compressed) : %ld\n"
-msgstr "Größe komprimiert : %ld\n"
+#: src/pacman/package.c:137
+#, fuzzy, c-format
+msgid "SHA1 Sum       : %s"
+msgstr ""
+"\n"
+"SHA1 Summe        : %s"
 
-#: ../package.c:151
+#: src/pacman/package.c:168
 #, fuzzy, c-format
-msgid "Size (uncompressed):%ld\n"
-msgstr "Größe komprimiert : %ld\n"
+msgid "error calculating checksums for %s\n"
+msgstr "Fehler beim Berechnen der MD5 oder SHA1 Summen für %s\n"
 
-#: ../package.c:152
-#, c-format
-msgid "Description       : "
-msgstr "Beschreibung      : "
+#: src/pacman/package.c:181
+#, fuzzy, c-format
+msgid "MODIFIED\t%s\n"
+msgstr "%sMODIFIZIERT\t%s\n"
 
-#: ../package.c:156
+#: src/pacman/package.c:183
 #, c-format
-msgid ""
-"\n"
-"MD5 Sum           : %s"
+msgid "Not Modified\t%s\n"
 msgstr ""
-"\n"
-"MD5 Summe         : %s"
 
-#: ../package.c:160
+#: src/pacman/package.c:188
 #, c-format
-msgid ""
-"\n"
-"SHA1 Sum          : %s"
-msgstr ""
-"\n"
-"SHA1 Summe        : %s"
+msgid "MISSING\t\t%s\n"
+msgstr "FEHLEND\t\t%s\n"
 
-#: ../package.c:189
+#: src/pacman/package.c:221
 #, c-format
 msgid "No changelog available for '%s'.\n"
 msgstr "Kein Changelog für '%s' verfügbar.\n"
 
-#: ../pacman.c:96
+#: src/pacman/pacman.c:88
 #, c-format
 msgid "usage:  %s {-h --help}\n"
 msgstr "Verwendung:  %s {-h --help}\n"
 
-#: ../pacman.c:97
+#: src/pacman/pacman.c:89
 #, c-format
 msgid "        %s {-V --version}\n"
 msgstr "        %s {-V --version}\n"
 
-#: ../pacman.c:98
+#: src/pacman/pacman.c:90
 #, c-format
 msgid "        %s {-A --add}     [options] <file>\n"
 msgstr "        %s {-A --add}     [Optionen] <Datei>\n"
 
-#: ../pacman.c:99
+#: src/pacman/pacman.c:91
 #, c-format
 msgid "        %s {-R --remove}  [options] <package>\n"
 msgstr "        %s {-R --remove   [Optionen] <Paket>\n"
 
-#: ../pacman.c:100
+#: src/pacman/pacman.c:92
 #, c-format
 msgid "        %s {-U --upgrade} [options] <file>\n"
 msgstr "        %s {-U --upgrade} [Optionen] <Datei>\n"
 
-#: ../pacman.c:101
+#: src/pacman/pacman.c:93
 #, c-format
 msgid "        %s {-F --freshen} [options] <file>\n"
 msgstr "        %s {-F --freshen} [Optionen] <Datei>\n"
 
-#: ../pacman.c:102
+#: src/pacman/pacman.c:94
 #, c-format
 msgid "        %s {-Q --query}   [options] [package]\n"
 msgstr "        %s {-Q --query}   [Optionen] [Paket]\n"
 
-#: ../pacman.c:103
+#: src/pacman/pacman.c:95
 #, c-format
 msgid "        %s {-S --sync}    [options] [package]\n"
 msgstr "        %s {-S --sync}    [Optionen] [Paket]\n"
 
-#: ../pacman.c:104
+#: src/pacman/pacman.c:96
 #, c-format
 msgid ""
 "\n"
@@ -425,51 +378,52 @@ msgstr ""
 "\n"
 "Benutzen Sie '%s --help' mit anderen Optionen für mehr Syntax\n"
 
-#: ../pacman.c:107
+#: src/pacman/pacman.c:99
 #, c-format
 msgid "usage:  %s {-A --add} [options] <file>\n"
 msgstr "Benutzung:  %s {-A -add} [Optionen] <Datei>\n"
 
-#: ../pacman.c:108 ../pacman.c:113 ../pacman.c:125 ../pacman.c:130
-#: ../pacman.c:144
+#: src/pacman/pacman.c:100 src/pacman/pacman.c:105 src/pacman/pacman.c:117
+#: src/pacman/pacman.c:122 src/pacman/pacman.c:136
 #, c-format
 msgid "options:\n"
 msgstr "Optionen:\n"
 
-#: ../pacman.c:109 ../pacman.c:115 ../pacman.c:126 ../pacman.c:146
+#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
+#: src/pacman/pacman.c:138
 #, c-format
 msgid "  -d, --nodeps        skip dependency checks\n"
 msgstr "  -d, --nodeps        Überspringe Abhängigkeitsprüfung\n"
 
-#: ../pacman.c:110 ../pacman.c:127 ../pacman.c:148
+#: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140
 #, c-format
 msgid "  -f, --force         force install, overwrite conflicting files\n"
 msgstr ""
 "  -f, --force         Installation erzwingen, Dateikonflikte überschreiben\n"
 
-#: ../pacman.c:112
+#: src/pacman/pacman.c:104
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
 msgstr "Benutzung:  %s {-R --remove} [Optionen] <Paket>\n"
 
-#: ../pacman.c:114
+#: src/pacman/pacman.c:106
 #, c-format
 msgid ""
 "  -c, --cascade       remove packages and all packages that depend on them\n"
 msgstr ""
 "  -c, --cascade       Entferne Pakete und alle, die von ihnen abhängen\n"
 
-#: ../pacman.c:116
+#: src/pacman/pacman.c:108
 #, c-format
 msgid "  -k, --dbonly        only remove database entry, do not remove files\n"
 msgstr "  -k, --dbonly        Nur Datenbankeintrag entfernen, keine Dateien\n"
 
-#: ../pacman.c:117
+#: src/pacman/pacman.c:109
 #, c-format
 msgid "  -n, --nosave        remove configuration files as well\n"
 msgstr "  -n, --nosave        Auch Konfigurationsdateien entfernen\n"
 
-#: ../pacman.c:118
+#: src/pacman/pacman.c:110
 #, c-format
 msgid ""
 "  -s, --recursive     remove dependencies also (that won't break packages)\n"
@@ -477,57 +431,58 @@ msgstr ""
 "  -s, --recursive     Auch Abhängigkeiten entfernen (beschädigt keine "
 "Pakete)\n"
 
-#: ../pacman.c:121
+#: src/pacman/pacman.c:113
 #, c-format
 msgid "usage:  %s {-F --freshen} [options] <file>\n"
 msgstr "Benutzung:  %s {-F --freshen} [Optionen] <Datei>\n"
 
-#: ../pacman.c:123
+#: src/pacman/pacman.c:115
 #, c-format
 msgid "usage:  %s {-U --upgrade} [options] <file>\n"
 msgstr "Benutzung:  %s {-U --upgrade} [Optionen] <Datei>\n"
 
-#: ../pacman.c:129
+#: src/pacman/pacman.c:121
 #, c-format
 msgid "usage:  %s {-Q --query} [options] [package]\n"
 msgstr "Benutzung:  %s {-Q --query} [Optionen] [Pakete]\n"
 
-#: ../pacman.c:131
+#: src/pacman/pacman.c:123
 #, c-format
 msgid "  -c, --changelog     view the changelog of a package\n"
 msgstr "  -c, --changelog     Das Changelog des Paketes anzeigen\n"
 
-#: ../pacman.c:132
-#, c-format
+#: src/pacman/pacman.c:124
+#, fuzzy, c-format
 msgid ""
-"  -e, --orphans       list all packages that were installed as a dependency\n"
+"  -e, --orphans       list all packages installed as dependencies but no "
+"longer\n"
 msgstr ""
 "  -e, --orphans        Listet alle Pakete auf, die als Abhängigkeit "
 "installiert\n"
 
-#: ../pacman.c:133
-#, c-format
-msgid "                      and are not required by any other packages\n"
+#: src/pacman/pacman.c:125
+#, fuzzy, c-format
+msgid "                      required by any package\n"
 msgstr ""
 "                      wurden und nicht von anderen Paketen benötigt werden\n"
 
-#: ../pacman.c:134 ../pacman.c:149
+#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
 #, c-format
 msgid "  -g, --groups        view all members of a package group\n"
 msgstr ""
 "  -g, --groups        Zeige alle Pakete an, die zu einer Gruppe gehören\n"
 
-#: ../pacman.c:135
+#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
 #, c-format
 msgid "  -i, --info          view package information\n"
 msgstr "  -i, --info          Zeige Paketinformationen an\n"
 
-#: ../pacman.c:136
+#: src/pacman/pacman.c:128
 #, c-format
 msgid "  -l, --list          list the contents of the queried package\n"
 msgstr "  -l, --list          Listet den Inhalt des abgefragten Paketes auf\n"
 
-#: ../pacman.c:137
+#: src/pacman/pacman.c:129
 #, c-format
 msgid ""
 "  -m, --foreign       list all packages that were not found in the sync db"
@@ -536,26 +491,21 @@ msgstr ""
 "  -m, --foreign        Listet alle Pakete auf, die nicht in den Sync db(s)\n"
 "                       gefunden wurden\n"
 
-#: ../pacman.c:138
+#: src/pacman/pacman.c:130
 #, c-format
 msgid "  -o, --owns <file>   query the package that owns <file>\n"
 msgstr "  -o, --owns <Datei>  Fragt das Paket ab, dass <Datei> enthält\n"
 
-#: ../pacman.c:139
-#, c-format
+#: src/pacman/pacman.c:131
+#, fuzzy, c-format
 msgid ""
-"  -p, --file          pacman will query the package file [package] instead "
-"of\n"
+"  -p, --file          query the package file [package] instead of the "
+"database\n"
 msgstr ""
 "  -p, --file          pacman frag die Paketdatei [Paket] ab, anstelle in "
 "der\n"
 
-#: ../pacman.c:140
-#, c-format
-msgid "                      looking in the database\n"
-msgstr "                      Paketdatenbank zu suchen\n"
-
-#: ../pacman.c:141
+#: src/pacman/pacman.c:132
 #, c-format
 msgid ""
 "  -s, --search        search locally-installed packages for matching "
@@ -563,12 +513,17 @@ msgid ""
 msgstr ""
 "  -s, --search        Durchsuche lokal installierte Pakete nach einem Wort\n"
 
-#: ../pacman.c:143
+#: src/pacman/pacman.c:133
+#, fuzzy, c-format
+msgid "  -u, --upgrades      list all packages that can be upgraded\n"
+msgstr "  -u, --sysupgrade    Alle veralteten Pakete aktualisieren\n"
+
+#: src/pacman/pacman.c:135
 #, c-format
 msgid "usage:  %s {-S --sync} [options] [package]\n"
 msgstr "Benutzung:  %s {-S --sync} [Optionen] [Paket]\n"
 
-#: ../pacman.c:145
+#: src/pacman/pacman.c:137
 #, c-format
 msgid ""
 "  -c, --clean         remove old packages from cache directory (use -cc for "
@@ -576,12 +531,12 @@ msgid ""
 msgstr ""
 "  -c, --clean         Entferne alte Pakete aus dem Cache (-cc für alle)\n"
 
-#: ../pacman.c:147
+#: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --dependsonly   install dependencies only\n"
 msgstr "  -e, --dependsonly   Nur Abhängigkeiten installieren\n"
 
-#: ../pacman.c:150
+#: src/pacman/pacman.c:143
 #, c-format
 msgid ""
 "  -p, --print-uris    print out URIs for given packages and their "
@@ -590,19 +545,19 @@ msgstr ""
 "  -p, --print-uris     URIs der angegebenen Pakete und deren Abhängigkeiten "
 "ausgeben\n"
 
-#: ../pacman.c:151
+#: src/pacman/pacman.c:144
 #, c-format
 msgid "  -s, --search        search remote repositories for matching strings\n"
 msgstr ""
 "  -s, --search        Durchsuche entferne Repositories Pakete nach einem "
 "Wort\n"
 
-#: ../pacman.c:152
+#: src/pacman/pacman.c:145
 #, c-format
 msgid "  -u, --sysupgrade    upgrade all packages that are out of date\n"
 msgstr "  -u, --sysupgrade    Alle veralteten Pakete aktualisieren\n"
 
-#: ../pacman.c:153
+#: src/pacman/pacman.c:146
 #, c-format
 msgid ""
 "  -w, --downloadonly  download packages but do not install/upgrade anything\n"
@@ -610,13 +565,13 @@ msgstr ""
 "  -w, --downloadonly  Lade Pakete herunter, aber nichts installieren/"
 "aktualisieren\n"
 
-#: ../pacman.c:154
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
 "  -y, --refresh       download fresh package databases from the server\n"
 msgstr "  -y, --refresh       Lade frische Paketdatenbank vom Server\n"
 
-#: ../pacman.c:155
+#: src/pacman/pacman.c:148
 #, c-format
 msgid ""
 "      --ignore <pkg>  ignore a package upgrade (can be used more than once)\n"
@@ -624,22 +579,22 @@ msgstr ""
 "      --ignore <pkg>  Ignoriere ein neues Paket (kann mehrfach genutzt "
 "werden)\n"
 
-#: ../pacman.c:157
+#: src/pacman/pacman.c:150
 #, c-format
 msgid "      --config <path> set an alternate configuration file\n"
 msgstr "      --config <path> Setzt eine alternative Konfigurationsdatei\n"
 
-#: ../pacman.c:158
+#: src/pacman/pacman.c:151
 #, c-format
 msgid "      --noconfirm     do not ask for anything confirmation\n"
 msgstr "      --noconfirm     Niemals nachfragen\n"
 
-#: ../pacman.c:159
+#: src/pacman/pacman.c:152
 #, c-format
 msgid "      --ask  <number> pre-specify answers for questions (see manpage)\n"
 msgstr ""
 
-#: ../pacman.c:160
+#: src/pacman/pacman.c:153
 #, c-format
 msgid ""
 "      --noprogressbar do not show a progress bar when downloading files\n"
@@ -647,220 +602,165 @@ msgstr ""
 "      --noprogressbar Keine Fortschrittsanzeige anzeigen, wenn Dateien\n"
 "                      herunter geladen werden\n"
 
-#: ../pacman.c:161
+#: src/pacman/pacman.c:154
 #, c-format
 msgid ""
 "      --noscriptlet   do not execute the install scriptlet if there is any\n"
 msgstr "      --noscriptlet   Installationskript nicht ausführen\n"
 
-#: ../pacman.c:162
+#: src/pacman/pacman.c:155
 #, c-format
 msgid "  -v, --verbose       be verbose\n"
 msgstr "  -v, --verbose       Sei gesprächig\n"
 
-#: ../pacman.c:163
+#: src/pacman/pacman.c:156
 #, c-format
 msgid "  -r, --root <path>   set an alternate installation root\n"
 msgstr ""
 "  -r, --root <path>   Benutze <path> als Installationsverzeichnis,\n"
 "                      anstelle von /\n"
 
-#: ../pacman.c:164
+#: src/pacman/pacman.c:157
 #, c-format
 msgid "  -b, --dbpath <path> set an alternate database location\n"
 msgstr "  -b, --dbpath <path> Einen anderen Ort für die Datenbank verwenden\n"
 
-#: ../pacman.c:177
+#: src/pacman/pacman.c:170
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 
-#: ../pacman.c:178
+#: src/pacman/pacman.c:171
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr ""
 
-#: ../pacman.c:363
-msgid "bad root path"
-msgstr "Schlechter root Pfad"
+#: src/pacman/pacman.c:298
+#, fuzzy, c-format
+msgid "error: '%s' is not a valid debug level"
+msgstr "%s ist kein gültiger regulärer Ausdruck\n"
 
-#: ../pacman.c:390
-msgid "only one operation may be used at a time\n"
+#: src/pacman/pacman.c:334
+#, c-format
+msgid "error: '%s' is not a valid db path\n"
 msgstr ""
 
-#: ../pacman.c:486
-msgid "you cannot perform this operation unless you are root.\n"
-msgstr "Sie benötigen root Rechte um diese Operation ausführen zu können\n"
+#: src/pacman/pacman.c:364
+#, c-format
+msgid "error: '%s' is not a valid root path\n"
+msgstr ""
 
-#: ../pacman.c:510
+#: src/pacman/pacman.c:391
+msgid "only one operation may be used at a time\n"
+msgstr ""
+
+#: src/pacman/pacman.c:454
 #, c-format
 msgid "failed to initilize alpm library (%s)\n"
 msgstr "Konnte alpm Bibliothek nicht initialisieren (%s)\n"
 
-#: ../pacman.c:518
+#: src/pacman/pacman.c:487
+msgid "you cannot perform this operation unless you are root.\n"
+msgstr "Sie benötigen root Rechte um diese Operation ausführen zu können\n"
+
+#: src/pacman/pacman.c:503
 #, fuzzy, c-format
 msgid "failed to parse config (%s)\n"
 msgstr "Konnte Durchführung nicht vorbereiten (%s)\n"
 
-#: ../pacman.c:524
-#, c-format
-msgid "failed to set option LOGMASK (%s)\n"
-msgstr "Konnte Option LOGMASK nicht setzen (%s)\n"
-
-#: ../pacman.c:528
-#, c-format
-msgid "failed to set option LOGCB (%s)\n"
-msgstr "Konnte Option LOGCB nicht setzen (%s)\n"
-
-#: ../pacman.c:532
-#, fuzzy, c-format
-msgid "failed to set option DLCB (%s)\n"
-msgstr "Konnte Option LOGCB nicht setzen (%s)\n"
-
-#: ../pacman.c:536
-#, fuzzy, c-format
-msgid "failed to set option DLFNM (%s)\n"
-msgstr "Konnte Option LOGFILE nicht setzen (%s)\n"
-
-#: ../pacman.c:540
-#, fuzzy, c-format
-msgid "failed to set option DLOFFSET (%s)\n"
-msgstr "Konnte Option LOGFILE nicht setzen (%s)\n"
-
-#: ../pacman.c:544
-#, fuzzy, c-format
-msgid "failed to set option DLT0 (%s)\n"
-msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
-
-#: ../pacman.c:548
-#, fuzzy, c-format
-msgid "failed to set option DLT (%s)\n"
-msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
-
-#: ../pacman.c:552
-#, fuzzy, c-format
-msgid "failed to set option DLRATE (%s)\n"
-msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
-
-#: ../pacman.c:556
-#, fuzzy, c-format
-msgid "failed to set option DLXFERED1 (%s)\n"
-msgstr "Konnte Option LOGFILE nicht setzen (%s)\n"
-
-#: ../pacman.c:560
-#, fuzzy, c-format
-msgid "failed to set option DLETA_H (%s)\n"
-msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
-
-#: ../pacman.c:564
-#, fuzzy, c-format
-msgid "failed to set option DLETA_M (%s)\n"
-msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
-
-#: ../pacman.c:568
-#, fuzzy, c-format
-msgid "failed to set option DLETA_S (%s)\n"
-msgstr "Konnte Option LOGMASK nicht setzen (%s)\n"
-
-#: ../pacman.c:578
-#, c-format
-msgid "failed to set option IGNOREPKG (%s)\n"
-msgstr "Konnte Option IGNOREPKG nicht setzen (%s)\n"
-
-#: ../pacman.c:586
+#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
 msgid "Targets:"
 msgstr "Pakete:"
 
-#: ../pacman.c:592
+#: src/pacman/pacman.c:519
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr ""
 
-#: ../pacman.c:599
+#: src/pacman/pacman.c:526
 msgid "no targets specified (use -h for help)\n"
 msgstr "Keine Pakete angegeben (benutzen Sie -h für Hilfe)\n"
 
-#: ../pacman.c:612
+#: src/pacman/pacman.c:539
 msgid "no operation specified (use -h for help)\n"
 msgstr "Keine Operation angegeben (benutzen Sie -h für Hilfe)\n"
 
-#: ../query.c:56
+#: src/pacman/query.c:53
 msgid "no file was specified for --owns\n"
 msgstr "Es wurde keine Datei für --owns angegeben\n"
 
-#: ../query.c:61
-#, c-format
-msgid "%s is not a file.\n"
-msgstr "%s ist keine Datei.\n"
-
-#: ../query.c:78
+#: src/pacman/query.c:71
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s ist in %s %s enthalten\n"
 
-#: ../query.c:86
+#: src/pacman/query.c:78
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Kein Paket enthält %s\n"
 
-#: ../query.c:111 ../sync.c:340
+#: src/pacman/query.c:122 src/pacman/sync.c:413
 msgid "no usable package repositories configured.\n"
 msgstr "Keine brauchbaren Paketrepositories konfiguriert.\n"
 
-#: ../query.c:150
+#: src/pacman/query.c:128
+#, fuzzy
+msgid "Checking for package upgrades..."
+msgstr "Prüfe Paketintegrität ... "
+
+#: src/pacman/query.c:135
+msgid "no upgrades found"
+msgstr ""
+
+#: src/pacman/query.c:173
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "Gruppe \"%s\" wurde nicht gefunden\n"
 
-#: ../query.c:160
+#: src/pacman/query.c:184
 msgid "no package file was specified for --file\n"
 msgstr "Es wurde kein Paket für --file angegeben\n"
 
-#: ../query.c:164
+#: src/pacman/query.c:188
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "Konnte Paket '%s' nicht laden (%s)\n"
 
-#. something weird happened
-#: ../query.c:202 ../query.c:244
+#: src/pacman/query.c:226 src/pacman/query.c:263
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "Paket \"%s\" nicht gefunden\n"
 
-#: ../remove.c:64 ../sync.c:456
+#: src/pacman/remove.c:58 src/pacman/sync.c:528
 #, c-format
 msgid ":: group %s:\n"
 msgstr ":: Gruppe %s:\n"
 
-#: ../remove.c:66
+#: src/pacman/remove.c:60
 msgid "    Remove whole content? [Y/n] "
 msgstr "    Entferne den gesamten Inhalt? [J/n] "
 
-#: ../remove.c:68
+#: src/pacman/remove.c:64
 #, c-format
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Entferne %s aus Gruppe %s? [J/n] "
 
-#: ../remove.c:81 ../sync.c:376 ../sync.c:415
+#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
 #, c-format
 msgid "failed to init transaction (%s)\n"
 msgstr ""
 
-#: ../remove.c:107
+#: src/pacman/remove.c:89
 #, c-format
-msgid "  %s: is required by %s\n"
-msgstr "  %s: wird benötigt von %s\n"
+msgid "failed to add target '%s' (%s)\n"
+msgstr "Konnte Paket '%s' nicht hinzufügen (%s)\n"
 
-#: ../remove.c:129
-msgid ""
-"\n"
-"Targets:"
-msgstr ""
-"\n"
-"Pakete:"
+#: src/pacman/remove.c:103
+#, fuzzy, c-format
+msgid ":: %s is required by %s\n"
+msgstr "  %s: wird benötigt von %s\n"
 
-#. get confirmation
-#: ../remove.c:132
+#: src/pacman/remove.c:128
 msgid ""
 "\n"
 "Do you want to remove these packages? [Y/n] "
@@ -868,83 +768,82 @@ msgstr ""
 "\n"
 "Möchten Sie all diese Pakete entfernen? [J/n] "
 
-#: ../sync.c:73
+#: src/pacman/sync.c:113
 msgid "Do you want to remove old packages from cache? [Y/n] "
 msgstr "Möchten Sie alte Pakete aus dem Cache entfernen? [J/n] "
 
-#: ../sync.c:75
+#: src/pacman/sync.c:115
 msgid "removing old packages from cache... "
 msgstr "Entferne alte Pakete aus dem Cache ... "
 
-#: ../sync.c:78
+#: src/pacman/sync.c:118
 msgid "could not access cache directory\n"
 msgstr "Konnte nicht auf Cacheverzeichnis zugreifen\n"
 
-#. full cleanup
-#: ../sync.c:138
+#: src/pacman/sync.c:179
 msgid "Do you want to remove all packages from cache? [Y/n] "
 msgstr "Wollen Sie alle Pakete aus dem Cache entfernen? [J/n] "
 
-#: ../sync.c:140
+#: src/pacman/sync.c:181
 msgid "removing all packages from cache... "
 msgstr "Entferne alle Pakete aus dem Cache ... "
 
-#: ../sync.c:143
+#: src/pacman/sync.c:184
 msgid "could not remove cache directory\n"
 msgstr "Konnte Cacheverzeichnis nicht entfernen\n"
 
-#: ../sync.c:148
+#: src/pacman/sync.c:189
 msgid "could not create new cache directory\n"
 msgstr "Konnte neues Cacheverzeichnis nicht erstellen\n"
 
-#: ../sync.c:153 ../trans.c:72 ../trans.c:86 ../trans.c:100 ../trans.c:116
-#: ../trans.c:128
-msgid "done.\n"
-msgstr "beendet.\n"
-
-#: ../sync.c:168
-#, c-format
-msgid "failed to synchronize %s\n"
+#: src/pacman/sync.c:216
+#, fuzzy, c-format
+msgid "failed to synchronize %s: %s\n"
 msgstr "Konnte %s nicht synchronisieren\n"
 
-#: ../sync.c:170
+#: src/pacman/sync.c:218
 #, c-format
 msgid "failed to update %s (%s)\n"
 msgstr "Konnte %s nicht aktualisieren (%s)\n"
 
-#: ../sync.c:174
+#: src/pacman/sync.c:221
 #, c-format
 msgid " %s is up to date\n"
 msgstr " %s ist aktuell\n"
 
-#: ../sync.c:265
+#: src/pacman/sync.c:341
 #, c-format
 msgid "package \"%s\" was not found.\n"
 msgstr "Paket \"%s\" wurde nicht gefunden.\n"
 
-#: ../sync.c:303
+#: src/pacman/sync.c:378
 #, c-format
 msgid "repository \"%s\" was not found.\n"
 msgstr "Repository \"%s\" wurde nicht gefunden.\n"
 
-#. grab a fresh package list
-#: ../sync.c:350
+#: src/pacman/sync.c:450
 msgid ":: Synchronizing package databases...\n"
 msgstr ":: Synchronisiere Paketdatenbank ...\n"
 
-#: ../sync.c:351
+#: src/pacman/sync.c:451
 msgid "synchronizing package lists"
 msgstr "Synchronisiere Paketlisten"
 
-#: ../sync.c:385
-msgid ":: Starting local database upgrade...\n"
-msgstr ":: Starte Aktualisierung der lokalen Datenbank ...\n"
+#: src/pacman/sync.c:453
+#, fuzzy
+msgid "failed to synchronize any databases"
+msgstr "Konnte %s nicht synchronisieren\n"
+
+#: src/pacman/sync.c:459
+#, fuzzy
+msgid ":: Starting full system upgrade...\n"
+msgstr "Starte komplette Systemaktualisierung"
 
-#: ../sync.c:386
+#: src/pacman/sync.c:460
 msgid "starting full system upgrade"
 msgstr "Starte komplette Systemaktualisierung"
 
-#: ../sync.c:404
+#: src/pacman/sync.c:478
 msgid ""
 "\n"
 ":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -952,80 +851,56 @@ msgstr ""
 "\n"
 ":: pacman hat eine neuere Version des \"pacman\" Paketes gefunden.\n"
 
-#: ../sync.c:405
+#: src/pacman/sync.c:479
 msgid ":: It is recommended that you allow pacman to upgrade itself\n"
 msgstr ":: Es wird empfohlen, zuerst pacman zu aktualisieren und\n"
 
-#: ../sync.c:406
+#: src/pacman/sync.c:480
 msgid ":: first, then you can re-run the operation with the newer version.\n"
 msgstr ":: danach Ihre Eingabe mit der neueren Version zu wiederholen.\n"
 
-#: ../sync.c:408
+#: src/pacman/sync.c:482
 msgid ":: Upgrade pacman first? [Y/n] "
 msgstr ":: Zuerst pacman aktualisieren? [J/n] "
 
-#: ../sync.c:423 ../sync.c:444
+#: src/pacman/sync.c:497
+#, fuzzy, c-format
+msgid "pacman: %s\n"
+msgstr "Kein Paket enthält %s\n"
+
+#: src/pacman/sync.c:517
 #, c-format
-msgid "could not add target '%s': %s\n"
-msgstr "Konnte Paket '%s' nicht hinzufügen: %s\n"
+msgid "'%s': %s\n"
+msgstr ""
 
-#: ../sync.c:462
+#: src/pacman/sync.c:532
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Gesamten Inhalt installieren? [J/n] "
 
-#: ../sync.c:469
+#: src/pacman/sync.c:539
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: %s aus Gruppe %s installieren? [J/n] "
 
-#: ../sync.c:492
-#, c-format
-msgid "could not add target '%s': not found in sync db\n"
+#: src/pacman/sync.c:563
+#, fuzzy, c-format
+msgid "'%s': not found in sync db\n"
 msgstr "Konnte Paket '%s' nicht hinzufügen: Nicht in sync db gefunden\n"
 
-#: ../sync.c:511
+#: src/pacman/sync.c:583
 msgid "requires"
 msgstr "benötigt"
 
-#: ../sync.c:511
+#: src/pacman/sync.c:583
 msgid "is required by"
 msgstr "wird benötigt von"
 
-#: ../sync.c:588
-msgid ""
-"\n"
-"Remove:  "
-msgstr ""
-"\n"
-"Entfernen: "
-
-#: ../sync.c:604
-msgid ""
-"\n"
-"Targets: "
-msgstr ""
-"\n"
-"Pakete:  "
-
-#: ../sync.c:607
-#, c-format
-msgid ""
-"\n"
-"Total Package Size:   %.1f MB\n"
-msgstr ""
-"\n"
-"Gesamtgröße:          %.1f MB\n"
-
-#: ../sync.c:608
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Total Uncompressed Package Size:   %.1f MB\n"
-msgstr ""
-"\n"
-"Gesamtgröße:          %.1f MB\n"
+#: src/pacman/sync.c:625
+#, fuzzy
+msgid "local database is up to date\n"
+msgstr " %s ist aktuell\n"
 
-#: ../sync.c:614
+#: src/pacman/sync.c:634
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -1033,11 +908,11 @@ msgstr ""
 "\n"
 "Beginne download ...\n"
 
-#: ../sync.c:618
+#: src/pacman/sync.c:638
 msgid "Proceed with download? [Y/n] "
 msgstr "Download fortsetzen? [J/n] "
 
-#: ../sync.c:626
+#: src/pacman/sync.c:646
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -1045,141 +920,307 @@ msgstr ""
 "\n"
 "Beginne Aktualisierungsprozess ...\n"
 
-#: ../sync.c:630
-msgid "Proceed with upgrade? [Y/n] "
-msgstr "Aktualisierung fortsetzen? [J/n] "
+#: src/pacman/sync.c:650
+#, fuzzy
+msgid "Proceed with installation? [Y/n] "
+msgstr "Download fortsetzen? [J/n] "
 
-#: ../trans.c:57
+#: src/pacman/trans.c:57
+msgid "] 100%    LOCAL "
+msgstr "] 100 %    LOKAL "
+
+#: src/pacman/trans.c:68
 msgid "checking dependencies... "
 msgstr "Prüfe Abhängigkeiten ... "
 
-#: ../trans.c:60
+#: src/pacman/trans.c:72
 msgid "checking for file conflicts... "
 msgstr "Prüfe auf Dateikonflikte ... "
 
-#: ../trans.c:63
+#: src/pacman/trans.c:76
+#, fuzzy
+msgid "cleaning up... "
+msgstr "Entferne %s ... "
+
+#: src/pacman/trans.c:79
 msgid "resolving dependencies... "
 msgstr "Löse Abhängigkeiten auf ... "
 
-#: ../trans.c:66
+#: src/pacman/trans.c:82
 msgid "looking for inter-conflicts... "
 msgstr ""
 
-#: ../trans.c:81
+#: src/pacman/trans.c:102
 #, c-format
 msgid "installing %s... "
 msgstr "Installiere %s ... "
 
-#: ../trans.c:88
+#: src/pacman/trans.c:109
 #, c-format
 msgid "installed %s (%s)"
 msgstr "Installiert %s (%s)"
 
-#: ../trans.c:95
+#: src/pacman/trans.c:116
 #, c-format
 msgid "removing %s... "
 msgstr "Entferne %s ... "
 
-#: ../trans.c:104
+#: src/pacman/trans.c:123
 #, c-format
 msgid "removed %s (%s)"
 msgstr "Entfernt %s (%s)"
 
-#: ../trans.c:111
+#: src/pacman/trans.c:130
 #, c-format
 msgid "upgrading %s... "
 msgstr "Aktualisiere %s ... "
 
-#: ../trans.c:118
+#: src/pacman/trans.c:137
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "Aktualisiert %s (%s -> %s)"
 
-#: ../trans.c:125
+#: src/pacman/trans.c:144
 msgid "checking package integrity... "
 msgstr "Prüfe Paketintegrität ... "
 
-#: ../trans.c:139
+#: src/pacman/trans.c:158
 #, fuzzy
 msgid " done.\n"
 msgstr "beendet.\n"
 
-#: ../trans.c:141
+#: src/pacman/trans.c:160
 msgid " failed.\n"
 msgstr ""
 
-#: ../trans.c:148
-#, c-format
-msgid ""
-"\n"
-":: Retrieving packages from %s...\n"
+#: src/pacman/trans.c:167
+#, fuzzy, c-format
+msgid ":: Retrieving packages from %s...\n"
 msgstr ""
 "\n"
 ":: Empfange Pakete von %s ...\n"
 
-#: ../trans.c:158
-msgid "] 100%    LOCAL "
-msgstr "] 100 %    LOKAL "
-
-#: ../trans.c:176
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ""
 ":: %s ist in IgnorePkg, wird aber von %s benötigt. Trotzdem installieren? [J/"
 "n] "
 
-#: ../trans.c:190
-#, c-format
-msgid ":: %s is designated as a HoldPkg.  Remove anyway? [Y/n] "
+#: src/pacman/trans.c:204
+#, fuzzy, c-format
+msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ":: %s ist als ein HoldPkg gekennzeichnet. Trotzdem entfernen? [J/n] "
 
-#: ../trans.c:203
+#: src/pacman/trans.c:217
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: %s mit %s/%s ersetzen? [J/n] "
 
-#: ../trans.c:218
+#: src/pacman/trans.c:232
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: %s steht im Konflikt mit %s. %s entfernen? [J/n] "
 
-#: ../trans.c:234
+#: src/pacman/trans.c:248
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: Lokale Version ist neuer. Trotzdem aktualisieren? [J/n] "
 
-#: ../trans.c:252
+#: src/pacman/trans.c:266
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: Lokale Version ist aktuell. Trotzdem aktualisieren? [J/n] "
 
-#: ../trans.c:270
+#: src/pacman/trans.c:284
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: Archiv %s ist beschädigt. Möchten Sie es löschen? [J/n] "
 
-#: ../trans.c:286
+#: src/pacman/trans.c:333
 msgid "installing"
 msgstr "installiere"
 
-#: ../trans.c:287
+#: src/pacman/trans.c:336
 msgid "upgrading"
 msgstr "aktualisiere"
 
-#: ../trans.c:288
+#: src/pacman/trans.c:339
 #, fuzzy
 msgid "removing"
 msgstr "Entferne %s ... "
 
-#: ../util.c:178
+#: src/pacman/trans.c:342
+#, fuzzy
+msgid "checking for file conflicts"
+msgstr "Prüfe auf Dateikonflikte ... "
+
+#: src/pacman/util.c:258
 #, c-format
-msgid "failed to allocated %d bytes\n"
+msgid "None\n"
+msgstr "Nichts\n"
+
+#: src/pacman/util.c:303
+#, fuzzy
+msgid "Remove:"
 msgstr ""
+"\n"
+"Entfernen: "
 
-#: ../util.c:232
-#, c-format
-msgid "%s is not a valid regular expression.\n"
-msgstr "%s ist kein gültiger regulärer Ausdruck\n"
+#: src/pacman/util.c:311
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Total Removed Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Gesamtgröße:          %.1f MB\n"
+
+#: src/pacman/util.c:322
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Total Package Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Gesamtgröße:          %.1f MB\n"
+
+#: src/pacman/util.c:329
+#, fuzzy, c-format
+msgid "Total Installed Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Gesamtgröße:          %.1f MB\n"
+
+#~ msgid "done."
+#~ msgstr "erledigt."
+
+#~ msgid "Size           : %ld\n"
+#~ msgstr "Größe          : %ld\n"
+
+#, fuzzy
+#~ msgid "Reason         : "
+#~ msgstr "Grund          : "
+
+#~ msgid "Unknown\n"
+#~ msgstr "Unbekannt\n"
+
+#~ msgid "NOT "
+#~ msgstr "NICHT"
+
+#~ msgid "Groups            :"
+#~ msgstr "Gruppen           :"
+
+#~ msgid "Provides          :"
+#~ msgstr "Stellt bereit     :"
+
+#~ msgid "Depends On        :"
+#~ msgstr "Hängt ab von      :"
+
+#~ msgid "Removes           :"
+#~ msgstr "Entfernt          :"
+
+#~ msgid "Conflicts With    :"
+#~ msgstr "Konflikt mit      :"
+
+#~ msgid "Size (compressed) : %ld\n"
+#~ msgstr "Größe komprimiert : %ld\n"
+
+#, fuzzy
+#~ msgid "Size (uncompressed):%ld\n"
+#~ msgstr "Größe komprimiert : %ld\n"
+
+#~ msgid "Description       : "
+#~ msgstr "Beschreibung      : "
+
+#~ msgid "                      looking in the database\n"
+#~ msgstr "                      Paketdatenbank zu suchen\n"
+
+#~ msgid "bad root path"
+#~ msgstr "Schlechter root Pfad"
+
+#~ msgid "failed to set option LOGMASK (%s)\n"
+#~ msgstr "Konnte Option LOGMASK nicht setzen (%s)\n"
+
+#~ msgid "failed to set option LOGCB (%s)\n"
+#~ msgstr "Konnte Option LOGCB nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLCB (%s)\n"
+#~ msgstr "Konnte Option LOGCB nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLFNM (%s)\n"
+#~ msgstr "Konnte Option LOGFILE nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLOFFSET (%s)\n"
+#~ msgstr "Konnte Option LOGFILE nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLT0 (%s)\n"
+#~ msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLT (%s)\n"
+#~ msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLRATE (%s)\n"
+#~ msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLXFERED1 (%s)\n"
+#~ msgstr "Konnte Option LOGFILE nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLETA_H (%s)\n"
+#~ msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLETA_M (%s)\n"
+#~ msgstr "Konnte Option DBPATH nicht setzen (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLETA_S (%s)\n"
+#~ msgstr "Konnte Option LOGMASK nicht setzen (%s)\n"
+
+#~ msgid "failed to set option IGNOREPKG (%s)\n"
+#~ msgstr "Konnte Option IGNOREPKG nicht setzen (%s)\n"
+
+#~ msgid "%s is not a file.\n"
+#~ msgstr "%s ist keine Datei.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Targets:"
+#~ msgstr ""
+#~ "\n"
+#~ "Pakete:"
+
+#~ msgid ":: Starting local database upgrade...\n"
+#~ msgstr ":: Starte Aktualisierung der lokalen Datenbank ...\n"
+
+#~ msgid "could not add target '%s': %s\n"
+#~ msgstr "Konnte Paket '%s' nicht hinzufügen: %s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Targets: "
+#~ msgstr ""
+#~ "\n"
+#~ "Pakete:  "
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Total Uncompressed Package Size:   %.1f MB\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gesamtgröße:          %.1f MB\n"
+
+#~ msgid "Proceed with upgrade? [Y/n] "
+#~ msgstr "Aktualisierung fortsetzen? [J/n] "
 
 #~ msgid "config: new section '%s'\n"
 #~ msgstr "Konfiguration: Neuer Abschnitt '%s'\n"
diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po
index 546de37d..a325a8d9 100644
--- a/src/pacman/po/fr.po
+++ b/src/pacman/po/fr.po
@@ -1,23 +1,23 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# French translations for Pacman package manager package.
+# Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
+# (First author here) <(email here)>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pacman\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 13:36+0200\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2007-02-06 20:43-0500\n"
 "PO-Revision-Date: 2006-06-05 22:46+0100\n"
 "Last-Translator: Enda <enda@netou.com>\n"
-"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:378 ../sync.c:417
+#: src/pacman/add.c:69 src/pacman/deptest.c:69 src/pacman/remove.c:79
+#: src/pacman/sync.c:442 src/pacman/sync.c:491
 #, fuzzy, c-format
 msgid ""
 "       if you're sure a package manager is not already running,\n"
@@ -27,46 +27,47 @@ msgstr ""
 "déjà,\n"
 "       vous pouvez retirer %s\n"
 
-#. and add targets to it
-#: ../add.c:76
+#: src/pacman/add.c:76
 msgid "loading package data... "
 msgstr "chargement des données du paquet.."
 
-#: ../add.c:79 ../remove.c:92
-#, c-format
-msgid "failed to add target '%s' (%s)\n"
+#: src/pacman/add.c:80
+#, fuzzy, c-format
+msgid "failed to add target '%s' (%s)"
 msgstr "échec d'ajout de la cible '%s' (%s)\n"
 
-#: ../add.c:84
-msgid "done."
-msgstr "fait."
+#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:86
+#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
+#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+msgid "done.\n"
+msgstr "fait.\n"
 
-#: ../add.c:92 ../remove.c:102 ../sync.c:505
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "échec de préparation de la transaction (%s)\n"
 
-#: ../add.c:97
+#: src/pacman/add.c:97
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ":: %s: requiert %s"
 
-#: ../add.c:111 ../sync.c:526
+#: src/pacman/add.c:118 src/pacman/sync.c:605
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: conflit avec %s"
 
-#: ../add.c:121 ../sync.c:649
-#, c-format
-msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)"
+#: src/pacman/add.c:127 src/pacman/sync.c:669
+#, fuzzy, c-format
+msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
 msgstr "%s%s existe dans \"%s\" (cible) and \"%s\" (cible)"
 
-#: ../add.c:128 ../sync.c:656
-#, c-format
-msgid "%s: %s%s exists in filesystem"
+#: src/pacman/add.c:134 src/pacman/sync.c:676
+#, fuzzy, c-format
+msgid "%s: %s%s exists in filesystem\n"
 msgstr "%s: %s%s existe dans le système de fichiers"
 
-#: ../add.c:136 ../sync.c:664 ../sync.c:671
+#: src/pacman/add.c:141 src/pacman/sync.c:683 src/pacman/sync.c:689
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -74,351 +75,300 @@ msgstr ""
 "\n"
 "des erreurs se sont produites, aucun paquet n'a été mis à jour.\n"
 
-#: ../add.c:143 ../sync.c:536
+#: src/pacman/add.c:151 src/pacman/sync.c:612
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ""
 
-#: ../add.c:157 ../remove.c:142 ../sync.c:642
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "échec de validation de la transaction (%s)\n"
 
-#: ../add.c:164 ../remove.c:152 ../sync.c:410 ../sync.c:684
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:484
+#: src/pacman/sync.c:705
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "échec de libération de la transaction (%s)\n"
 
-#: ../deptest.c:77
+#: src/pacman/deptest.c:82
 msgid "memory allocation failure\n"
 msgstr "erreur d'allocation mémoire\n"
 
-#: ../deptest.c:87
+#: src/pacman/deptest.c:93
 #, c-format
 msgid "add target %s\n"
 msgstr "ajout de la cible %s\n"
 
-#: ../deptest.c:90
+#: src/pacman/deptest.c:96
 #, c-format
 msgid "could not add target (%s)\n"
 msgstr "n'a pas pu ajouter la cible (%s)\n"
 
-#: ../deptest.c:110
+#: src/pacman/deptest.c:115
 #, c-format
 msgid "requires: %s"
 msgstr "requiert: %s"
 
-#: ../deptest.c:126
+#: src/pacman/deptest.c:139
 #, c-format
 msgid "conflict: %s"
 msgstr "conflit: %s"
 
-#: ../deptest.c:140 ../deptest.c:158
+#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
 #, c-format
 msgid "could not release transaction (%s)"
 msgstr "n'a pas pu libérer la transaction (%s)"
 
-#: ../list.c:143 ../list.c:171
-#, c-format
-msgid "None\n"
-msgstr "Aucun\n"
-
-#: ../log.c:55
+#: src/pacman/log.c:61
 #, c-format
 msgid "debug"
 msgstr ""
 
-#: ../log.c:58
+#: src/pacman/log.c:64
 #, c-format
 msgid "error"
 msgstr "erreur"
 
-#: ../log.c:61
+#: src/pacman/log.c:67
 #, c-format
 msgid "warning"
 msgstr "avertissement"
 
-#: ../log.c:64
-#, c-format
-msgid "flow1"
-msgstr ""
-
-#: ../log.c:67
-#, c-format
-msgid "flow2"
-msgstr ""
-
-#: ../log.c:70
+#: src/pacman/log.c:73
 #, c-format
 msgid "function"
 msgstr "fonction"
 
-#: ../log.c:154
+#: src/pacman/log.c:199
 msgid "Y"
 msgstr "O"
 
-#: ../log.c:154
+#: src/pacman/log.c:199
 msgid "YES"
 msgstr "OUI"
 
-#: ../log.h:26
+#: src/pacman/log.h:26
 #, fuzzy
 msgid "error: "
 msgstr "erreur"
 
-#: ../log.h:30
+#: src/pacman/log.h:30
 #, fuzzy
 msgid "warning: "
 msgstr "avertissement"
 
-#: ../package.c:46
+#: src/pacman/package.c:57
+#, fuzzy
+msgid "Explicitly installed"
+msgstr "Explicitement installé\n"
+
+#: src/pacman/package.c:60
+#, fuzzy
+msgid "Installed as a dependency for another package"
+msgstr "Installé comme dépendance un autre paquet\n"
+
+#: src/pacman/package.c:63 src/pacman/package.c:85
+#, fuzzy
+msgid "Unknown"
+msgstr "Inconnu\n"
+
+#: src/pacman/package.c:68 src/pacman/package.c:118
 #, c-format
 msgid "Name           : %s\n"
 msgstr "Nom            : %s\n"
 
-#: ../package.c:47
+#: src/pacman/package.c:69 src/pacman/package.c:119
 #, c-format
 msgid "Version        : %s\n"
 msgstr ""
 
-#: ../package.c:49
+#: src/pacman/package.c:70
+#, fuzzy, c-format
+msgid "URL            : %s\n"
+msgstr "Nom            : %s\n"
+
+#: src/pacman/package.c:71
+msgid "License        :"
+msgstr ""
+
+#: src/pacman/package.c:72 src/pacman/package.c:120
 msgid "Groups         :"
 msgstr "Groupes        :"
 
-#: ../package.c:51
+#: src/pacman/package.c:73 src/pacman/package.c:121
+msgid "Provides       :"
+msgstr "Fournit        :"
+
+#: src/pacman/package.c:74 src/pacman/package.c:122
+msgid "Depends On     :"
+msgstr "Depend De      :"
+
+#: src/pacman/package.c:75 src/pacman/package.c:123
+msgid "Removes        :"
+msgstr "Supprimer       :"
+
+#: src/pacman/package.c:78
+msgid "Required By    :"
+msgstr "Requit par       :"
+
+#: src/pacman/package.c:80 src/pacman/package.c:124
+msgid "Conflicts With :"
+msgstr "Conflit avec    :"
+
+#: src/pacman/package.c:81
+#, fuzzy, c-format
+msgid "Installed Size : %ld K\n"
+msgstr "Script d'installation    : %s\n"
+
+#: src/pacman/package.c:82
 #, c-format
 msgid "Packager       : %s\n"
 msgstr ""
 
-#: ../package.c:53
-msgid "License        :"
-msgstr ""
-
-#: ../package.c:54
+#: src/pacman/package.c:83
 #, c-format
 msgid "Architecture   : %s\n"
 msgstr ""
 
-#: ../package.c:55
-#, c-format
-msgid "Size           : %ld\n"
-msgstr "Taille         : %ld\n"
-
-#: ../package.c:58
+#: src/pacman/package.c:84
 #, c-format
 msgid "Build Date     : %s %s\n"
 msgstr "Date de construction : %s %s\n"
 
-#: ../package.c:60
+#: src/pacman/package.c:85
 #, fuzzy, c-format
 msgid "Build Type     : %s\n"
 msgstr "Date de construction : %s %s\n"
 
-#: ../package.c:60
-#, fuzzy
-msgid "Unknown"
-msgstr "Inconnu\n"
-
-#: ../package.c:62
+#: src/pacman/package.c:87
 #, c-format
 msgid "Install Date   : %s %s\n"
 msgstr "Date d'installation     : %s %s\n"
 
-#: ../package.c:64
+#: src/pacman/package.c:88
+#, fuzzy, c-format
+msgid "Install Reason : %s\n"
+msgstr "Script d'installation    : %s\n"
+
+#: src/pacman/package.c:90
 #, c-format
 msgid "Install Script : %s\n"
 msgstr "Script d'installation    : %s\n"
 
-#: ../package.c:64
+#: src/pacman/package.c:91
 msgid "Yes"
 msgstr "Oui"
 
-#: ../package.c:64
+#: src/pacman/package.c:91
 msgid "No"
 msgstr "Non"
 
-#: ../package.c:66
-#, c-format
-msgid "Reason         : "
-msgstr "Raison         : "
-
-#: ../package.c:69
-#, c-format
-msgid "Explicitly installed\n"
-msgstr "Explicitement installé\n"
-
-#: ../package.c:72
-#, c-format
-msgid "Installed as a dependency for another package\n"
-msgstr "Installé comme dépendance un autre paquet\n"
-
-#: ../package.c:75
-#, c-format
-msgid "Unknown\n"
-msgstr "Inconnu\n"
-
-#: ../package.c:79
-msgid "Provides       :"
-msgstr "Fournit        :"
-
-#: ../package.c:80
-msgid "Depends On     :"
-msgstr "Depend De      :"
-
-#: ../package.c:81
-msgid "Removes        :"
-msgstr "Supprimer       :"
-
-#: ../package.c:82
-msgid "Required By    :"
-msgstr "Requit par       :"
-
-#: ../package.c:83
-msgid "Conflicts With :"
-msgstr "Conflit avec    :"
-
-#: ../package.c:85
+#: src/pacman/package.c:93 src/pacman/package.c:129
 #, c-format
 msgid "Description    : "
 msgstr ""
 
-#: ../package.c:110
-#, c-format
-msgid "error calculating md5sum or sha1sum for %s\n"
-msgstr "erreur lors du calcul des sommes md5 ou sha1 pour %s\n"
-
-#: ../package.c:115 ../package.c:117
-#, c-format
-msgid "%sMODIFIED\t%s\n"
-msgstr "%sMODIFIE\t%s\n"
-
-#: ../package.c:115 ../package.c:117
-msgid "NOT "
-msgstr "N'EST PAS"
-
-#: ../package.c:121
-#, c-format
-msgid "MISSING\t\t%s\n"
-msgstr "MANQUANT\t\t%s\n"
-
-#: ../package.c:139
-#, c-format
-msgid "Repository        : %s\n"
+#: src/pacman/package.c:117
+#, fuzzy, c-format
+msgid "Repository     : %s\n"
 msgstr "Dépot                : %s\n"
 
-#: ../package.c:140
-#, c-format
-msgid "Name              : %s\n"
-msgstr "Nom                  : %s\n"
+#: src/pacman/package.c:125
+#, fuzzy
+msgid "Replaces       :"
+msgstr "Remplace          :"
 
-#: ../package.c:141
+#: src/pacman/package.c:126
 #, c-format
-msgid "Version           : %s\n"
+msgid "Download Size  : %6.2f K\n"
 msgstr ""
 
-#: ../package.c:143
-msgid "Groups            :"
-msgstr "Groupes           :"
-
-#: ../package.c:144
-msgid "Provides          :"
-msgstr "Forunit             :"
-
-#: ../package.c:145
-msgid "Depends On        :"
-msgstr "Depend De         :"
-
-#: ../package.c:146
-msgid "Removes           :"
-msgstr "Supprimer          :"
-
-#: ../package.c:147
-msgid "Conflicts With    :"
-msgstr "Conflits Avec      :"
+#: src/pacman/package.c:127
+#, fuzzy, c-format
+msgid "Installed Size : %6.2f K\n"
+msgstr "Script d'installation    : %s\n"
 
-#: ../package.c:148
-msgid "Replaces          :"
-msgstr "Remplace          :"
+#: src/pacman/package.c:134
+#, fuzzy, c-format
+msgid "MD5 Sum        : %s"
+msgstr ""
+"\n"
+"somme MD5           : %s"
 
-#: ../package.c:150
-#, c-format
-msgid "Size (compressed) : %ld\n"
-msgstr "Taille (compressé) : %ld\n"
+#: src/pacman/package.c:137
+#, fuzzy, c-format
+msgid "SHA1 Sum       : %s"
+msgstr ""
+"\n"
+"Somme SHA1         : %s"
 
-#: ../package.c:151
-#, c-format
-msgid "Size (uncompressed):%ld\n"
-msgstr "Taille (décompressé):%ld\n"
+#: src/pacman/package.c:168
+#, fuzzy, c-format
+msgid "error calculating checksums for %s\n"
+msgstr "erreur lors du calcul des sommes md5 ou sha1 pour %s\n"
 
-#: ../package.c:152
-#, c-format
-msgid "Description       : "
-msgstr ""
+#: src/pacman/package.c:181
+#, fuzzy, c-format
+msgid "MODIFIED\t%s\n"
+msgstr "%sMODIFIE\t%s\n"
 
-#: ../package.c:156
+#: src/pacman/package.c:183
 #, c-format
-msgid ""
-"\n"
-"MD5 Sum           : %s"
+msgid "Not Modified\t%s\n"
 msgstr ""
-"\n"
-"somme MD5           : %s"
 
-#: ../package.c:160
+#: src/pacman/package.c:188
 #, c-format
-msgid ""
-"\n"
-"SHA1 Sum          : %s"
-msgstr ""
-"\n"
-"Somme SHA1         : %s"
+msgid "MISSING\t\t%s\n"
+msgstr "MANQUANT\t\t%s\n"
 
-#: ../package.c:189
+#: src/pacman/package.c:221
 #, c-format
 msgid "No changelog available for '%s'.\n"
 msgstr "Aucun changelog disponible pour '%s'.\n"
 
-#: ../pacman.c:96
+#: src/pacman/pacman.c:88
 #, c-format
 msgid "usage:  %s {-h --help}\n"
 msgstr ""
 
-#: ../pacman.c:97
+#: src/pacman/pacman.c:89
 #, c-format
 msgid "        %s {-V --version}\n"
 msgstr ""
 
-#: ../pacman.c:98
+#: src/pacman/pacman.c:90
 #, c-format
 msgid "        %s {-A --add}     [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:99
+#: src/pacman/pacman.c:91
 #, c-format
 msgid "        %s {-R --remove}  [options] <package>\n"
 msgstr ""
 
-#: ../pacman.c:100
+#: src/pacman/pacman.c:92
 #, c-format
 msgid "        %s {-U --upgrade} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:101
+#: src/pacman/pacman.c:93
 #, c-format
 msgid "        %s {-F --freshen} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:102
+#: src/pacman/pacman.c:94
 #, c-format
 msgid "        %s {-Q --query}   [options] [package]\n"
 msgstr ""
 
-#: ../pacman.c:103
+#: src/pacman/pacman.c:95
 #, c-format
 msgid "        %s {-S --sync}    [options] [package]\n"
 msgstr ""
 
-#: ../pacman.c:104
+#: src/pacman/pacman.c:96
 #, c-format
 msgid ""
 "\n"
@@ -427,54 +377,55 @@ msgstr ""
 "\n"
 "utiliser '%s --help' avec d'autres options pour une syntaxe plus détaillée\n"
 
-#: ../pacman.c:107
+#: src/pacman/pacman.c:99
 #, c-format
 msgid "usage:  %s {-A --add} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:108 ../pacman.c:113 ../pacman.c:125 ../pacman.c:130
-#: ../pacman.c:144
+#: src/pacman/pacman.c:100 src/pacman/pacman.c:105 src/pacman/pacman.c:117
+#: src/pacman/pacman.c:122 src/pacman/pacman.c:136
 #, c-format
 msgid "options:\n"
 msgstr ""
 
-#: ../pacman.c:109 ../pacman.c:115 ../pacman.c:126 ../pacman.c:146
+#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
+#: src/pacman/pacman.c:138
 #, c-format
 msgid "  -d, --nodeps        skip dependency checks\n"
 msgstr "  -d, --nodeps        ignore le contrôle des dépendances\n"
 
-#: ../pacman.c:110 ../pacman.c:127 ../pacman.c:148
+#: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140
 #, c-format
 msgid "  -f, --force         force install, overwrite conflicting files\n"
 msgstr ""
 "  -f, --force         force l'installation, malgré les éventuels fichiers en "
 "conflit\n"
 
-#: ../pacman.c:112
+#: src/pacman/pacman.c:104
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
 msgstr ""
 
-#: ../pacman.c:114
+#: src/pacman/pacman.c:106
 #, c-format
 msgid ""
 "  -c, --cascade       remove packages and all packages that depend on them\n"
 msgstr ""
 "  -c, --cascade       supprime les paquets et tout ceux qui en dépendent\n"
 
-#: ../pacman.c:116
+#: src/pacman/pacman.c:108
 #, c-format
 msgid "  -k, --dbonly        only remove database entry, do not remove files\n"
 msgstr ""
 "  -k, --dbonly        supprime uniquement les entrées dans la base de "
 "données, pas les fichiers\n"
 
-#: ../pacman.c:117
+#: src/pacman/pacman.c:109
 #, c-format
 msgid "  -n, --nosave        remove configuration files as well\n"
 msgstr "  -n, --nosave        efface également les fichiers de config\n"
 
-#: ../pacman.c:118
+#: src/pacman/pacman.c:110
 #, c-format
 msgid ""
 "  -s, --recursive     remove dependencies also (that won't break packages)\n"
@@ -482,56 +433,57 @@ msgstr ""
 "  -s, --recursive     supprime les dépendances également (cela ne cassera "
 "pas les dépendances d'autres paquets)\n"
 
-#: ../pacman.c:121
+#: src/pacman/pacman.c:113
 #, c-format
 msgid "usage:  %s {-F --freshen} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:123
+#: src/pacman/pacman.c:115
 #, c-format
 msgid "usage:  %s {-U --upgrade} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:129
+#: src/pacman/pacman.c:121
 #, c-format
 msgid "usage:  %s {-Q --query} [options] [package]\n"
 msgstr ""
 
-#: ../pacman.c:131
+#: src/pacman/pacman.c:123
 #, c-format
 msgid "  -c, --changelog     view the changelog of a package\n"
 msgstr "  -c, --changelog     afficher le changelog du paquet\n"
 
-#: ../pacman.c:132
-#, c-format
+#: src/pacman/pacman.c:124
+#, fuzzy, c-format
 msgid ""
-"  -e, --orphans       list all packages that were installed as a dependency\n"
+"  -e, --orphans       list all packages installed as dependencies but no "
+"longer\n"
 msgstr ""
 "  -e, --orphans       lister tous les paquets qui ont été installés comme "
 "des dépendances\n"
 
-#: ../pacman.c:133
-#, c-format
-msgid "                      and are not required by any other packages\n"
+#: src/pacman/pacman.c:125
+#, fuzzy, c-format
+msgid "                      required by any package\n"
 msgstr "                      et ne sont plus requis par aucun autre paquet\n"
 
-#: ../pacman.c:134 ../pacman.c:149
+#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
 #, c-format
 msgid "  -g, --groups        view all members of a package group\n"
 msgstr ""
 "  -g, --groups        afficher tous les éléments d'un group de paquet\n"
 
-#: ../pacman.c:135
+#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
 #, c-format
 msgid "  -i, --info          view package information\n"
 msgstr "  -i, --info          afficher les informations du paquet\n"
 
-#: ../pacman.c:136
+#: src/pacman/pacman.c:128
 #, c-format
 msgid "  -l, --list          list the contents of the queried package\n"
 msgstr "  -l, --list          lister le contenu du paquet interrogé\n"
 
-#: ../pacman.c:137
+#: src/pacman/pacman.c:129
 #, c-format
 msgid ""
 "  -m, --foreign       list all packages that were not found in the sync db"
@@ -540,27 +492,22 @@ msgstr ""
 "  -m, --foreign       liste les paquets non trouvés dans la/les base(s) de "
 "données de synchronisation\n"
 
-#: ../pacman.c:138
+#: src/pacman/pacman.c:130
 #, c-format
 msgid "  -o, --owns <file>   query the package that owns <file>\n"
 msgstr ""
 "  -o, --owns <fichier>   recherche les paquets contenant le fichier "
 "<fiichier>\n"
 
-#: ../pacman.c:139
-#, c-format
+#: src/pacman/pacman.c:131
+#, fuzzy, c-format
 msgid ""
-"  -p, --file          pacman will query the package file [package] instead "
-"of\n"
+"  -p, --file          query the package file [package] instead of the "
+"database\n"
 msgstr ""
 "  -p, --file          pacman va interroger le fichier [paquet] au lieu de\n"
 
-#: ../pacman.c:140
-#, c-format
-msgid "                      looking in the database\n"
-msgstr "                      rechercher dans la base de données\n"
-
-#: ../pacman.c:141
+#: src/pacman/pacman.c:132
 #, c-format
 msgid ""
 "  -s, --search        search locally-installed packages for matching "
@@ -569,12 +516,17 @@ msgstr ""
 "  -s, --search        recherche dans les paquets installés localement ceux "
 "qui contiennent la chaine\n"
 
-#: ../pacman.c:143
+#: src/pacman/pacman.c:133
+#, fuzzy, c-format
+msgid "  -u, --upgrades      list all packages that can be upgraded\n"
+msgstr "  -u, --sysupgrade    met à jour tous les paquets obsolètes\n"
+
+#: src/pacman/pacman.c:135
 #, c-format
 msgid "usage:  %s {-S --sync} [options] [package]\n"
 msgstr ""
 
-#: ../pacman.c:145
+#: src/pacman/pacman.c:137
 #, c-format
 msgid ""
 "  -c, --clean         remove old packages from cache directory (use -cc for "
@@ -583,12 +535,12 @@ msgstr ""
 "  -c, --clean         remove old packages from cache directory (use -cc for "
 "all)\n"
 
-#: ../pacman.c:147
+#: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --dependsonly   install dependencies only\n"
 msgstr "  -e, --dependsonly   installe les dépendances uniquement\n"
 
-#: ../pacman.c:150
+#: src/pacman/pacman.c:143
 #, c-format
 msgid ""
 "  -p, --print-uris    print out URIs for given packages and their "
@@ -597,17 +549,17 @@ msgstr ""
 "  -p, --print-uris    affiche les URIs pour des paquets donnés et leurs "
 "dépendances\n"
 
-#: ../pacman.c:151
+#: src/pacman/pacman.c:144
 #, c-format
 msgid "  -s, --search        search remote repositories for matching strings\n"
 msgstr "  -s, --search        recherche la chaîne dans les dépots distants\n"
 
-#: ../pacman.c:152
+#: src/pacman/pacman.c:145
 #, c-format
 msgid "  -u, --sysupgrade    upgrade all packages that are out of date\n"
 msgstr "  -u, --sysupgrade    met à jour tous les paquets obsolètes\n"
 
-#: ../pacman.c:153
+#: src/pacman/pacman.c:146
 #, c-format
 msgid ""
 "  -w, --downloadonly  download packages but do not install/upgrade anything\n"
@@ -615,7 +567,7 @@ msgstr ""
 "  -w, --downloadonly  télécharge les paquets mais n'installe rien et ne met "
 "rien à jour\n"
 
-#: ../pacman.c:154
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
 "  -y, --refresh       download fresh package databases from the server\n"
@@ -623,7 +575,7 @@ msgstr ""
 "  -y, --refresh       télécharge les dernières bases de données depuis les "
 "serveurs\n"
 
-#: ../pacman.c:155
+#: src/pacman/pacman.c:148
 #, c-format
 msgid ""
 "      --ignore <pkg>  ignore a package upgrade (can be used more than once)\n"
@@ -631,22 +583,22 @@ msgstr ""
 "      --ignore <pkg>  ignore la mise à jour d'un paquet (peut être utilisé "
 "plus d'une fois)\n"
 
-#: ../pacman.c:157
+#: src/pacman/pacman.c:150
 #, c-format
 msgid "      --config <path> set an alternate configuration file\n"
 msgstr "      --config <path> défini un fichier de configuration alternatif\n"
 
-#: ../pacman.c:158
+#: src/pacman/pacman.c:151
 #, c-format
 msgid "      --noconfirm     do not ask for anything confirmation\n"
 msgstr "      --noconfirm     ne demande aucune confirmation\n"
 
-#: ../pacman.c:159
+#: src/pacman/pacman.c:152
 #, c-format
 msgid "      --ask  <number> pre-specify answers for questions (see manpage)\n"
 msgstr ""
 
-#: ../pacman.c:160
+#: src/pacman/pacman.c:153
 #, c-format
 msgid ""
 "      --noprogressbar do not show a progress bar when downloading files\n"
@@ -654,222 +606,167 @@ msgstr ""
 "      --noprogressbar n'affiche pas la barre de progression pendant le "
 "téléchargement\n"
 
-#: ../pacman.c:161
+#: src/pacman/pacman.c:154
 #, c-format
 msgid ""
 "      --noscriptlet   do not execute the install scriptlet if there is any\n"
 msgstr ""
 "      --noscriptlet   n'exécute pas les scripts d'installation s'il y'en a\n"
 
-#: ../pacman.c:162
+#: src/pacman/pacman.c:155
 #, c-format
 msgid "  -v, --verbose       be verbose\n"
 msgstr "  -v, --verbose       mode verbeux (affichage prolixe)\n"
 
-#: ../pacman.c:163
+#: src/pacman/pacman.c:156
 #, c-format
 msgid "  -r, --root <path>   set an alternate installation root\n"
 msgstr "  -r, --root <path>   défini un répertoire d'installation alternatif\n"
 
-#: ../pacman.c:164
+#: src/pacman/pacman.c:157
 #, c-format
 msgid "  -b, --dbpath <path> set an alternate database location\n"
 msgstr ""
 "  -b, --dbpath <path> défini un emplacement alternatif pour les bases de "
 "données\n"
 
-#: ../pacman.c:177
+#: src/pacman/pacman.c:170
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 "                       Ce programme peut être librement redistribué sous\n"
 
-#: ../pacman.c:178
+#: src/pacman/pacman.c:171
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr "                       les termes de la GNU General Public License\n"
 
-#: ../pacman.c:363
-msgid "bad root path"
-msgstr "mauvais répertoire racine"
+#: src/pacman/pacman.c:298
+#, fuzzy, c-format
+msgid "error: '%s' is not a valid debug level"
+msgstr "%s nest pas une expression régulière valide.\n"
+
+#: src/pacman/pacman.c:334
+#, c-format
+msgid "error: '%s' is not a valid db path\n"
+msgstr ""
+
+#: src/pacman/pacman.c:364
+#, c-format
+msgid "error: '%s' is not a valid root path\n"
+msgstr ""
 
-#: ../pacman.c:390
+#: src/pacman/pacman.c:391
 msgid "only one operation may be used at a time\n"
 msgstr "une seule opération peut être effectuée à la fois\n"
 
-#: ../pacman.c:486
-msgid "you cannot perform this operation unless you are root.\n"
-msgstr "vous ne pouvez effectuer cette opération à moins d'être root.\n"
-
-#: ../pacman.c:510
+#: src/pacman/pacman.c:454
 #, c-format
 msgid "failed to initilize alpm library (%s)\n"
 msgstr "échec d'initialisation de la librairie alpm (%s)\n"
 
-#: ../pacman.c:518
+#: src/pacman/pacman.c:487
+msgid "you cannot perform this operation unless you are root.\n"
+msgstr "vous ne pouvez effectuer cette opération à moins d'être root.\n"
+
+#: src/pacman/pacman.c:503
 #, fuzzy, c-format
 msgid "failed to parse config (%s)\n"
 msgstr "échec de préparation de la transaction (%s)\n"
 
-#: ../pacman.c:524
-#, c-format
-msgid "failed to set option LOGMASK (%s)\n"
-msgstr "échec d'affectation de l'option LOGMASK (%s)\n"
-
-#: ../pacman.c:528
-#, c-format
-msgid "failed to set option LOGCB (%s)\n"
-msgstr "échec d'affectation de l'option LOGCB (%s)\n"
-
-#: ../pacman.c:532
-#, fuzzy, c-format
-msgid "failed to set option DLCB (%s)\n"
-msgstr "échec d'affectation de l'option LOGCB (%s)\n"
-
-#: ../pacman.c:536
-#, fuzzy, c-format
-msgid "failed to set option DLFNM (%s)\n"
-msgstr "échec d'affectation de l'option LOGFILE (%s)\n"
-
-#: ../pacman.c:540
-#, fuzzy, c-format
-msgid "failed to set option DLOFFSET (%s)\n"
-msgstr "échec d'affectation de l'option LOGFILE (%s)\n"
-
-#: ../pacman.c:544
-#, fuzzy, c-format
-msgid "failed to set option DLT0 (%s)\n"
-msgstr "échec d'affectation de l'option DBPATH (%s)\n"
-
-#: ../pacman.c:548
-#, fuzzy, c-format
-msgid "failed to set option DLT (%s)\n"
-msgstr "échec d'affectation de l'option DBPATH (%s)\n"
-
-#: ../pacman.c:552
-#, fuzzy, c-format
-msgid "failed to set option DLRATE (%s)\n"
-msgstr "échec d'affectation de l'option DBPATH (%s)\n"
-
-#: ../pacman.c:556
-#, fuzzy, c-format
-msgid "failed to set option DLXFERED1 (%s)\n"
-msgstr "échec d'affectation de l'option LOGFILE (%s)\n"
-
-#: ../pacman.c:560
-#, fuzzy, c-format
-msgid "failed to set option DLETA_H (%s)\n"
-msgstr "échec d'affectation de l'option DBPATH (%s)\n"
-
-#: ../pacman.c:564
-#, fuzzy, c-format
-msgid "failed to set option DLETA_M (%s)\n"
-msgstr "échec d'affectation de l'option DBPATH (%s)\n"
-
-#: ../pacman.c:568
-#, fuzzy, c-format
-msgid "failed to set option DLETA_S (%s)\n"
-msgstr "échec d'affectation de l'option LOGMASK (%s)\n"
-
-#: ../pacman.c:578
-#, c-format
-msgid "failed to set option IGNOREPKG (%s)\n"
-msgstr "échec d'affectation de l'option IGNOREPKG (%s)\n"
-
-#: ../pacman.c:586
+#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
 msgid "Targets:"
 msgstr "Cibles:"
 
-#: ../pacman.c:592
+#: src/pacman/pacman.c:519
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr "n'a pas pu enregistrer la base de données 'locale' (%s)\n"
 
-#: ../pacman.c:599
+#: src/pacman/pacman.c:526
 msgid "no targets specified (use -h for help)\n"
 msgstr "aucune cible spécifiée (utiliser -h pour de l'aide)\n"
 
-#: ../pacman.c:612
+#: src/pacman/pacman.c:539
 msgid "no operation specified (use -h for help)\n"
 msgstr "aucune opération spécifiée (utiliser -h pour de l'aide)\n"
 
-#: ../query.c:56
+#: src/pacman/query.c:53
 msgid "no file was specified for --owns\n"
 msgstr "aucun fichier spécifié pour --owns\n"
 
-#: ../query.c:61
-#, c-format
-msgid "%s is not a file.\n"
-msgstr "%s n'est pas un fichier.\n"
-
-#: ../query.c:78
+#: src/pacman/query.c:71
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s appartient à %s %s\n"
 
-#: ../query.c:86
+#: src/pacman/query.c:78
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Aucun paquet ne contient %s\n"
 
-#: ../query.c:111 ../sync.c:340
+#: src/pacman/query.c:122 src/pacman/sync.c:413
 msgid "no usable package repositories configured.\n"
 msgstr "aucun dépot de paquet utilisable n'est définit.\n"
 
-#: ../query.c:150
+#: src/pacman/query.c:128
+#, fuzzy
+msgid "Checking for package upgrades..."
+msgstr "verification de l'intégrité des paquets"
+
+#: src/pacman/query.c:135
+msgid "no upgrades found"
+msgstr ""
+
+#: src/pacman/query.c:173
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "le groupe \"%s\" n'a pas été trouvé\n"
 
-#: ../query.c:160
+#: src/pacman/query.c:184
 msgid "no package file was specified for --file\n"
 msgstr "aucun fichier du paquet spécifié pour --file\n"
 
-#: ../query.c:164
+#: src/pacman/query.c:188
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "échec de chargement du paquet '%s' (%s)\n"
 
-#. something weird happened
-#: ../query.c:202 ../query.c:244
+#: src/pacman/query.c:226 src/pacman/query.c:263
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "paquet \"%s\" non trouvé\n"
 
-#: ../remove.c:64 ../sync.c:456
+#: src/pacman/remove.c:58 src/pacman/sync.c:528
 #, c-format
 msgid ":: group %s:\n"
 msgstr ":: groupe %s:\n"
 
-#: ../remove.c:66
+#: src/pacman/remove.c:60
 msgid "    Remove whole content? [Y/n] "
 msgstr "    Effacer tout le contenu? [O/n] "
 
-#: ../remove.c:68
+#: src/pacman/remove.c:64
 #, c-format
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Retirer %s du groupe %s? [O/n] "
 
-#: ../remove.c:81 ../sync.c:376 ../sync.c:415
+#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
 #, c-format
 msgid "failed to init transaction (%s)\n"
 msgstr "échec d'initialisation de la transaction (%s)\n"
 
-#: ../remove.c:107
+#: src/pacman/remove.c:89
 #, c-format
-msgid "  %s: is required by %s\n"
-msgstr "  %s: est requit par %s\n"
+msgid "failed to add target '%s' (%s)\n"
+msgstr "échec d'ajout de la cible '%s' (%s)\n"
 
-#: ../remove.c:129
-msgid ""
-"\n"
-"Targets:"
-msgstr ""
-"\n"
-"Cibles:"
+#: src/pacman/remove.c:103
+#, fuzzy, c-format
+msgid ":: %s is required by %s\n"
+msgstr "  %s: est requit par %s\n"
 
-#. get confirmation
-#: ../remove.c:132
+#: src/pacman/remove.c:128
 msgid ""
 "\n"
 "Do you want to remove these packages? [Y/n] "
@@ -877,83 +774,82 @@ msgstr ""
 "\n"
 "Voules vous désinstaller ces paquets? [O/n] "
 
-#: ../sync.c:73
+#: src/pacman/sync.c:113
 msgid "Do you want to remove old packages from cache? [Y/n] "
 msgstr "Voulez vous effacer les anciens paquets du cache? [Y/n] "
 
-#: ../sync.c:75
+#: src/pacman/sync.c:115
 msgid "removing old packages from cache... "
 msgstr "effacement des anciens paquets du cache..."
 
-#: ../sync.c:78
+#: src/pacman/sync.c:118
 msgid "could not access cache directory\n"
 msgstr "n'a pas pu acceder au répertoire de cache\n"
 
-#. full cleanup
-#: ../sync.c:138
+#: src/pacman/sync.c:179
 msgid "Do you want to remove all packages from cache? [Y/n] "
 msgstr "Voulez vous effacer tous les paquets du cache? [O/n] "
 
-#: ../sync.c:140
+#: src/pacman/sync.c:181
 msgid "removing all packages from cache... "
 msgstr "effacement de tous les paquets du cache..."
 
-#: ../sync.c:143
+#: src/pacman/sync.c:184
 msgid "could not remove cache directory\n"
 msgstr "n'a pas pu supprimer le répertoire de cache\n"
 
-#: ../sync.c:148
+#: src/pacman/sync.c:189
 msgid "could not create new cache directory\n"
 msgstr "n'a pas pu créer le nouveau répertoire de cache\n"
 
-#: ../sync.c:153 ../trans.c:72 ../trans.c:86 ../trans.c:100 ../trans.c:116
-#: ../trans.c:128
-msgid "done.\n"
-msgstr "fait.\n"
-
-#: ../sync.c:168
-#, c-format
-msgid "failed to synchronize %s\n"
+#: src/pacman/sync.c:216
+#, fuzzy, c-format
+msgid "failed to synchronize %s: %s\n"
 msgstr "echec lors de la synchronisation %s\n"
 
-#: ../sync.c:170
+#: src/pacman/sync.c:218
 #, c-format
 msgid "failed to update %s (%s)\n"
 msgstr "echec de mise à jour %s (%s)\n"
 
-#: ../sync.c:174
+#: src/pacman/sync.c:221
 #, c-format
 msgid " %s is up to date\n"
 msgstr " %s est à jour\n"
 
-#: ../sync.c:265
+#: src/pacman/sync.c:341
 #, c-format
 msgid "package \"%s\" was not found.\n"
 msgstr "paquet \"%s\" non trouvé.\n"
 
-#: ../sync.c:303
+#: src/pacman/sync.c:378
 #, c-format
 msgid "repository \"%s\" was not found.\n"
 msgstr "le dépot \"%s\" n'a pas été trouvé.\n"
 
-#. grab a fresh package list
-#: ../sync.c:350
+#: src/pacman/sync.c:450
 msgid ":: Synchronizing package databases...\n"
 msgstr ":: Synchronisation des bases de données de paquets...\n"
 
-#: ../sync.c:351
+#: src/pacman/sync.c:451
 msgid "synchronizing package lists"
 msgstr "synchronisation de la liste des paquets"
 
-#: ../sync.c:385
-msgid ":: Starting local database upgrade...\n"
-msgstr ":: Démarrage de la mise à jour de base de données locale...\n"
+#: src/pacman/sync.c:453
+#, fuzzy
+msgid "failed to synchronize any databases"
+msgstr "echec lors de la synchronisation %s\n"
 
-#: ../sync.c:386
+#: src/pacman/sync.c:459
+#, fuzzy
+msgid ":: Starting full system upgrade...\n"
+msgstr "demarrage de la mise à jour pour le système complet"
+
+#: src/pacman/sync.c:460
 msgid "starting full system upgrade"
 msgstr "demarrage de la mise à jour pour le système complet"
 
-#: ../sync.c:404
+#: src/pacman/sync.c:478
 msgid ""
 "\n"
 ":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -961,83 +857,59 @@ msgstr ""
 "\n"
 ":: pacman a détecté une version plus récente du paquet \"pacman\".\n"
 
-#: ../sync.c:405
+#: src/pacman/sync.c:479
 msgid ":: It is recommended that you allow pacman to upgrade itself\n"
 msgstr ":: Il est recommandé de laisser pacman se mettre à jour\n"
 
-#: ../sync.c:406
+#: src/pacman/sync.c:480
 msgid ":: first, then you can re-run the operation with the newer version.\n"
 msgstr ""
 ":: d'abord, vous devriez re-lancer l'opération avec la nouvelle version.\n"
 
-#: ../sync.c:408
+#: src/pacman/sync.c:482
 msgid ":: Upgrade pacman first? [Y/n] "
 msgstr ":: Mettre à jour pacman préalablement? [O/n] "
 
-#: ../sync.c:423 ../sync.c:444
+#: src/pacman/sync.c:497
+#, fuzzy, c-format
+msgid "pacman: %s\n"
+msgstr "Aucun paquet ne contient %s\n"
+
+#: src/pacman/sync.c:517
 #, c-format
-msgid "could not add target '%s': %s\n"
-msgstr "n'a pas pu ajouter la cible '%s': %s\n"
+msgid "'%s': %s\n"
+msgstr ""
 
-#: ../sync.c:462
+#: src/pacman/sync.c:532
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Installer tout le contenu? [O/n] "
 
-#: ../sync.c:469
+#: src/pacman/sync.c:539
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Installer %s du groupe %s? [O/n] "
 
-#: ../sync.c:492
-#, c-format
-msgid "could not add target '%s': not found in sync db\n"
+#: src/pacman/sync.c:563
+#, fuzzy, c-format
+msgid "'%s': not found in sync db\n"
 msgstr ""
 "n'a pas pu ajouter la cible '%s': non trouvé dans la base de données de "
 "synchronisation\n"
 
-#: ../sync.c:511
+#: src/pacman/sync.c:583
 msgid "requires"
 msgstr "requiert"
 
-#: ../sync.c:511
+#: src/pacman/sync.c:583
 msgid "is required by"
 msgstr "est requit par"
 
-#: ../sync.c:588
-msgid ""
-"\n"
-"Remove:  "
-msgstr ""
-"\n"
-"Retire:  "
-
-#: ../sync.c:604
-msgid ""
-"\n"
-"Targets: "
-msgstr ""
-"\n"
-"Cibles: "
-
-#: ../sync.c:607
-#, c-format
-msgid ""
-"\n"
-"Total Package Size:   %.1f MB\n"
-msgstr ""
-"\n"
-"Taille Totale du Paquet:   %.1f MB\n"
-
-#: ../sync.c:608
-#, c-format
-msgid ""
-"\n"
-"Total Uncompressed Package Size:   %.1f MB\n"
-msgstr ""
-"\n"
-"Taille Totale du Paquet Décompressé:   %.1f MB\n"
+#: src/pacman/sync.c:625
+#, fuzzy
+msgid "local database is up to date\n"
+msgstr " %s est à jour\n"
 
-#: ../sync.c:614
+#: src/pacman/sync.c:634
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -1045,11 +917,11 @@ msgstr ""
 "\n"
 "Début du téléchargement...\n"
 
-#: ../sync.c:618
+#: src/pacman/sync.c:638
 msgid "Proceed with download? [Y/n] "
 msgstr "Procéder au téléchargement? [O/n] "
 
-#: ../sync.c:626
+#: src/pacman/sync.c:646
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -1057,144 +929,310 @@ msgstr ""
 "\n"
 "Début du processus de mise à jour...\n"
 
-#: ../sync.c:630
-msgid "Proceed with upgrade? [Y/n] "
-msgstr "Procéder aux mises à jour? [O/n] "
+#: src/pacman/sync.c:650
+#, fuzzy
+msgid "Proceed with installation? [Y/n] "
+msgstr "Procéder au téléchargement? [O/n] "
 
-#: ../trans.c:57
+#: src/pacman/trans.c:57
+msgid "] 100%    LOCAL "
+msgstr ""
+
+#: src/pacman/trans.c:68
 msgid "checking dependencies... "
 msgstr "vérification des dépendances..."
 
-#: ../trans.c:60
+#: src/pacman/trans.c:72
 msgid "checking for file conflicts... "
 msgstr "vérification des conflits de fichiers..."
 
-#: ../trans.c:63
+#: src/pacman/trans.c:76
+#, fuzzy
+msgid "cleaning up... "
+msgstr "désinstallation de %s... "
+
+#: src/pacman/trans.c:79
 msgid "resolving dependencies... "
 msgstr "résolution des dépendances..."
 
-#: ../trans.c:66
+#: src/pacman/trans.c:82
 msgid "looking for inter-conflicts... "
 msgstr "recherche inter-conflits... "
 
-#: ../trans.c:81
+#: src/pacman/trans.c:102
 #, c-format
 msgid "installing %s... "
 msgstr "installation de %s ..."
 
-#: ../trans.c:88
+#: src/pacman/trans.c:109
 #, c-format
 msgid "installed %s (%s)"
 msgstr "%s installé (%s)"
 
-#: ../trans.c:95
+#: src/pacman/trans.c:116
 #, c-format
 msgid "removing %s... "
 msgstr "désinstallation de %s... "
 
-#: ../trans.c:104
+#: src/pacman/trans.c:123
 #, c-format
 msgid "removed %s (%s)"
 msgstr "%s désinstallé (%s)"
 
-#: ../trans.c:111
+#: src/pacman/trans.c:130
 #, c-format
 msgid "upgrading %s... "
 msgstr "mise à jour de %s... "
 
-#: ../trans.c:118
+#: src/pacman/trans.c:137
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "%s mit à jour (%s -> %s)"
 
-#: ../trans.c:125
+#: src/pacman/trans.c:144
 msgid "checking package integrity... "
 msgstr "verification de l'intégrité des paquets"
 
-#: ../trans.c:139
+#: src/pacman/trans.c:158
 #, fuzzy
 msgid " done.\n"
 msgstr "fait.\n"
 
-#: ../trans.c:141
+#: src/pacman/trans.c:160
 msgid " failed.\n"
 msgstr ""
 
-#: ../trans.c:148
-#, c-format
-msgid ""
-"\n"
-":: Retrieving packages from %s...\n"
+#: src/pacman/trans.c:167
+#, fuzzy, c-format
+msgid ":: Retrieving packages from %s...\n"
 msgstr ""
 "\n"
 ":: Récupération des paquets depuis %s...\n"
 
-#: ../trans.c:158
-msgid "] 100%    LOCAL "
-msgstr ""
-
-#: ../trans.c:176
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ""
 ":: %s requiert %s, mais il est défini en IgnorePkg. Installer tout de même? "
 "[Y/n] "
 
-#: ../trans.c:190
-#, c-format
-msgid ":: %s is designated as a HoldPkg.  Remove anyway? [Y/n] "
+#: src/pacman/trans.c:204
+#, fuzzy, c-format
+msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ":: %s est indiqué comme \"HoldPkg\".  Supprimer tout de même? [Y/n] "
 
-#: ../trans.c:203
+#: src/pacman/trans.c:217
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: Remplacer %s avec %s/%s? [O/n] "
 
-#: ../trans.c:218
+#: src/pacman/trans.c:232
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: %s est en conflit avec with %s. Retirer %s? [O/n] "
 
-#: ../trans.c:234
+#: src/pacman/trans.c:248
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ""
 ":: %s-%s: la version locale est plus récente. Mettre à jour tout de même? [Y/"
 "n] "
 
-#: ../trans.c:252
+#: src/pacman/trans.c:266
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ""
 ":: %s-%s: la version locale est à jour. Mettre à jour tout de même? [Y/n] "
 
-#: ../trans.c:270
+#: src/pacman/trans.c:284
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: L'archive %s est corrompue. Voulez vous l'effacer? [Y/n] "
 
-#: ../trans.c:286
+#: src/pacman/trans.c:333
 msgid "installing"
 msgstr "Installation"
 
-#: ../trans.c:287
+#: src/pacman/trans.c:336
 msgid "upgrading"
 msgstr "Mise à jour"
 
-#: ../trans.c:288
+#: src/pacman/trans.c:339
 #, fuzzy
 msgid "removing"
 msgstr "désinstallation de %s... "
 
-#: ../util.c:178
-#, c-format
-msgid "failed to allocated %d bytes\n"
-msgstr "echec lors de l'allocation de %d bytes\n"
+#: src/pacman/trans.c:342
+#, fuzzy
+msgid "checking for file conflicts"
+msgstr "vérification des conflits de fichiers..."
 
-#: ../util.c:232
+#: src/pacman/util.c:258
 #, c-format
-msgid "%s is not a valid regular expression.\n"
-msgstr "%s nest pas une expression régulière valide.\n"
+msgid "None\n"
+msgstr "Aucun\n"
+
+#: src/pacman/util.c:303
+#, fuzzy
+msgid "Remove:"
+msgstr ""
+"\n"
+"Retire:  "
+
+#: src/pacman/util.c:311
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Total Removed Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Taille Totale du Paquet:   %.1f MB\n"
+
+#: src/pacman/util.c:322
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Total Package Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Taille Totale du Paquet:   %.1f MB\n"
+
+#: src/pacman/util.c:329
+#, fuzzy, c-format
+msgid "Total Installed Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Taille Totale du Paquet:   %.1f MB\n"
+
+#~ msgid "done."
+#~ msgstr "fait."
+
+#~ msgid "Size           : %ld\n"
+#~ msgstr "Taille         : %ld\n"
+
+#~ msgid "Reason         : "
+#~ msgstr "Raison         : "
+
+#~ msgid "Unknown\n"
+#~ msgstr "Inconnu\n"
+
+#~ msgid "NOT "
+#~ msgstr "N'EST PAS"
+
+#~ msgid "Name              : %s\n"
+#~ msgstr "Nom                  : %s\n"
+
+#~ msgid "Groups            :"
+#~ msgstr "Groupes           :"
+
+#~ msgid "Provides          :"
+#~ msgstr "Forunit             :"
+
+#~ msgid "Depends On        :"
+#~ msgstr "Depend De         :"
+
+#~ msgid "Removes           :"
+#~ msgstr "Supprimer          :"
+
+#~ msgid "Conflicts With    :"
+#~ msgstr "Conflits Avec      :"
+
+#~ msgid "Size (compressed) : %ld\n"
+#~ msgstr "Taille (compressé) : %ld\n"
+
+#~ msgid "Size (uncompressed):%ld\n"
+#~ msgstr "Taille (décompressé):%ld\n"
+
+#~ msgid "                      looking in the database\n"
+#~ msgstr "                      rechercher dans la base de données\n"
+
+#~ msgid "bad root path"
+#~ msgstr "mauvais répertoire racine"
+
+#~ msgid "failed to set option LOGMASK (%s)\n"
+#~ msgstr "échec d'affectation de l'option LOGMASK (%s)\n"
+
+#~ msgid "failed to set option LOGCB (%s)\n"
+#~ msgstr "échec d'affectation de l'option LOGCB (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLCB (%s)\n"
+#~ msgstr "échec d'affectation de l'option LOGCB (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLFNM (%s)\n"
+#~ msgstr "échec d'affectation de l'option LOGFILE (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLOFFSET (%s)\n"
+#~ msgstr "échec d'affectation de l'option LOGFILE (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLT0 (%s)\n"
+#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLT (%s)\n"
+#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLRATE (%s)\n"
+#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLXFERED1 (%s)\n"
+#~ msgstr "échec d'affectation de l'option LOGFILE (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLETA_H (%s)\n"
+#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLETA_M (%s)\n"
+#~ msgstr "échec d'affectation de l'option DBPATH (%s)\n"
+
+#, fuzzy
+#~ msgid "failed to set option DLETA_S (%s)\n"
+#~ msgstr "échec d'affectation de l'option LOGMASK (%s)\n"
+
+#~ msgid "failed to set option IGNOREPKG (%s)\n"
+#~ msgstr "échec d'affectation de l'option IGNOREPKG (%s)\n"
+
+#~ msgid "%s is not a file.\n"
+#~ msgstr "%s n'est pas un fichier.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Targets:"
+#~ msgstr ""
+#~ "\n"
+#~ "Cibles:"
+
+#~ msgid ":: Starting local database upgrade...\n"
+#~ msgstr ":: Démarrage de la mise à jour de base de données locale...\n"
+
+#~ msgid "could not add target '%s': %s\n"
+#~ msgstr "n'a pas pu ajouter la cible '%s': %s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Targets: "
+#~ msgstr ""
+#~ "\n"
+#~ "Cibles: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Total Uncompressed Package Size:   %.1f MB\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Taille Totale du Paquet Décompressé:   %.1f MB\n"
+
+#~ msgid "Proceed with upgrade? [Y/n] "
+#~ msgstr "Procéder aux mises à jour? [O/n] "
+
+#~ msgid "failed to allocated %d bytes\n"
+#~ msgstr "echec lors de l'allocation de %d bytes\n"
 
 #~ msgid "config: new section '%s'\n"
 #~ msgstr "config: nouvelle section '%s'\n"
diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po
index d7fc716b..57429527 100644
--- a/src/pacman/po/hu.po
+++ b/src/pacman/po/hu.po
@@ -1,23 +1,23 @@
 # translation of hu.po to Hungarian
 # Hungarian translations for pacman package.
-# Copyright (C) 2006 THE pacman'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the pacman package.
-#
+# Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
 # Miklos Vajna <vmiklos@frugalware.org>, 2006.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 13:36+0200\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2007-02-06 20:43-0500\n"
 "PO-Revision-Date: 2006-09-03 13:52+0200\n"
 "Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
-"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:378 ../sync.c:417
+#: src/pacman/add.c:69 src/pacman/deptest.c:69 src/pacman/remove.c:79
+#: src/pacman/sync.c:442 src/pacman/sync.c:491
 #, c-format
 msgid ""
 "       if you're sure a package manager is not already running,\n"
@@ -26,46 +26,47 @@ msgstr ""
 "       ha biztos, hogy nem fut egy csomagkezelõ, abban az esetben\n"
 "       eltávolíthatja a %s%s fájlt\n"
 
-#. and add targets to it
-#: ../add.c:76
+#: src/pacman/add.c:76
 msgid "loading package data... "
 msgstr "csomag adatainak betöltése... "
 
-#: ../add.c:79 ../remove.c:92
-#, c-format
-msgid "failed to add target '%s' (%s)\n"
+#: src/pacman/add.c:80
+#, fuzzy, c-format
+msgid "failed to add target '%s' (%s)"
 msgstr "nem sikerült a '%s' célt hozzáadni (%s)\n"
 
-#: ../add.c:84
-msgid "done."
-msgstr "kész."
+#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:86
+#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
+#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+msgid "done.\n"
+msgstr "kész.\n"
 
-#: ../add.c:92 ../remove.c:102 ../sync.c:505
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "nem sikerült elõkészíteni a tranzakciót (%s)\n"
 
-#: ../add.c:97
+#: src/pacman/add.c:97
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ":: %s: igényli a következõt: %s"
 
-#: ../add.c:111 ../sync.c:526
+#: src/pacman/add.c:118 src/pacman/sync.c:605
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: ütközik a következõvel: %s"
 
-#: ../add.c:121 ../sync.c:649
-#, c-format
-msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)"
+#: src/pacman/add.c:127 src/pacman/sync.c:669
+#, fuzzy, c-format
+msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
 msgstr "%s%s: létezik ebben: \"%s\" (cél) és ebben: \"%s\" (cél)"
 
-#: ../add.c:128 ../sync.c:656
-#, c-format
-msgid "%s: %s%s exists in filesystem"
+#: src/pacman/add.c:134 src/pacman/sync.c:676
+#, fuzzy, c-format
+msgid "%s: %s%s exists in filesystem\n"
 msgstr "%s: a %s%s létezik a fájlrendszerben"
 
-#: ../add.c:136 ../sync.c:664 ../sync.c:671
+#: src/pacman/add.c:141 src/pacman/sync.c:683 src/pacman/sync.c:689
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
@@ -73,348 +74,297 @@ msgstr ""
 "\n"
 "hibák léptek fel, nem frissült csomag.\n"
 
-#: ../add.c:143 ../sync.c:536
+#: src/pacman/add.c:151 src/pacman/sync.c:612
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ":: %.1f MB szükséges, %.1f MB áll rendelkezésre"
 
-#: ../add.c:157 ../remove.c:142 ../sync.c:642
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr "nem sikerült végrehajtani a tranzakciót (%s)\n"
 
-#: ../add.c:164 ../remove.c:152 ../sync.c:410 ../sync.c:684
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:484
+#: src/pacman/sync.c:705
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr "nem sikerült lezárni a tranzakciót (%s)\n"
 
-#: ../deptest.c:77
+#: src/pacman/deptest.c:82
 msgid "memory allocation failure\n"
 msgstr "memória allokálási hiba\n"
 
-#: ../deptest.c:87
+#: src/pacman/deptest.c:93
 #, c-format
 msgid "add target %s\n"
 msgstr "cél hozzáadása: %s\n"
 
-#: ../deptest.c:90
+#: src/pacman/deptest.c:96
 #, c-format
 msgid "could not add target (%s)\n"
 msgstr "nem sikerült hozzáadni a célt (%s)\n"
 
-#: ../deptest.c:110
+#: src/pacman/deptest.c:115
 #, c-format
 msgid "requires: %s"
 msgstr "igényli a következõt: %s"
 
-#: ../deptest.c:126
+#: src/pacman/deptest.c:139
 #, c-format
 msgid "conflict: %s"
 msgstr "ütközik a következõvel: %s"
 
-#: ../deptest.c:140 ../deptest.c:158
+#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
 #, c-format
 msgid "could not release transaction (%s)"
 msgstr "nem sikerült a tranzakciót lezárni (%s)"
 
-#: ../list.c:143 ../list.c:171
-#, c-format
-msgid "None\n"
-msgstr "Nincs\n"
-
-#: ../log.c:55
+#: src/pacman/log.c:61
 #, c-format
 msgid "debug"
 msgstr "hibakeresés"
 
-#: ../log.c:58
+#: src/pacman/log.c:64
 #, c-format
 msgid "error"
 msgstr "hiba"
 
-#: ../log.c:61
+#: src/pacman/log.c:67
 #, c-format
 msgid "warning"
 msgstr "figyelmeztetés"
 
-#: ../log.c:64
-#, c-format
-msgid "flow1"
-msgstr "információ1"
-
-#: ../log.c:67
-#, c-format
-msgid "flow2"
-msgstr "információ2"
-
-#: ../log.c:70
+#: src/pacman/log.c:73
 #, c-format
 msgid "function"
 msgstr "függvény"
 
-#: ../log.c:154
+#: src/pacman/log.c:199
 msgid "Y"
 msgstr "I"
 
-#: ../log.c:154
+#: src/pacman/log.c:199
 msgid "YES"
 msgstr "IGEN"
 
-#: ../log.h:26
+#: src/pacman/log.h:26
 msgid "error: "
 msgstr "hiba: "
 
-#: ../log.h:30
+#: src/pacman/log.h:30
 msgid "warning: "
 msgstr "figyelmeztetés"
 
-#: ../package.c:46
+#: src/pacman/package.c:57
+#, fuzzy
+msgid "Explicitly installed"
+msgstr "Kézzel telepítve\n"
+
+#: src/pacman/package.c:60
+#, fuzzy
+msgid "Installed as a dependency for another package"
+msgstr "Függõségként lett telepítve egy másik csomag miatt\n"
+
+#: src/pacman/package.c:63 src/pacman/package.c:85
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: src/pacman/package.c:68 src/pacman/package.c:118
 #, c-format
 msgid "Name           : %s\n"
 msgstr "Név            : %s\n"
 
-#: ../package.c:47
+#: src/pacman/package.c:69 src/pacman/package.c:119
 #, c-format
 msgid "Version        : %s\n"
 msgstr "Verzió         : %s\n"
 
-#: ../package.c:49
+#: src/pacman/package.c:70
+#, fuzzy, c-format
+msgid "URL            : %s\n"
+msgstr "Név            : %s\n"
+
+#: src/pacman/package.c:71
+msgid "License        :"
+msgstr "Licenc         :"
+
+#: src/pacman/package.c:72 src/pacman/package.c:120
 msgid "Groups         :"
 msgstr "Csoportok      :"
 
-#: ../package.c:51
+#: src/pacman/package.c:73 src/pacman/package.c:121
+msgid "Provides       :"
+msgstr "Szolgáltatja   :"
+
+#: src/pacman/package.c:74 src/pacman/package.c:122
+msgid "Depends On     :"
+msgstr "Függ           :"
+
+#: src/pacman/package.c:75 src/pacman/package.c:123
+msgid "Removes        :"
+msgstr "Eltávolítja    :"
+
+#: src/pacman/package.c:78
+msgid "Required By    :"
+msgstr "Igényli        :"
+
+#: src/pacman/package.c:80 src/pacman/package.c:124
+msgid "Conflicts With :"
+msgstr "Ütközik        :"
+
+#: src/pacman/package.c:81
+#, fuzzy, c-format
+msgid "Installed Size : %ld K\n"
+msgstr "Telepítõ szkript:%s\n"
+
+#: src/pacman/package.c:82
 #, c-format
 msgid "Packager       : %s\n"
 msgstr "Csomagoló      : %s\n"
 
-#: ../package.c:53
-msgid "License        :"
-msgstr "Licenc         :"
-
-#: ../package.c:54
+#: src/pacman/package.c:83
 #, c-format
 msgid "Architecture   : %s\n"
 msgstr "Architektúra   : %s\n"
 
-#: ../package.c:55
-#, c-format
-msgid "Size           : %ld\n"
-msgstr "Méret          : %ld\n"
-
-#: ../package.c:58
+#: src/pacman/package.c:84
 #, c-format
 msgid "Build Date     : %s %s\n"
 msgstr "Fordítás ideje : %s %s\n"
 
-#: ../package.c:60
+#: src/pacman/package.c:85
 #, c-format
 msgid "Build Type     : %s\n"
 msgstr "Fordítás Típusa: %s\n"
 
-#: ../package.c:60
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../package.c:62
+#: src/pacman/package.c:87
 #, c-format
 msgid "Install Date   : %s %s\n"
 msgstr "Telepítés ideje: %s %s\n"
 
-#: ../package.c:64
+#: src/pacman/package.c:88
+#, fuzzy, c-format
+msgid "Install Reason : %s\n"
+msgstr "Telepítõ szkript:%s\n"
+
+#: src/pacman/package.c:90
 #, c-format
 msgid "Install Script : %s\n"
 msgstr "Telepítõ szkript:%s\n"
 
-#: ../package.c:64
+#: src/pacman/package.c:91
 msgid "Yes"
 msgstr "Igen"
 
-#: ../package.c:64
+#: src/pacman/package.c:91
 msgid "No"
 msgstr "Nem"
 
-#: ../package.c:66
-#, c-format
-msgid "Reason         : "
-msgstr "Telepítés oka  : "
-
-#: ../package.c:69
-#, c-format
-msgid "Explicitly installed\n"
-msgstr "Kézzel telepítve\n"
-
-#: ../package.c:72
-#, c-format
-msgid "Installed as a dependency for another package\n"
-msgstr "Függõségként lett telepítve egy másik csomag miatt\n"
-
-#: ../package.c:75
-#, c-format
-msgid "Unknown\n"
-msgstr "Ismeretlen\n"
-
-#: ../package.c:79
-msgid "Provides       :"
-msgstr "Szolgáltatja   :"
-
-#: ../package.c:80
-msgid "Depends On     :"
-msgstr "Függ           :"
-
-#: ../package.c:81
-msgid "Removes        :"
-msgstr "Eltávolítja    :"
-
-#: ../package.c:82
-msgid "Required By    :"
-msgstr "Igényli        :"
-
-#: ../package.c:83
-msgid "Conflicts With :"
-msgstr "Ütközik        :"
-
-#: ../package.c:85
+#: src/pacman/package.c:93 src/pacman/package.c:129
 #, c-format
 msgid "Description    : "
 msgstr "Leírás         : "
 
-#: ../package.c:110
-#, c-format
-msgid "error calculating md5sum or sha1sum for %s\n"
-msgstr "hiba a %s md5 vagy sha1 ellenõrzõ összegének számítása közben\n"
-
-#: ../package.c:115 ../package.c:117
-#, c-format
-msgid "%sMODIFIED\t%s\n"
-msgstr "%sMÓDOSÍTVA\t%s\n"
-
-#: ../package.c:115 ../package.c:117
-msgid "NOT "
-msgstr "NEM "
-
-#: ../package.c:121
-#, c-format
-msgid "MISSING\t\t%s\n"
-msgstr "HIÁNYZIK\t\t%s\n"
-
-#: ../package.c:139
-#, c-format
-msgid "Repository        : %s\n"
+#: src/pacman/package.c:117
+#, fuzzy, c-format
+msgid "Repository     : %s\n"
 msgstr "Repó              : %s\n"
 
-#: ../package.c:140
-#, c-format
-msgid "Name              : %s\n"
-msgstr "Név               : %s\n"
-
-#: ../package.c:141
-#, c-format
-msgid "Version           : %s\n"
-msgstr "Verzió            : %s\n"
-
-#: ../package.c:143
-msgid "Groups            :"
-msgstr "Csoportok         :"
-
-#: ../package.c:144
-msgid "Provides          :"
-msgstr "Szolgáltatja      :"
-
-#: ../package.c:145
-msgid "Depends On        :"
-msgstr "Függ              :"
-
-#: ../package.c:146
-msgid "Removes           :"
-msgstr "Eltávolítja       :"
-
-#: ../package.c:147
-msgid "Conflicts With    :"
-msgstr "Ütközik           :"
-
-#: ../package.c:148
-msgid "Replaces          :"
+#: src/pacman/package.c:125
+#, fuzzy
+msgid "Replaces       :"
 msgstr "Lecseréli         :"
 
-#: ../package.c:150
-#, c-format
-msgid "Size (compressed) : %ld\n"
-msgstr "Méret (tömörített): %ld\n"
-
-#: ../package.c:151
+#: src/pacman/package.c:126
 #, c-format
-msgid "Size (uncompressed):%ld\n"
-msgstr "Méret (tömörítetlen): %ld\n"
+msgid "Download Size  : %6.2f K\n"
+msgstr ""
 
-#: ../package.c:152
-#, c-format
-msgid "Description       : "
-msgstr "Leírás            : "
+#: src/pacman/package.c:127
+#, fuzzy, c-format
+msgid "Installed Size : %6.2f K\n"
+msgstr "Telepítõ szkript:%s\n"
 
-#: ../package.c:156
-#, c-format
-msgid ""
-"\n"
-"MD5 Sum           : %s"
+#: src/pacman/package.c:134
+#, fuzzy, c-format
+msgid "MD5 Sum        : %s"
 msgstr ""
 "\n"
 "MD5 Sum           : %s"
 
-#: ../package.c:160
-#, c-format
-msgid ""
-"\n"
-"SHA1 Sum          : %s"
+#: src/pacman/package.c:137
+#, fuzzy, c-format
+msgid "SHA1 Sum       : %s"
 msgstr ""
 "\n"
 "SHA1 Sum          : %s"
 
-#: ../package.c:189
+#: src/pacman/package.c:168
+#, fuzzy, c-format
+msgid "error calculating checksums for %s\n"
+msgstr "hiba a %s md5 vagy sha1 ellenõrzõ összegének számítása közben\n"
+
+#: src/pacman/package.c:181
+#, fuzzy, c-format
+msgid "MODIFIED\t%s\n"
+msgstr "%sMÓDOSÍTVA\t%s\n"
+
+#: src/pacman/package.c:183
+#, c-format
+msgid "Not Modified\t%s\n"
+msgstr ""
+
+#: src/pacman/package.c:188
+#, c-format
+msgid "MISSING\t\t%s\n"
+msgstr "HIÁNYZIK\t\t%s\n"
+
+#: src/pacman/package.c:221
 #, c-format
 msgid "No changelog available for '%s'.\n"
 msgstr "Nem áll rendelkezésre változási napló a '%s' csomaghoz.\n"
 
-#: ../pacman.c:96
+#: src/pacman/pacman.c:88
 #, c-format
 msgid "usage:  %s {-h --help}\n"
 msgstr "használat: %s {-h --help}\n"
 
-#: ../pacman.c:97
+#: src/pacman/pacman.c:89
 #, c-format
 msgid "        %s {-V --version}\n"
 msgstr "           %s {-V --version}\n"
 
-#: ../pacman.c:98
+#: src/pacman/pacman.c:90
 #, c-format
 msgid "        %s {-A --add}     [options] <file>\n"
 msgstr "           %s {-A --add}     [opciók] <fájl>\n"
 
-#: ../pacman.c:99
+#: src/pacman/pacman.c:91
 #, c-format
 msgid "        %s {-R --remove}  [options] <package>\n"
 msgstr "           %s {-R --remove}  [opciók] <csomag>\n"
 
-#: ../pacman.c:100
+#: src/pacman/pacman.c:92
 #, c-format
 msgid "        %s {-U --upgrade} [options] <file>\n"
 msgstr "           %s {-U --upgrade} [opciók] <fájl>\n"
 
-#: ../pacman.c:101
+#: src/pacman/pacman.c:93
 #, c-format
 msgid "        %s {-F --freshen} [options] <file>\n"
 msgstr "           %s {-F --freshen} [opciók] <fájl>\n"
 
-#: ../pacman.c:102
+#: src/pacman/pacman.c:94
 #, c-format
 msgid "        %s {-Q --query}   [options] [package]\n"
 msgstr "           %s {-Q --query}   [opciók] <csomag>\n"
 
-#: ../pacman.c:103
+#: src/pacman/pacman.c:95
 #, c-format
 msgid "        %s {-S --sync}    [options] [package]\n"
 msgstr "           %s {-S --sync}    [opciók] [csomag]\n"
 
-#: ../pacman.c:104
+#: src/pacman/pacman.c:96
 #, c-format
 msgid ""
 "\n"
@@ -423,53 +373,54 @@ msgstr ""
 "\n"
 "használja a '%s --help'-et más opciókkal további szintaxishoz\n"
 
-#: ../pacman.c:107
+#: src/pacman/pacman.c:99
 #, c-format
 msgid "usage:  %s {-A --add} [options] <file>\n"
 msgstr "használat:  %s {-A --add} [opciók] <fájl>\n"
 
-#: ../pacman.c:108 ../pacman.c:113 ../pacman.c:125 ../pacman.c:130
-#: ../pacman.c:144
+#: src/pacman/pacman.c:100 src/pacman/pacman.c:105 src/pacman/pacman.c:117
+#: src/pacman/pacman.c:122 src/pacman/pacman.c:136
 #, c-format
 msgid "options:\n"
 msgstr "opciók:\n"
 
-#: ../pacman.c:109 ../pacman.c:115 ../pacman.c:126 ../pacman.c:146
+#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
+#: src/pacman/pacman.c:138
 #, c-format
 msgid "  -d, --nodeps        skip dependency checks\n"
 msgstr "  -d, --nodeps        függõségi ellenõrzések kihagyása\n"
 
-#: ../pacman.c:110 ../pacman.c:127 ../pacman.c:148
+#: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140
 #, c-format
 msgid "  -f, --force         force install, overwrite conflicting files\n"
 msgstr ""
 "  -f, --force         a telepítés eröltetése, ütközõ fájlok felülírása\n"
 
-#: ../pacman.c:112
+#: src/pacman/pacman.c:104
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
 msgstr "usage:  %s {-R --remove} [opciók] <csomag>\n"
 
-#: ../pacman.c:114
+#: src/pacman/pacman.c:106
 #, c-format
 msgid ""
 "  -c, --cascade       remove packages and all packages that depend on them\n"
 msgstr ""
 "  -c, --cascade       a csomagok és az õket igénylõ csomagok eltávolítása\n"
 
-#: ../pacman.c:116
+#: src/pacman/pacman.c:108
 #, c-format
 msgid "  -k, --dbonly        only remove database entry, do not remove files\n"
 msgstr ""
 "  -k, --dbonly        csak az adatbázis-bejegyzés eltávolítása, magukat a "
 "fájlokat ne\n"
 
-#: ../pacman.c:117
+#: src/pacman/pacman.c:109
 #, c-format
 msgid "  -n, --nosave        remove configuration files as well\n"
 msgstr "  -n, --nosave        a beállítási fájlokat is törölje\n"
 
-#: ../pacman.c:118
+#: src/pacman/pacman.c:110
 #, c-format
 msgid ""
 "  -s, --recursive     remove dependencies also (that won't break packages)\n"
@@ -477,55 +428,56 @@ msgstr ""
 "  -s, --recursive     a függõségeket is távolítsa el (nem fogja a csomagokat "
 "tönkretenni)\n"
 
-#: ../pacman.c:121
+#: src/pacman/pacman.c:113
 #, c-format
 msgid "usage:  %s {-F --freshen} [options] <file>\n"
 msgstr "használat:  %s {-F --freshen} [opciók] <fájl>\n"
 
-#: ../pacman.c:123
+#: src/pacman/pacman.c:115
 #, c-format
 msgid "usage:  %s {-U --upgrade} [options] <file>\n"
 msgstr "használat:  %s {-U --upgrade} [opciók] <fájl>\n"
 
-#: ../pacman.c:129
+#: src/pacman/pacman.c:121
 #, c-format
 msgid "usage:  %s {-Q --query} [options] [package]\n"
 msgstr "használat: %s {-Q --query} [opciók] [csomag]\n"
 
-#: ../pacman.c:131
+#: src/pacman/pacman.c:123
 #, c-format
 msgid "  -c, --changelog     view the changelog of a package\n"
 msgstr "  -c, --changelog     a változások naplójának megtekintése\n"
 
-#: ../pacman.c:132
-#, c-format
+#: src/pacman/pacman.c:124
+#, fuzzy, c-format
 msgid ""
-"  -e, --orphans       list all packages that were installed as a dependency\n"
+"  -e, --orphans       list all packages installed as dependencies but no "
+"longer\n"
 msgstr ""
 "  -e, --orphans       az összes olyan csomag listázása amely függõségként "
 "került telepítésre\n"
 
-#: ../pacman.c:133
-#, c-format
-msgid "                      and are not required by any other packages\n"
+#: src/pacman/pacman.c:125
+#, fuzzy, c-format
+msgid "                      required by any package\n"
 msgstr "                      és már nem igénylt más csomagok által\n"
 
-#: ../pacman.c:134 ../pacman.c:149
+#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
 #, c-format
 msgid "  -g, --groups        view all members of a package group\n"
 msgstr "  -g, --groups        egy csoport összes tagjának megtekintése\n"
 
-#: ../pacman.c:135
+#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
 #, c-format
 msgid "  -i, --info          view package information\n"
 msgstr "  -i, --info          csomaginformációk megtekintése\n"
 
-#: ../pacman.c:136
+#: src/pacman/pacman.c:128
 #, c-format
 msgid "  -l, --list          list the contents of the queried package\n"
 msgstr "  -l, --list          a lekérdezett csomag tartalmának listázása\n"
 
-#: ../pacman.c:137
+#: src/pacman/pacman.c:129
 #, c-format
 msgid ""
 "  -m, --foreign       list all packages that were not found in the sync db"
@@ -534,37 +486,37 @@ msgstr ""
 "  -m, --foreign       az összes olyan csomag listázása amely a távoli "
 "adatbázis(ok)bannem volt megtalálható\n"
 
-#: ../pacman.c:138
+#: src/pacman/pacman.c:130
 #, c-format
 msgid "  -o, --owns <file>   query the package that owns <file>\n"
 msgstr "  -o, --owns <fájl>   a <fájl>-t tartalmazó csomag lekérdezése\n"
 
-#: ../pacman.c:139
-#, c-format
+#: src/pacman/pacman.c:131
+#, fuzzy, c-format
 msgid ""
-"  -p, --file          pacman will query the package file [package] instead "
-"of\n"
+"  -p, --file          query the package file [package] instead of the "
+"database\n"
 msgstr ""
 "  -p, --file          a pacman a [csomag] csomagfájlt kérdezze le ahelyett,\n"
 
-#: ../pacman.c:140
-#, c-format
-msgid "                      looking in the database\n"
-msgstr "                      hogy az adatbázisban keresne\n"
-
-#: ../pacman.c:141
+#: src/pacman/pacman.c:132
 #, c-format
 msgid ""
 "  -s, --search        search locally-installed packages for matching "
 "strings\n"
 msgstr "  -s, --search        keresés a helyileg telepített csomagok között\n"
 
-#: ../pacman.c:143
+#: src/pacman/pacman.c:133
+#, fuzzy, c-format
+msgid "  -u, --upgrades      list all packages that can be upgraded\n"
+msgstr "  -u, --sysupgrade    az összes elavult csomag frissítése\n"
+
+#: src/pacman/pacman.c:135
 #, c-format
 msgid "usage:  %s {-S --sync} [options] [package]\n"
 msgstr "használat:  %s {-S --sync} [opciók] [csomag]\n"
 
-#: ../pacman.c:145
+#: src/pacman/pacman.c:137
 #, c-format
 msgid ""
 "  -c, --clean         remove old packages from cache directory (use -cc for "
@@ -573,12 +525,12 @@ msgstr ""
 "  -c, --clean         a régi csomagok eltávolítása a gyorsítótár "
 "könyvtárából (használja a '-cc'-t az összeshez)\n"
 
-#: ../pacman.c:147
+#: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --dependsonly   install dependencies only\n"
 msgstr "  -e, --dependsonly   csak a függõségek telepítése\n"
 
-#: ../pacman.c:150
+#: src/pacman/pacman.c:143
 #, c-format
 msgid ""
 "  -p, --print-uris    print out URIs for given packages and their "
@@ -586,29 +538,29 @@ msgid ""
 msgstr ""
 "  -p, --print-uris    kinyomtatja az adott csomagok es függõségeik URI-it\n"
 
-#: ../pacman.c:151
+#: src/pacman/pacman.c:144
 #, c-format
 msgid "  -s, --search        search remote repositories for matching strings\n"
 msgstr "  -s, --search        keresés a távoli csomagadatbázisban\n"
 
-#: ../pacman.c:152
+#: src/pacman/pacman.c:145
 #, c-format
 msgid "  -u, --sysupgrade    upgrade all packages that are out of date\n"
 msgstr "  -u, --sysupgrade    az összes elavult csomag frissítése\n"
 
-#: ../pacman.c:153
+#: src/pacman/pacman.c:146
 #, c-format
 msgid ""
 "  -w, --downloadonly  download packages but do not install/upgrade anything\n"
 msgstr "  -w, --downloadonly  csak letöltés, de semmit nem telepít/frissít\n"
 
-#: ../pacman.c:154
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
 "  -y, --refresh       download fresh package databases from the server\n"
 msgstr "  -y, --refresh       friss csomagadatbázis letöltése a szerverrõl\n"
 
-#: ../pacman.c:155
+#: src/pacman/pacman.c:148
 #, c-format
 msgid ""
 "      --ignore <pkg>  ignore a package upgrade (can be used more than once)\n"
@@ -616,244 +568,189 @@ msgstr ""
 "      --ignore <csomag> egy csomag frissítésének figyelmen kívül hagyása "
 "(többször is használható)\n"
 
-#: ../pacman.c:157
+#: src/pacman/pacman.c:150
 #, c-format
 msgid "      --config <path> set an alternate configuration file\n"
 msgstr "      --config <útvonal> alternatív konfigurációs fájl használata\n"
 
-#: ../pacman.c:158
+#: src/pacman/pacman.c:151
 #, c-format
 msgid "      --noconfirm     do not ask for anything confirmation\n"
 msgstr "      --noconfirm     ne kérjen soha megerõsítést\n"
 
-#: ../pacman.c:159
+#: src/pacman/pacman.c:152
 #, c-format
 msgid "      --ask  <number> pre-specify answers for questions (see manpage)\n"
 msgstr ""
 "      --ask  <szám> elõre megadja a válaszokat kérdésekre (ld. man oldal)\n"
 
-#: ../pacman.c:160
+#: src/pacman/pacman.c:153
 #, c-format
 msgid ""
 "      --noprogressbar do not show a progress bar when downloading files\n"
 msgstr ""
 "      --noprogressbar ne mutasson folyamatsávot a fájlok letöltése közben\n"
 
-#: ../pacman.c:161
+#: src/pacman/pacman.c:154
 #, c-format
 msgid ""
 "      --noscriptlet   do not execute the install scriptlet if there is any\n"
 msgstr ""
 "      --noscriptlet   ne futtassa le a telepítési szkriptet ha van olyan\n"
 
-#: ../pacman.c:162
+#: src/pacman/pacman.c:155
 #, c-format
 msgid "  -v, --verbose       be verbose\n"
 msgstr "  -v, --verbose       legyen bõbeszédû\n"
 
-#: ../pacman.c:163
+#: src/pacman/pacman.c:156
 #, c-format
 msgid "  -r, --root <path>   set an alternate installation root\n"
 msgstr ""
 "  -r, --root <útvonal>   alternatív telepítési gyökérkönyvtár beállítása\n"
 
-#: ../pacman.c:164
+#: src/pacman/pacman.c:157
 #, c-format
 msgid "  -b, --dbpath <path> set an alternate database location\n"
 msgstr "  -b, --dbpath <útvonal> alternatív adatbázis hely beállítása\n"
 
-#: ../pacman.c:177
+#: src/pacman/pacman.c:170
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 "                       Ezt a programot bárki a General Public License-ben\n"
 
-#: ../pacman.c:178
+#: src/pacman/pacman.c:171
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr "                       foglaltak alapján szabadon terjesztheti\n"
 
-#: ../pacman.c:363
-msgid "bad root path"
-msgstr "rossz gyökérkönyvtár-útvonal"
+#: src/pacman/pacman.c:298
+#, fuzzy, c-format
+msgid "error: '%s' is not a valid debug level"
+msgstr "%s: nem érvényes reguláris kifejezés.\n"
 
-#: ../pacman.c:390
+#: src/pacman/pacman.c:334
+#, c-format
+msgid "error: '%s' is not a valid db path\n"
+msgstr ""
+
+#: src/pacman/pacman.c:364
+#, c-format
+msgid "error: '%s' is not a valid root path\n"
+msgstr ""
+
+#: src/pacman/pacman.c:391
 msgid "only one operation may be used at a time\n"
 msgstr "csak egy mûvelet hajtható végre egyszerre\n"
 
-#: ../pacman.c:486
-msgid "you cannot perform this operation unless you are root.\n"
-msgstr "nem hajtható végre ez a mûvelet hacsak nem rendszergazda.\n"
-
-#: ../pacman.c:510
+#: src/pacman/pacman.c:454
 #, c-format
 msgid "failed to initilize alpm library (%s)\n"
 msgstr "nem sikerült inicializálni az alpm könyvtárat (%s)\n"
 
-#: ../pacman.c:518
+#: src/pacman/pacman.c:487
+msgid "you cannot perform this operation unless you are root.\n"
+msgstr "nem hajtható végre ez a mûvelet hacsak nem rendszergazda.\n"
+
+#: src/pacman/pacman.c:503
 #, c-format
 msgid "failed to parse config (%s)\n"
 msgstr "nem sikerült értelmezni a beállítási fájlt (%s)\n"
 
-#: ../pacman.c:524
-#, c-format
-msgid "failed to set option LOGMASK (%s)\n"
-msgstr "nem sikerült beállítani a LOGMASK opciót (%s)\n"
-
-#: ../pacman.c:528
-#, c-format
-msgid "failed to set option LOGCB (%s)\n"
-msgstr "nem sikerült beállítani a LOGCB opciót (%s)\n"
-
-#: ../pacman.c:532
-#, c-format
-msgid "failed to set option DLCB (%s)\n"
-msgstr "nem sikerült beállítani a DLCB opciót (%s)\n"
-
-#: ../pacman.c:536
-#, c-format
-msgid "failed to set option DLFNM (%s)\n"
-msgstr "nem sikerült beállítani a DLFNM opciót (%s)\n"
-
-#: ../pacman.c:540
-#, c-format
-msgid "failed to set option DLOFFSET (%s)\n"
-msgstr "nem sikerült beállítani a DLOFFSET opciót (%s)\n"
-
-#: ../pacman.c:544
-#, c-format
-msgid "failed to set option DLT0 (%s)\n"
-msgstr "nem sikerült beállítani a DBT0 opciót (%s)\n"
-
-#: ../pacman.c:548
-#, c-format
-msgid "failed to set option DLT (%s)\n"
-msgstr "nem sikerült beállítani a DLT opciót (%s)\n"
-
-#: ../pacman.c:552
-#, c-format
-msgid "failed to set option DLRATE (%s)\n"
-msgstr "nem sikerült beállítani a DLRATE opciót (%s)\n"
-
-#: ../pacman.c:556
-#, c-format
-msgid "failed to set option DLXFERED1 (%s)\n"
-msgstr "nem sikerült beállítani a DLXFERED1 opciót (%s)\n"
-
-#: ../pacman.c:560
-#, c-format
-msgid "failed to set option DLETA_H (%s)\n"
-msgstr "nem sikerült beállítani a DLETA_H opciót (%s)\n"
-
-#: ../pacman.c:564
-#, c-format
-msgid "failed to set option DLETA_M (%s)\n"
-msgstr "nem sikerült beállítani a DBETA_M opciót (%s)\n"
-
-#: ../pacman.c:568
-#, c-format
-msgid "failed to set option DLETA_S (%s)\n"
-msgstr "nem sikerült beállítani a DLETA_S opciót (%s)\n"
-
-#: ../pacman.c:578
-#, c-format
-msgid "failed to set option IGNOREPKG (%s)\n"
-msgstr "nem sikerült beállítani az IGNOREPKG opciót (%s)\n"
-
-#: ../pacman.c:586
+#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
 msgid "Targets:"
 msgstr "Célok:"
 
-#: ../pacman.c:592
+#: src/pacman/pacman.c:519
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr "nem sikerült regisztrálni a 'local' adatbázist (%s)\n"
 
-#: ../pacman.c:599
+#: src/pacman/pacman.c:526
 msgid "no targets specified (use -h for help)\n"
 msgstr "nincs megadva egyetlen cél se (használja a '-h'-t segítségért)\n"
 
-#: ../pacman.c:612
+#: src/pacman/pacman.c:539
 msgid "no operation specified (use -h for help)\n"
 msgstr "nincs megadva egyetlen mûvelet se (használja a '-h'-t segítségért)\n"
 
-#: ../query.c:56
+#: src/pacman/query.c:53
 msgid "no file was specified for --owns\n"
 msgstr "nincs megadva fájl a --owns számára\n"
 
-#: ../query.c:61
-#, c-format
-msgid "%s is not a file.\n"
-msgstr "a %s nem egy fájl.\n"
-
-#: ../query.c:78
+#: src/pacman/query.c:71
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "a %s fájlt a %s %s tartalmazza\n"
 
-#: ../query.c:86
+#: src/pacman/query.c:78
 #, c-format
 msgid "No package owns %s\n"
 msgstr "Egyik csomag sem tartalmazza a következõt: %s\n"
 
-#: ../query.c:111 ../sync.c:340
+#: src/pacman/query.c:122 src/pacman/sync.c:413
 msgid "no usable package repositories configured.\n"
 msgstr "egyetlen használható csomag repó sincs beállítva.\n"
 
-#: ../query.c:150
+#: src/pacman/query.c:128
+#, fuzzy
+msgid "Checking for package upgrades..."
+msgstr "a csomagok integritásának ellenõrzése... "
+
+#: src/pacman/query.c:135
+msgid "no upgrades found"
+msgstr ""
+
+#: src/pacman/query.c:173
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr "a \"%s\" csoport nem található\n"
 
-#: ../query.c:160
+#: src/pacman/query.c:184
 msgid "no package file was specified for --file\n"
 msgstr "nincs megadva fájl a --file számára\n"
 
-#: ../query.c:164
+#: src/pacman/query.c:188
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr "nem sikerült betölteni a '%s' csomagot (%s)\n"
 
-#. something weird happened
-#: ../query.c:202 ../query.c:244
+#: src/pacman/query.c:226 src/pacman/query.c:263
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr "a \"%s\" csomag nem található\n"
 
-#: ../remove.c:64 ../sync.c:456
+#: src/pacman/remove.c:58 src/pacman/sync.c:528
 #, c-format
 msgid ":: group %s:\n"
 msgstr ":: %s csoport:\n"
 
-#: ../remove.c:66
+#: src/pacman/remove.c:60
 msgid "    Remove whole content? [Y/n] "
 msgstr "    Eltávolítja a teljes tartalmat? [I/n] "
 
-#: ../remove.c:68
+#: src/pacman/remove.c:64
 #, c-format
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ":: Eltávolítja a %s-t a %s csoportból? [I/n] "
 
-#: ../remove.c:81 ../sync.c:376 ../sync.c:415
+#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
 #, c-format
 msgid "failed to init transaction (%s)\n"
 msgstr "nem sikerült inicializálni a tranzakciót (%s)\n"
 
-#: ../remove.c:107
+#: src/pacman/remove.c:89
 #, c-format
-msgid "  %s: is required by %s\n"
-msgstr "  %s: igényli a %s\n"
+msgid "failed to add target '%s' (%s)\n"
+msgstr "nem sikerült a '%s' célt hozzáadni (%s)\n"
 
-#: ../remove.c:129
-msgid ""
-"\n"
-"Targets:"
-msgstr ""
-"\n"
-"Célok:"
+#: src/pacman/remove.c:103
+#, fuzzy, c-format
+msgid ":: %s is required by %s\n"
+msgstr "  %s: igényli a %s\n"
 
-#. get confirmation
-#: ../remove.c:132
+#: src/pacman/remove.c:128
 msgid ""
 "\n"
 "Do you want to remove these packages? [Y/n] "
@@ -861,83 +758,82 @@ msgstr ""
 "\n"
 "Kívánja eltávolítani ezeket a csomagokat? [I/n] "
 
-#: ../sync.c:73
+#: src/pacman/sync.c:113
 msgid "Do you want to remove old packages from cache? [Y/n] "
 msgstr "El kívánja távolítani a régi csomagokat a gyorsítótárból? [I/n] "
 
-#: ../sync.c:75
+#: src/pacman/sync.c:115
 msgid "removing old packages from cache... "
 msgstr "a régi csomagok eltávolítása a gyorsítótárból... "
 
-#: ../sync.c:78
+#: src/pacman/sync.c:118
 msgid "could not access cache directory\n"
 msgstr "nem sikerült elérni a gyorsítótár könyvtárát\n"
 
-#. full cleanup
-#: ../sync.c:138
+#: src/pacman/sync.c:179
 msgid "Do you want to remove all packages from cache? [Y/n] "
 msgstr "El kíván távolítani minden csomagot a gyorsítótárból? [I/n] "
 
-#: ../sync.c:140
+#: src/pacman/sync.c:181
 msgid "removing all packages from cache... "
 msgstr "az összes csomag eltávolítása a gyorsítótárból... "
 
-#: ../sync.c:143
+#: src/pacman/sync.c:184
 msgid "could not remove cache directory\n"
 msgstr "nem sikerült törölni a gyorsítótár könyvtárát\n"
 
-#: ../sync.c:148
+#: src/pacman/sync.c:189
 msgid "could not create new cache directory\n"
 msgstr "nem sikerült létrehozni az új gyorsítótár könyvtárát\n"
 
-#: ../sync.c:153 ../trans.c:72 ../trans.c:86 ../trans.c:100 ../trans.c:116
-#: ../trans.c:128
-msgid "done.\n"
-msgstr "kész.\n"
-
-#: ../sync.c:168
-#, c-format
-msgid "failed to synchronize %s\n"
+#: src/pacman/sync.c:216
+#, fuzzy, c-format
+msgid "failed to synchronize %s: %s\n"
 msgstr "nem sikerült szinkronizálni a következõt: %s\n"
 
-#: ../sync.c:170
+#: src/pacman/sync.c:218
 #, c-format
 msgid "failed to update %s (%s)\n"
 msgstr "nem sikerült frissíteni a következõt: %s (%s)\n"
 
-#: ../sync.c:174
+#: src/pacman/sync.c:221
 #, c-format
 msgid " %s is up to date\n"
 msgstr " a %s naprakész\n"
 
-#: ../sync.c:265
+#: src/pacman/sync.c:341
 #, c-format
 msgid "package \"%s\" was not found.\n"
 msgstr "a \"%s\" csomag nem található.\n"
 
-#: ../sync.c:303
+#: src/pacman/sync.c:378
 #, c-format
 msgid "repository \"%s\" was not found.\n"
 msgstr "a \"%s\" repó nem található.\n"
 
-#. grab a fresh package list
-#: ../sync.c:350
+#: src/pacman/sync.c:450
 msgid ":: Synchronizing package databases...\n"
 msgstr ":: A csomagadatbázisok szinkronizálása...\n"
 
-#: ../sync.c:351
+#: src/pacman/sync.c:451
 msgid "synchronizing package lists"
 msgstr "a csomaglisták szinkronizálása"
 
-#: ../sync.c:385
-msgid ":: Starting local database upgrade...\n"
-msgstr ":: A helyi adatbázis frissítésének indítása...\n"
+#: src/pacman/sync.c:453
+#, fuzzy
+msgid "failed to synchronize any databases"
+msgstr "nem sikerült szinkronizálni a következõt: %s\n"
 
-#: ../sync.c:386
+#: src/pacman/sync.c:459
+#, fuzzy
+msgid ":: Starting full system upgrade...\n"
+msgstr "teljes rendszerfrissítés indítása"
+
+#: src/pacman/sync.c:460
 msgid "starting full system upgrade"
 msgstr "teljes rendszerfrissítés indítása"
 
-#: ../sync.c:404
+#: src/pacman/sync.c:478
 msgid ""
 "\n"
 ":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -945,81 +841,57 @@ msgstr ""
 "\n"
 ":: a pacman egy újabb verzióját észlelte a \"pacman\" csomagnak.\n"
 
-#: ../sync.c:405
+#: src/pacman/sync.c:479
 msgid ":: It is recommended that you allow pacman to upgrade itself\n"
 msgstr ":: Ajánlott, hogy engedje, hogy a pacman elõbb saját magát\n"
 
-#: ../sync.c:406
+#: src/pacman/sync.c:480
 msgid ":: first, then you can re-run the operation with the newer version.\n"
 msgstr ":: frissítse, majd újra futtathatja a mûveletet az újabb verzióval.\n"
 
-#: ../sync.c:408
+#: src/pacman/sync.c:482
 msgid ":: Upgrade pacman first? [Y/n] "
 msgstr ":: Elõször csak a pacman frissítése? [I/n] "
 
-#: ../sync.c:423 ../sync.c:444
+#: src/pacman/sync.c:497
+#, fuzzy, c-format
+msgid "pacman: %s\n"
+msgstr "Egyik csomag sem tartalmazza a következõt: %s\n"
+
+#: src/pacman/sync.c:517
 #, c-format
-msgid "could not add target '%s': %s\n"
-msgstr "nem sikerült hozzáadni a '%s' célt: %s\n"
+msgid "'%s': %s\n"
+msgstr ""
 
-#: ../sync.c:462
+#: src/pacman/sync.c:532
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: A teljes tartalom telepítése? [I/n] "
 
-#: ../sync.c:469
+#: src/pacman/sync.c:539
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ":: Telepíti a %s-t a %s csoportból? [I/n] "
 
-#: ../sync.c:492
-#, c-format
-msgid "could not add target '%s': not found in sync db\n"
+#: src/pacman/sync.c:563
+#, fuzzy, c-format
+msgid "'%s': not found in sync db\n"
 msgstr ""
 "nem sikerült hozzáadni a '%s' célt: nem található a távoli adatbázisban\n"
 
-#: ../sync.c:511
+#: src/pacman/sync.c:583
 msgid "requires"
 msgstr "igényli a következõt:"
 
-#: ../sync.c:511
+#: src/pacman/sync.c:583
 msgid "is required by"
 msgstr "igényli a"
 
-#: ../sync.c:588
-msgid ""
-"\n"
-"Remove:  "
-msgstr ""
-"\n"
-"Eltávolítás:  "
-
-#: ../sync.c:604
-msgid ""
-"\n"
-"Targets: "
-msgstr ""
-"\n"
-"Célok:   "
-
-#: ../sync.c:607
-#, c-format
-msgid ""
-"\n"
-"Total Package Size:   %.1f MB\n"
-msgstr ""
-"\n"
-"Teljes csomagméret:   %.1f MB\n"
-
-#: ../sync.c:608
-#, c-format
-msgid ""
-"\n"
-"Total Uncompressed Package Size:   %.1f MB\n"
-msgstr ""
-"\n"
-"Teljes tömörítetlen csomagméret:   %.1f MB\n"
+#: src/pacman/sync.c:625
+#, fuzzy
+msgid "local database is up to date\n"
+msgstr " a %s naprakész\n"
 
-#: ../sync.c:614
+#: src/pacman/sync.c:634
 msgid ""
 "\n"
 "Beginning download...\n"
@@ -1027,11 +899,11 @@ msgstr ""
 "\n"
 "A letöltés megkezdése...\n"
 
-#: ../sync.c:618
+#: src/pacman/sync.c:638
 msgid "Proceed with download? [Y/n] "
 msgstr "Kezdõdhet a letöltés? [I/n] "
 
-#: ../sync.c:626
+#: src/pacman/sync.c:646
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
@@ -1039,138 +911,306 @@ msgstr ""
 "\n"
 "A frissítési folyamat megkezdése...\n"
 
-#: ../sync.c:630
-msgid "Proceed with upgrade? [Y/n] "
-msgstr "Kezdõdhet a frissítés? [I/n] "
+#: src/pacman/sync.c:650
+#, fuzzy
+msgid "Proceed with installation? [Y/n] "
+msgstr "Kezdõdhet a letöltés? [I/n] "
 
-#: ../trans.c:57
+#: src/pacman/trans.c:57
+msgid "] 100%    LOCAL "
+msgstr "] 100%    HELYI "
+
+#: src/pacman/trans.c:68
 msgid "checking dependencies... "
 msgstr "függõségek vizsgálata... "
 
-#: ../trans.c:60
+#: src/pacman/trans.c:72
 msgid "checking for file conflicts... "
 msgstr "fájlütközések vizsgálata... "
 
-#: ../trans.c:63
+#: src/pacman/trans.c:76
+#, fuzzy
+msgid "cleaning up... "
+msgstr "%s eltávolítása... "
+
+#: src/pacman/trans.c:79
 msgid "resolving dependencies... "
 msgstr "függõségek feloldása... "
 
-#: ../trans.c:66
+#: src/pacman/trans.c:82
 msgid "looking for inter-conflicts... "
 msgstr "belsõ ütközések keresése... "
 
-#: ../trans.c:81
+#: src/pacman/trans.c:102
 #, c-format
 msgid "installing %s... "
 msgstr "%s telepítése... "
 
-#: ../trans.c:88
+#: src/pacman/trans.c:109
 #, c-format
 msgid "installed %s (%s)"
 msgstr "%s telepítve (%s)"
 
-#: ../trans.c:95
+#: src/pacman/trans.c:116
 #, c-format
 msgid "removing %s... "
 msgstr "%s eltávolítása... "
 
-#: ../trans.c:104
+#: src/pacman/trans.c:123
 #, c-format
 msgid "removed %s (%s)"
 msgstr "%s eltávolítva (%s)"
 
-#: ../trans.c:111
+#: src/pacman/trans.c:130
 #, c-format
 msgid "upgrading %s... "
 msgstr "%s frissítése... "
 
-#: ../trans.c:118
+#: src/pacman/trans.c:137
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr "%s frissítve (%s -> %s)"
 
-#: ../trans.c:125
+#: src/pacman/trans.c:144
 msgid "checking package integrity... "
 msgstr "a csomagok integritásának ellenõrzése... "
 
-#: ../trans.c:139
+#: src/pacman/trans.c:158
 msgid " done.\n"
 msgstr " kész.\n"
 
-#: ../trans.c:141
+#: src/pacman/trans.c:160
 msgid " failed.\n"
 msgstr " sikertelen.\n"
 
-#: ../trans.c:148
-#, c-format
-msgid ""
-"\n"
-":: Retrieving packages from %s...\n"
+#: src/pacman/trans.c:167
+#, fuzzy, c-format
+msgid ":: Retrieving packages from %s...\n"
 msgstr ""
 "\n"
 ":: Csomagok letöltése a %s-bõl...\n"
 
-#: ../trans.c:158
-msgid "] 100%    LOCAL "
-msgstr "] 100%    HELYI "
-
-#: ../trans.c:176
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ""
 ":: a %s igényli a %s-t, de az az IgnorePkg része. Mégis telepíti? [I/n] "
 
-#: ../trans.c:190
-#, c-format
-msgid ":: %s is designated as a HoldPkg.  Remove anyway? [Y/n] "
+#: src/pacman/trans.c:204
+#, fuzzy, c-format
+msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ":: a %s HoldPkgnak lett jelölve. Biztosan eltávolítja? [I/n] "
 
-#: ../trans.c:203
+#: src/pacman/trans.c:217
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ":: Lecseréli a %s-t erre: %s/%s? [I/n] "
 
-#: ../trans.c:218
+#: src/pacman/trans.c:232
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ":: a %s ütközik a következõvel: %s. Eltávolítja a %s-t? [I/n] "
 
-#: ../trans.c:234
+#: src/pacman/trans.c:248
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: a helyi verzió újabb. Mégis frissíti? [I/n] "
 
-#: ../trans.c:252
+#: src/pacman/trans.c:266
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ":: %s-%s: a helyi verzió naprakész. Mégis frissíti? [I/n] "
 
-#: ../trans.c:270
+#: src/pacman/trans.c:284
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ":: A %s sérült. Kívánja törölni? [I/n] "
 
-#: ../trans.c:286
+#: src/pacman/trans.c:333
 msgid "installing"
 msgstr "telepítés:"
 
-#: ../trans.c:287
+#: src/pacman/trans.c:336
 msgid "upgrading"
 msgstr "frissítés:"
 
-#: ../trans.c:288
+#: src/pacman/trans.c:339
 msgid "removing"
 msgstr "eltávolíás:"
 
-#: ../util.c:178
-#, c-format
-msgid "failed to allocated %d bytes\n"
-msgstr "nem sikerült allokálni %d bájtot\n"
+#: src/pacman/trans.c:342
+#, fuzzy
+msgid "checking for file conflicts"
+msgstr "fájlütközések vizsgálata... "
 
-#: ../util.c:232
+#: src/pacman/util.c:258
 #, c-format
-msgid "%s is not a valid regular expression.\n"
-msgstr "%s: nem érvényes reguláris kifejezés.\n"
+msgid "None\n"
+msgstr "Nincs\n"
+
+#: src/pacman/util.c:303
+#, fuzzy
+msgid "Remove:"
+msgstr ""
+"\n"
+"Eltávolítás:  "
+
+#: src/pacman/util.c:311
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Total Removed Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Teljes csomagméret:   %.1f MB\n"
+
+#: src/pacman/util.c:322
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Total Package Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Teljes csomagméret:   %.1f MB\n"
+
+#: src/pacman/util.c:329
+#, fuzzy, c-format
+msgid "Total Installed Size:   %.2f MB\n"
+msgstr ""
+"\n"
+"Teljes csomagméret:   %.1f MB\n"
+
+#~ msgid "done."
+#~ msgstr "kész."
+
+#~ msgid "flow1"
+#~ msgstr "információ1"
+
+#~ msgid "flow2"
+#~ msgstr "információ2"
+
+#~ msgid "Size           : %ld\n"
+#~ msgstr "Méret          : %ld\n"
+
+#~ msgid "Reason         : "
+#~ msgstr "Telepítés oka  : "
+
+#~ msgid "Unknown\n"
+#~ msgstr "Ismeretlen\n"
+
+#~ msgid "NOT "
+#~ msgstr "NEM "
+
+#~ msgid "Name              : %s\n"
+#~ msgstr "Név               : %s\n"
+
+#~ msgid "Version           : %s\n"
+#~ msgstr "Verzió            : %s\n"
+
+#~ msgid "Groups            :"
+#~ msgstr "Csoportok         :"
+
+#~ msgid "Provides          :"
+#~ msgstr "Szolgáltatja      :"
+
+#~ msgid "Depends On        :"
+#~ msgstr "Függ              :"
+
+#~ msgid "Removes           :"
+#~ msgstr "Eltávolítja       :"
+
+#~ msgid "Conflicts With    :"
+#~ msgstr "Ütközik           :"
+
+#~ msgid "Size (compressed) : %ld\n"
+#~ msgstr "Méret (tömörített): %ld\n"
+
+#~ msgid "Size (uncompressed):%ld\n"
+#~ msgstr "Méret (tömörítetlen): %ld\n"
+
+#~ msgid "Description       : "
+#~ msgstr "Leírás            : "
+
+#~ msgid "                      looking in the database\n"
+#~ msgstr "                      hogy az adatbázisban keresne\n"
+
+#~ msgid "bad root path"
+#~ msgstr "rossz gyökérkönyvtár-útvonal"
+
+#~ msgid "failed to set option LOGMASK (%s)\n"
+#~ msgstr "nem sikerült beállítani a LOGMASK opciót (%s)\n"
+
+#~ msgid "failed to set option LOGCB (%s)\n"
+#~ msgstr "nem sikerült beállítani a LOGCB opciót (%s)\n"
+
+#~ msgid "failed to set option DLCB (%s)\n"
+#~ msgstr "nem sikerült beállítani a DLCB opciót (%s)\n"
+
+#~ msgid "failed to set option DLFNM (%s)\n"
+#~ msgstr "nem sikerült beállítani a DLFNM opciót (%s)\n"
+
+#~ msgid "failed to set option DLOFFSET (%s)\n"
+#~ msgstr "nem sikerült beállítani a DLOFFSET opciót (%s)\n"
+
+#~ msgid "failed to set option DLT0 (%s)\n"
+#~ msgstr "nem sikerült beállítani a DBT0 opciót (%s)\n"
+
+#~ msgid "failed to set option DLT (%s)\n"
+#~ msgstr "nem sikerült beállítani a DLT opciót (%s)\n"
+
+#~ msgid "failed to set option DLRATE (%s)\n"
+#~ msgstr "nem sikerült beállítani a DLRATE opciót (%s)\n"
+
+#~ msgid "failed to set option DLXFERED1 (%s)\n"
+#~ msgstr "nem sikerült beállítani a DLXFERED1 opciót (%s)\n"
+
+#~ msgid "failed to set option DLETA_H (%s)\n"
+#~ msgstr "nem sikerült beállítani a DLETA_H opciót (%s)\n"
+
+#~ msgid "failed to set option DLETA_M (%s)\n"
+#~ msgstr "nem sikerült beállítani a DBETA_M opciót (%s)\n"
+
+#~ msgid "failed to set option DLETA_S (%s)\n"
+#~ msgstr "nem sikerült beállítani a DLETA_S opciót (%s)\n"
+
+#~ msgid "failed to set option IGNOREPKG (%s)\n"
+#~ msgstr "nem sikerült beállítani az IGNOREPKG opciót (%s)\n"
+
+#~ msgid "%s is not a file.\n"
+#~ msgstr "a %s nem egy fájl.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Targets:"
+#~ msgstr ""
+#~ "\n"
+#~ "Célok:"
+
+#~ msgid ":: Starting local database upgrade...\n"
+#~ msgstr ":: A helyi adatbázis frissítésének indítása...\n"
+
+#~ msgid "could not add target '%s': %s\n"
+#~ msgstr "nem sikerült hozzáadni a '%s' célt: %s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Targets: "
+#~ msgstr ""
+#~ "\n"
+#~ "Célok:   "
+
+#~ msgid ""
+#~ "\n"
+#~ "Total Uncompressed Package Size:   %.1f MB\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Teljes tömörítetlen csomagméret:   %.1f MB\n"
+
+#~ msgid "Proceed with upgrade? [Y/n] "
+#~ msgstr "Kezdõdhet a frissítés? [I/n] "
+
+#~ msgid "failed to allocated %d bytes\n"
+#~ msgstr "nem sikerült allokálni %d bájtot\n"
 
 #~ msgid "config: new section '%s'\n"
 #~ msgstr "beállítások: új szekció '%s'\n"
@@ -1181,15 +1221,16 @@ msgstr "%s: nem érvényes reguláris kifejezés.\n"
 #~ msgid ""
 #~ "config: line %d: '%s' is reserved and cannot be used as a package tree\n"
 #~ msgstr ""
-#~ "beállítások: %d. sor: a '%s' név fenntartott és nem használható csomagfa "
-#~ "névként\n"
+#~ "beállítások: %d. sor: a '%s' név fenntartott és nem használható "
+#~ "csomagfa névként\n"
 
 #~ msgid "config: line %d: syntax error\n"
 #~ msgstr "beállítások: %d. sor: szintaktikai hiba\n"
 
 #~ msgid "config: line %d: all directives must belong to a section\n"
 #~ msgstr ""
-#~ "beállítások: %d. sor: minden direktívának egy szekcióhoz kell tartoznia\n"
+#~ "beállítások: %d. sor: minden direktívának egy szekcióhoz kell "
+#~ "tartoznia\n"
 
 #~ msgid "config: nopassiveftp\n"
 #~ msgstr "beállítások: nem lesz passzív ftp\n"
@@ -1247,8 +1288,8 @@ msgstr "%s: nem érvényes reguláris kifejezés.\n"
 #~ msgstr ""
 #~ "Figyelmeztetés: az UpgradeDelay opció túl nagy értéken van.\n"
 #~ "Ha egy csomag gyakran frissül, soha nem lesz frissítve.\n"
-#~ "Frissítse kézzel ezeket a csomagokat vagy használjon egy kisebb értéket, "
-#~ "hogy elkerülje ezt a problémát.\n"
+#~ "Frissítse kézzel ezeket a csomagokat vagy használjon egy kisebb "
+#~ "értéket, hogy elkerülje ezt a problémát.\n"
 
 #~ msgid "config: line %d: bad server location\n"
 #~ msgstr "beállítások: %d. sor: rossz szerver hely\n"
@@ -1340,8 +1381,8 @@ msgstr "%s: nem érvényes reguláris kifejezés.\n"
 
 #~ msgid "failed to get lastupdate time for %s (no big deal)\n"
 #~ msgstr ""
-#~ "nem sikerült megkapni az utolsó módosítási időpontját a következőnek: %s "
-#~ "(nincs sok esély)\n"
+#~ "nem sikerült megkapni az utolsó módosítási időpontját a "
+#~ "következőnek: %s (nincs sok esély)\n"
 
 #~ msgid "sync: new mtime for %s: %s\n"
 #~ msgstr "szinkronizálás: új módosítási dátum a %s számára: %s\n"
@@ -1356,12 +1397,13 @@ msgstr "%s: nem érvényes reguláris kifejezés.\n"
 #~ msgstr "figyelmeztetés: nem létezik a %s gyorsítótár.  létrehozás..."
 
 #~ 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\n"
+#~ msgstr ""
+#~ "nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp használata\n"
 
 #~ msgid "warning: couldn't create package cache, using /tmp instead"
 #~ msgstr ""
-#~ "figyelmeztetés: nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp "
-#~ "használata"
+#~ "figyelmeztetés: nem sikerült létrehozni a csomag-gyorsítótárat, a /"
+#~ "tmp használata"
 
 #~ msgid "failed to retrieve some files from %s\n"
 #~ msgstr "nem sikerült letölteni néhány fájlt a %s repóból\n"
diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot
index 720a7a64..3be08827 100644
--- a/src/pacman/po/pacman.pot
+++ b/src/pacman/po/pacman.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-03 13:36+0200\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2007-02-06 20:43-0500\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,1104 +16,1004 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../add.c:69 ../deptest.c:64 ../remove.c:83 ../sync.c:378 ../sync.c:417
+#: src/pacman/add.c:69 src/pacman/deptest.c:69 src/pacman/remove.c:79
+#: src/pacman/sync.c:442 src/pacman/sync.c:491
 #, c-format
 msgid ""
 "       if you're sure a package manager is not already running,\n"
 "       you can remove %s%s\n"
 msgstr ""
 
-#. and add targets to it
-#: ../add.c:76
+#: src/pacman/add.c:76
 msgid "loading package data... "
 msgstr ""
 
-#: ../add.c:79 ../remove.c:92
+#: src/pacman/add.c:80
 #, c-format
-msgid "failed to add target '%s' (%s)\n"
+msgid "failed to add target '%s' (%s)"
 msgstr ""
 
-#: ../add.c:84
-msgid "done."
+#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:86
+#: src/pacman/trans.c:93 src/pacman/trans.c:97 src/pacman/trans.c:107
+#: src/pacman/trans.c:121 src/pacman/trans.c:135 src/pacman/trans.c:147
+msgid "done.\n"
 msgstr ""
 
-#: ../add.c:92 ../remove.c:102 ../sync.c:505
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:576
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr ""
 
-#: ../add.c:97
+#: src/pacman/add.c:97
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ""
 
-#: ../add.c:111 ../sync.c:526
+#: src/pacman/add.c:118 src/pacman/sync.c:605
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ""
 
-#: ../add.c:121 ../sync.c:649
+#: src/pacman/add.c:127 src/pacman/sync.c:669
 #, c-format
-msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)"
+msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
 msgstr ""
 
-#: ../add.c:128 ../sync.c:656
+#: src/pacman/add.c:134 src/pacman/sync.c:676
 #, c-format
-msgid "%s: %s%s exists in filesystem"
+msgid "%s: %s%s exists in filesystem\n"
 msgstr ""
 
-#: ../add.c:136 ../sync.c:664 ../sync.c:671
+#: src/pacman/add.c:141 src/pacman/sync.c:683 src/pacman/sync.c:689
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
 msgstr ""
 
-#: ../add.c:143 ../sync.c:536
+#: src/pacman/add.c:151 src/pacman/sync.c:612
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ""
 
-#: ../add.c:157 ../remove.c:142 ../sync.c:642
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:662
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr ""
 
-#: ../add.c:164 ../remove.c:152 ../sync.c:410 ../sync.c:684
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:484
+#: src/pacman/sync.c:705
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr ""
 
-#: ../deptest.c:77
+#: src/pacman/deptest.c:82
 msgid "memory allocation failure\n"
 msgstr ""
 
-#: ../deptest.c:87
+#: src/pacman/deptest.c:93
 #, c-format
 msgid "add target %s\n"
 msgstr ""
 
-#: ../deptest.c:90
+#: src/pacman/deptest.c:96
 #, c-format
 msgid "could not add target (%s)\n"
 msgstr ""
 
-#: ../deptest.c:110
+#: src/pacman/deptest.c:115
 #, c-format
 msgid "requires: %s"
 msgstr ""
 
-#: ../deptest.c:126
+#: src/pacman/deptest.c:139
 #, c-format
 msgid "conflict: %s"
 msgstr ""
 
-#: ../deptest.c:140 ../deptest.c:158
+#: src/pacman/deptest.c:153 src/pacman/deptest.c:171
 #, c-format
 msgid "could not release transaction (%s)"
 msgstr ""
 
-#: ../list.c:143 ../list.c:171
-#, c-format
-msgid "None\n"
-msgstr ""
-
-#: ../log.c:55
+#: src/pacman/log.c:61
 #, c-format
 msgid "debug"
 msgstr ""
 
-#: ../log.c:58
+#: src/pacman/log.c:64
 #, c-format
 msgid "error"
 msgstr ""
 
-#: ../log.c:61
+#: src/pacman/log.c:67
 #, c-format
 msgid "warning"
 msgstr ""
 
-#: ../log.c:64
-#, c-format
-msgid "flow1"
-msgstr ""
-
-#: ../log.c:67
-#, c-format
-msgid "flow2"
-msgstr ""
-
-#: ../log.c:70
+#: src/pacman/log.c:73
 #, c-format
 msgid "function"
 msgstr ""
 
-#: ../log.c:154
+#: src/pacman/log.c:199
 msgid "Y"
 msgstr ""
 
-#: ../log.c:154
+#: src/pacman/log.c:199
 msgid "YES"
 msgstr ""
 
-#: ../log.h:26
+#: src/pacman/log.h:26
 msgid "error: "
 msgstr ""
 
-#: ../log.h:30
+#: src/pacman/log.h:30
 msgid "warning: "
 msgstr ""
 
-#: ../package.c:46
-#, c-format
-msgid "Name           : %s\n"
-msgstr ""
-
-#: ../package.c:47
-#, c-format
-msgid "Version        : %s\n"
-msgstr ""
-
-#: ../package.c:49
-msgid "Groups         :"
-msgstr ""
-
-#: ../package.c:51
-#, c-format
-msgid "Packager       : %s\n"
-msgstr ""
-
-#: ../package.c:53
-msgid "License        :"
-msgstr ""
-
-#: ../package.c:54
-#, c-format
-msgid "Architecture   : %s\n"
-msgstr ""
-
-#: ../package.c:55
-#, c-format
-msgid "Size           : %ld\n"
-msgstr ""
-
-#: ../package.c:58
-#, c-format
-msgid "Build Date     : %s %s\n"
+#: src/pacman/package.c:57
+msgid "Explicitly installed"
 msgstr ""
 
-#: ../package.c:60
-#, c-format
-msgid "Build Type     : %s\n"
+#: src/pacman/package.c:60
+msgid "Installed as a dependency for another package"
 msgstr ""
 
-#: ../package.c:60
+#: src/pacman/package.c:63 src/pacman/package.c:85
 msgid "Unknown"
 msgstr ""
 
-#: ../package.c:62
-#, c-format
-msgid "Install Date   : %s %s\n"
-msgstr ""
-
-#: ../package.c:64
+#: src/pacman/package.c:68 src/pacman/package.c:118
 #, c-format
-msgid "Install Script : %s\n"
-msgstr ""
-
-#: ../package.c:64
-msgid "Yes"
-msgstr ""
-
-#: ../package.c:64
-msgid "No"
+msgid "Name           : %s\n"
 msgstr ""
 
-#: ../package.c:66
+#: src/pacman/package.c:69 src/pacman/package.c:119
 #, c-format
-msgid "Reason         : "
+msgid "Version        : %s\n"
 msgstr ""
 
-#: ../package.c:69
+#: src/pacman/package.c:70
 #, c-format
-msgid "Explicitly installed\n"
+msgid "URL            : %s\n"
 msgstr ""
 
-#: ../package.c:72
-#, c-format
-msgid "Installed as a dependency for another package\n"
+#: src/pacman/package.c:71
+msgid "License        :"
 msgstr ""
 
-#: ../package.c:75
-#, c-format
-msgid "Unknown\n"
+#: src/pacman/package.c:72 src/pacman/package.c:120
+msgid "Groups         :"
 msgstr ""
 
-#: ../package.c:79
+#: src/pacman/package.c:73 src/pacman/package.c:121
 msgid "Provides       :"
 msgstr ""
 
-#: ../package.c:80
+#: src/pacman/package.c:74 src/pacman/package.c:122
 msgid "Depends On     :"
 msgstr ""
 
-#: ../package.c:81
+#: src/pacman/package.c:75 src/pacman/package.c:123
 msgid "Removes        :"
 msgstr ""
 
-#: ../package.c:82
+#: src/pacman/package.c:78
 msgid "Required By    :"
 msgstr ""
 
-#: ../package.c:83
+#: src/pacman/package.c:80 src/pacman/package.c:124
 msgid "Conflicts With :"
 msgstr ""
 
-#: ../package.c:85
+#: src/pacman/package.c:81
 #, c-format
-msgid "Description    : "
+msgid "Installed Size : %ld K\n"
 msgstr ""
 
-#: ../package.c:110
+#: src/pacman/package.c:82
 #, c-format
-msgid "error calculating md5sum or sha1sum for %s\n"
+msgid "Packager       : %s\n"
 msgstr ""
 
-#: ../package.c:115 ../package.c:117
+#: src/pacman/package.c:83
 #, c-format
-msgid "%sMODIFIED\t%s\n"
+msgid "Architecture   : %s\n"
 msgstr ""
 
-#: ../package.c:115 ../package.c:117
-msgid "NOT "
+#: src/pacman/package.c:84
+#, c-format
+msgid "Build Date     : %s %s\n"
 msgstr ""
 
-#: ../package.c:121
+#: src/pacman/package.c:85
 #, c-format
-msgid "MISSING\t\t%s\n"
+msgid "Build Type     : %s\n"
 msgstr ""
 
-#: ../package.c:139
+#: src/pacman/package.c:87
 #, c-format
-msgid "Repository        : %s\n"
+msgid "Install Date   : %s %s\n"
 msgstr ""
 
-#: ../package.c:140
+#: src/pacman/package.c:88
 #, c-format
-msgid "Name              : %s\n"
+msgid "Install Reason : %s\n"
 msgstr ""
 
-#: ../package.c:141
+#: src/pacman/package.c:90
 #, c-format
-msgid "Version           : %s\n"
+msgid "Install Script : %s\n"
 msgstr ""
 
-#: ../package.c:143
-msgid "Groups            :"
+#: src/pacman/package.c:91
+msgid "Yes"
 msgstr ""
 
-#: ../package.c:144
-msgid "Provides          :"
+#: src/pacman/package.c:91
+msgid "No"
 msgstr ""
 
-#: ../package.c:145
-msgid "Depends On        :"
+#: src/pacman/package.c:93 src/pacman/package.c:129
+#, c-format
+msgid "Description    : "
 msgstr ""
 
-#: ../package.c:146
-msgid "Removes           :"
+#: src/pacman/package.c:117
+#, c-format
+msgid "Repository     : %s\n"
 msgstr ""
 
-#: ../package.c:147
-msgid "Conflicts With    :"
+#: src/pacman/package.c:125
+msgid "Replaces       :"
 msgstr ""
 
-#: ../package.c:148
-msgid "Replaces          :"
+#: src/pacman/package.c:126
+#, c-format
+msgid "Download Size  : %6.2f K\n"
 msgstr ""
 
-#: ../package.c:150
+#: src/pacman/package.c:127
 #, c-format
-msgid "Size (compressed) : %ld\n"
+msgid "Installed Size : %6.2f K\n"
 msgstr ""
 
-#: ../package.c:151
+#: src/pacman/package.c:134
 #, c-format
-msgid "Size (uncompressed):%ld\n"
+msgid "MD5 Sum        : %s"
 msgstr ""
 
-#: ../package.c:152
+#: src/pacman/package.c:137
 #, c-format
-msgid "Description       : "
+msgid "SHA1 Sum       : %s"
 msgstr ""
 
-#: ../package.c:156
+#: src/pacman/package.c:168
 #, c-format
-msgid ""
-"\n"
-"MD5 Sum           : %s"
+msgid "error calculating checksums for %s\n"
 msgstr ""
 
-#: ../package.c:160
+#: src/pacman/package.c:181
 #, c-format
-msgid ""
-"\n"
-"SHA1 Sum          : %s"
+msgid "MODIFIED\t%s\n"
+msgstr ""
+
+#: src/pacman/package.c:183
+#, c-format
+msgid "Not Modified\t%s\n"
+msgstr ""
+
+#: src/pacman/package.c:188
+#, c-format
+msgid "MISSING\t\t%s\n"
 msgstr ""
 
-#: ../package.c:189
+#: src/pacman/package.c:221
 #, c-format
 msgid "No changelog available for '%s'.\n"
 msgstr ""
 
-#: ../pacman.c:96
+#: src/pacman/pacman.c:88
 #, c-format
 msgid "usage:  %s {-h --help}\n"
 msgstr ""
 
-#: ../pacman.c:97
+#: src/pacman/pacman.c:89
 #, c-format
 msgid "        %s {-V --version}\n"
 msgstr ""
 
-#: ../pacman.c:98
+#: src/pacman/pacman.c:90
 #, c-format
 msgid "        %s {-A --add}     [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:99
+#: src/pacman/pacman.c:91
 #, c-format
 msgid "        %s {-R --remove}  [options] <package>\n"
 msgstr ""
 
-#: ../pacman.c:100
+#: src/pacman/pacman.c:92
 #, c-format
 msgid "        %s {-U --upgrade} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:101
+#: src/pacman/pacman.c:93
 #, c-format
 msgid "        %s {-F --freshen} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:102
+#: src/pacman/pacman.c:94
 #, c-format
 msgid "        %s {-Q --query}   [options] [package]\n"
 msgstr ""
 
-#: ../pacman.c:103
+#: src/pacman/pacman.c:95
 #, c-format
 msgid "        %s {-S --sync}    [options] [package]\n"
 msgstr ""
 
-#: ../pacman.c:104
+#: src/pacman/pacman.c:96
 #, c-format
 msgid ""
 "\n"
 "use '%s --help' with other options for more syntax\n"
 msgstr ""
 
-#: ../pacman.c:107
+#: src/pacman/pacman.c:99
 #, c-format
 msgid "usage:  %s {-A --add} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:108 ../pacman.c:113 ../pacman.c:125 ../pacman.c:130
-#: ../pacman.c:144
+#: src/pacman/pacman.c:100 src/pacman/pacman.c:105 src/pacman/pacman.c:117
+#: src/pacman/pacman.c:122 src/pacman/pacman.c:136
 #, c-format
 msgid "options:\n"
 msgstr ""
 
-#: ../pacman.c:109 ../pacman.c:115 ../pacman.c:126 ../pacman.c:146
+#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118
+#: src/pacman/pacman.c:138
 #, c-format
 msgid "  -d, --nodeps        skip dependency checks\n"
 msgstr ""
 
-#: ../pacman.c:110 ../pacman.c:127 ../pacman.c:148
+#: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140
 #, c-format
 msgid "  -f, --force         force install, overwrite conflicting files\n"
 msgstr ""
 
-#: ../pacman.c:112
+#: src/pacman/pacman.c:104
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
 msgstr ""
 
-#: ../pacman.c:114
+#: src/pacman/pacman.c:106
 #, c-format
 msgid ""
 "  -c, --cascade       remove packages and all packages that depend on them\n"
 msgstr ""
 
-#: ../pacman.c:116
+#: src/pacman/pacman.c:108
 #, c-format
 msgid "  -k, --dbonly        only remove database entry, do not remove files\n"
 msgstr ""
 
-#: ../pacman.c:117
+#: src/pacman/pacman.c:109
 #, c-format
 msgid "  -n, --nosave        remove configuration files as well\n"
 msgstr ""
 
-#: ../pacman.c:118
+#: src/pacman/pacman.c:110
 #, c-format
 msgid ""
 "  -s, --recursive     remove dependencies also (that won't break packages)\n"
 msgstr ""
 
-#: ../pacman.c:121
+#: src/pacman/pacman.c:113
 #, c-format
 msgid "usage:  %s {-F --freshen} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:123
+#: src/pacman/pacman.c:115
 #, c-format
 msgid "usage:  %s {-U --upgrade} [options] <file>\n"
 msgstr ""
 
-#: ../pacman.c:129
+#: src/pacman/pacman.c:121
 #, c-format
 msgid "usage:  %s {-Q --query} [options] [package]\n"
 msgstr ""
 
-#: ../pacman.c:131
+#: src/pacman/pacman.c:123
 #, c-format
 msgid "  -c, --changelog     view the changelog of a package\n"
 msgstr ""
 
-#: ../pacman.c:132
+#: src/pacman/pacman.c:124
 #, c-format
 msgid ""
-"  -e, --orphans       list all packages that were installed as a dependency\n"
+"  -e, --orphans       list all packages installed as dependencies but no "
+"longer\n"
 msgstr ""
 
-#: ../pacman.c:133
+#: src/pacman/pacman.c:125
 #, c-format
-msgid "                      and are not required by any other packages\n"
+msgid "                      required by any package\n"
 msgstr ""
 
-#: ../pacman.c:134 ../pacman.c:149
+#: src/pacman/pacman.c:126 src/pacman/pacman.c:141
 #, c-format
 msgid "  -g, --groups        view all members of a package group\n"
 msgstr ""
 
-#: ../pacman.c:135
+#: src/pacman/pacman.c:127 src/pacman/pacman.c:142
 #, c-format
 msgid "  -i, --info          view package information\n"
 msgstr ""
 
-#: ../pacman.c:136
+#: src/pacman/pacman.c:128
 #, c-format
 msgid "  -l, --list          list the contents of the queried package\n"
 msgstr ""
 
-#: ../pacman.c:137
+#: src/pacman/pacman.c:129
 #, c-format
 msgid ""
 "  -m, --foreign       list all packages that were not found in the sync db"
 "(s)\n"
 msgstr ""
 
-#: ../pacman.c:138
+#: src/pacman/pacman.c:130
 #, c-format
 msgid "  -o, --owns <file>   query the package that owns <file>\n"
 msgstr ""
 
-#: ../pacman.c:139
+#: src/pacman/pacman.c:131
 #, c-format
 msgid ""
-"  -p, --file          pacman will query the package file [package] instead "
-"of\n"
+"  -p, --file          query the package file [package] instead of the "
+"database\n"
 msgstr ""
 
-#: ../pacman.c:140
-#, c-format
-msgid "                      looking in the database\n"
-msgstr ""
-
-#: ../pacman.c:141
+#: src/pacman/pacman.c:132
 #, c-format
 msgid ""
 "  -s, --search        search locally-installed packages for matching "
 "strings\n"
 msgstr ""
 
-#: ../pacman.c:143
+#: src/pacman/pacman.c:133
+#, c-format
+msgid "  -u, --upgrades      list all packages that can be upgraded\n"
+msgstr ""
+
+#: src/pacman/pacman.c:135
 #, c-format
 msgid "usage:  %s {-S --sync} [options] [package]\n"
 msgstr ""
 
-#: ../pacman.c:145
+#: src/pacman/pacman.c:137
 #, c-format
 msgid ""
 "  -c, --clean         remove old packages from cache directory (use -cc for "
 "all)\n"
 msgstr ""
 
-#: ../pacman.c:147
+#: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --dependsonly   install dependencies only\n"
 msgstr ""
 
-#: ../pacman.c:150
+#: src/pacman/pacman.c:143
 #, c-format
 msgid ""
 "  -p, --print-uris    print out URIs for given packages and their "
 "dependencies\n"
 msgstr ""
 
-#: ../pacman.c:151
+#: src/pacman/pacman.c:144
 #, c-format
 msgid "  -s, --search        search remote repositories for matching strings\n"
 msgstr ""
 
-#: ../pacman.c:152
+#: src/pacman/pacman.c:145
 #, c-format
 msgid "  -u, --sysupgrade    upgrade all packages that are out of date\n"
 msgstr ""
 
-#: ../pacman.c:153
+#: src/pacman/pacman.c:146
 #, c-format
 msgid ""
 "  -w, --downloadonly  download packages but do not install/upgrade anything\n"
 msgstr ""
 
-#: ../pacman.c:154
+#: src/pacman/pacman.c:147
 #, c-format
 msgid ""
 "  -y, --refresh       download fresh package databases from the server\n"
 msgstr ""
 
-#: ../pacman.c:155
+#: src/pacman/pacman.c:148
 #, c-format
 msgid ""
 "      --ignore <pkg>  ignore a package upgrade (can be used more than once)\n"
 msgstr ""
 
-#: ../pacman.c:157
+#: src/pacman/pacman.c:150
 #, c-format
 msgid "      --config <path> set an alternate configuration file\n"
 msgstr ""
 
-#: ../pacman.c:158
+#: src/pacman/pacman.c:151
 #, c-format
 msgid "      --noconfirm     do not ask for anything confirmation\n"
 msgstr ""
 
-#: ../pacman.c:159
+#: src/pacman/pacman.c:152
 #, c-format
 msgid "      --ask  <number> pre-specify answers for questions (see manpage)\n"
 msgstr ""
 
-#: ../pacman.c:160
+#: src/pacman/pacman.c:153
 #, c-format
 msgid ""
 "      --noprogressbar do not show a progress bar when downloading files\n"
 msgstr ""
 
-#: ../pacman.c:161
+#: src/pacman/pacman.c:154
 #, c-format
 msgid ""
 "      --noscriptlet   do not execute the install scriptlet if there is any\n"
 msgstr ""
 
-#: ../pacman.c:162
+#: src/pacman/pacman.c:155
 #, c-format
 msgid "  -v, --verbose       be verbose\n"
 msgstr ""
 
-#: ../pacman.c:163
+#: src/pacman/pacman.c:156
 #, c-format
 msgid "  -r, --root <path>   set an alternate installation root\n"
 msgstr ""
 
-#: ../pacman.c:164
+#: src/pacman/pacman.c:157
 #, c-format
 msgid "  -b, --dbpath <path> set an alternate database location\n"
 msgstr ""
 
-#: ../pacman.c:177
+#: src/pacman/pacman.c:170
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
 
-#: ../pacman.c:178
+#: src/pacman/pacman.c:171
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
 msgstr ""
 
-#: ../pacman.c:363
-msgid "bad root path"
-msgstr ""
-
-#: ../pacman.c:390
-msgid "only one operation may be used at a time\n"
-msgstr ""
-
-#: ../pacman.c:486
-msgid "you cannot perform this operation unless you are root.\n"
-msgstr ""
-
-#: ../pacman.c:510
-#, c-format
-msgid "failed to initilize alpm library (%s)\n"
-msgstr ""
-
-#: ../pacman.c:518
-#, c-format
-msgid "failed to parse config (%s)\n"
-msgstr ""
-
-#: ../pacman.c:524
-#, c-format
-msgid "failed to set option LOGMASK (%s)\n"
-msgstr ""
-
-#: ../pacman.c:528
-#, c-format
-msgid "failed to set option LOGCB (%s)\n"
-msgstr ""
-
-#: ../pacman.c:532
-#, c-format
-msgid "failed to set option DLCB (%s)\n"
-msgstr ""
-
-#: ../pacman.c:536
-#, c-format
-msgid "failed to set option DLFNM (%s)\n"
-msgstr ""
-
-#: ../pacman.c:540
-#, c-format
-msgid "failed to set option DLOFFSET (%s)\n"
-msgstr ""
-
-#: ../pacman.c:544
-#, c-format
-msgid "failed to set option DLT0 (%s)\n"
-msgstr ""
-
-#: ../pacman.c:548
+#: src/pacman/pacman.c:298
 #, c-format
-msgid "failed to set option DLT (%s)\n"
+msgid "error: '%s' is not a valid debug level"
 msgstr ""
 
-#: ../pacman.c:552
+#: src/pacman/pacman.c:334
 #, c-format
-msgid "failed to set option DLRATE (%s)\n"
+msgid "error: '%s' is not a valid db path\n"
 msgstr ""
 
-#: ../pacman.c:556
+#: src/pacman/pacman.c:364
 #, c-format
-msgid "failed to set option DLXFERED1 (%s)\n"
+msgid "error: '%s' is not a valid root path\n"
 msgstr ""
 
-#: ../pacman.c:560
-#, c-format
-msgid "failed to set option DLETA_H (%s)\n"
+#: src/pacman/pacman.c:391
+msgid "only one operation may be used at a time\n"
 msgstr ""
 
-#: ../pacman.c:564
+#: src/pacman/pacman.c:454
 #, c-format
-msgid "failed to set option DLETA_M (%s)\n"
+msgid "failed to initilize alpm library (%s)\n"
 msgstr ""
 
-#: ../pacman.c:568
-#, c-format
-msgid "failed to set option DLETA_S (%s)\n"
+#: src/pacman/pacman.c:487
+msgid "you cannot perform this operation unless you are root.\n"
 msgstr ""
 
-#: ../pacman.c:578
+#: src/pacman/pacman.c:503
 #, c-format
-msgid "failed to set option IGNOREPKG (%s)\n"
+msgid "failed to parse config (%s)\n"
 msgstr ""
 
-#: ../pacman.c:586
+#: src/pacman/pacman.c:513 src/pacman/remove.c:125 src/pacman/util.c:316
 msgid "Targets:"
 msgstr ""
 
-#: ../pacman.c:592
+#: src/pacman/pacman.c:519
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr ""
 
-#: ../pacman.c:599
+#: src/pacman/pacman.c:526
 msgid "no targets specified (use -h for help)\n"
 msgstr ""
 
-#: ../pacman.c:612
+#: src/pacman/pacman.c:539
 msgid "no operation specified (use -h for help)\n"
 msgstr ""
 
-#: ../query.c:56
+#: src/pacman/query.c:53
 msgid "no file was specified for --owns\n"
 msgstr ""
 
-#: ../query.c:61
-#, c-format
-msgid "%s is not a file.\n"
-msgstr ""
-
-#: ../query.c:78
+#: src/pacman/query.c:71
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr ""
 
-#: ../query.c:86
+#: src/pacman/query.c:78
 #, c-format
 msgid "No package owns %s\n"
 msgstr ""
 
-#: ../query.c:111 ../sync.c:340
+#: src/pacman/query.c:122 src/pacman/sync.c:413
 msgid "no usable package repositories configured.\n"
 msgstr ""
 
-#: ../query.c:150
+#: src/pacman/query.c:128
+msgid "Checking for package upgrades..."
+msgstr ""
+
+#: src/pacman/query.c:135
+msgid "no upgrades found"
+msgstr ""
+
+#: src/pacman/query.c:173
 #, c-format
 msgid "group \"%s\" was not found\n"
 msgstr ""
 
-#: ../query.c:160
+#: src/pacman/query.c:184
 msgid "no package file was specified for --file\n"
 msgstr ""
 
-#: ../query.c:164
+#: src/pacman/query.c:188
 #, c-format
 msgid "failed to load package '%s' (%s)\n"
 msgstr ""
 
-#. something weird happened
-#: ../query.c:202 ../query.c:244
+#: src/pacman/query.c:226 src/pacman/query.c:263
 #, c-format
 msgid "package \"%s\" not found\n"
 msgstr ""
 
-#: ../remove.c:64 ../sync.c:456
+#: src/pacman/remove.c:58 src/pacman/sync.c:528
 #, c-format
 msgid ":: group %s:\n"
 msgstr ""
 
-#: ../remove.c:66
+#: src/pacman/remove.c:60
 msgid "    Remove whole content? [Y/n] "
 msgstr ""
 
-#: ../remove.c:68
+#: src/pacman/remove.c:64
 #, c-format
 msgid ":: Remove %s from group %s? [Y/n] "
 msgstr ""
 
-#: ../remove.c:81 ../sync.c:376 ../sync.c:415
+#: src/pacman/remove.c:77 src/pacman/sync.c:440 src/pacman/sync.c:489
 #, c-format
 msgid "failed to init transaction (%s)\n"
 msgstr ""
 
-#: ../remove.c:107
+#: src/pacman/remove.c:89
 #, c-format
-msgid "  %s: is required by %s\n"
+msgid "failed to add target '%s' (%s)\n"
 msgstr ""
 
-#: ../remove.c:129
-msgid ""
-"\n"
-"Targets:"
+#: src/pacman/remove.c:103
+#, c-format
+msgid ":: %s is required by %s\n"
 msgstr ""
 
-#. get confirmation
-#: ../remove.c:132
+#: src/pacman/remove.c:128
 msgid ""
 "\n"
 "Do you want to remove these packages? [Y/n] "
 msgstr ""
 
-#: ../sync.c:73
+#: src/pacman/sync.c:113
 msgid "Do you want to remove old packages from cache? [Y/n] "
 msgstr ""
 
-#: ../sync.c:75
+#: src/pacman/sync.c:115
 msgid "removing old packages from cache... "
 msgstr ""
 
-#: ../sync.c:78
+#: src/pacman/sync.c:118
 msgid "could not access cache directory\n"
 msgstr ""
 
-#. full cleanup
-#: ../sync.c:138
+#: src/pacman/sync.c:179
 msgid "Do you want to remove all packages from cache? [Y/n] "
 msgstr ""
 
-#: ../sync.c:140
+#: src/pacman/sync.c:181
 msgid "removing all packages from cache... "
 msgstr ""
 
-#: ../sync.c:143
+#: src/pacman/sync.c:184
 msgid "could not remove cache directory\n"
 msgstr ""
 
-#: ../sync.c:148
+#: src/pacman/sync.c:189
 msgid "could not create new cache directory\n"
 msgstr ""
 
-#: ../sync.c:153 ../trans.c:72 ../trans.c:86 ../trans.c:100 ../trans.c:116
-#: ../trans.c:128
-msgid "done.\n"
-msgstr ""
-
-#: ../sync.c:168
+#: src/pacman/sync.c:216
 #, c-format
-msgid "failed to synchronize %s\n"
+msgid "failed to synchronize %s: %s\n"
 msgstr ""
 
-#: ../sync.c:170
+#: src/pacman/sync.c:218
 #, c-format
 msgid "failed to update %s (%s)\n"
 msgstr ""
 
-#: ../sync.c:174
+#: src/pacman/sync.c:221
 #, c-format
 msgid " %s is up to date\n"
 msgstr ""
 
-#: ../sync.c:265
+#: src/pacman/sync.c:341
 #, c-format
 msgid "package \"%s\" was not found.\n"
 msgstr ""
 
-#: ../sync.c:303
+#: src/pacman/sync.c:378
 #, c-format
 msgid "repository \"%s\" was not found.\n"
 msgstr ""
 
-#. grab a fresh package list
-#: ../sync.c:350
+#: src/pacman/sync.c:450
 msgid ":: Synchronizing package databases...\n"
 msgstr ""
 
-#: ../sync.c:351
+#: src/pacman/sync.c:451
 msgid "synchronizing package lists"
 msgstr ""
 
-#: ../sync.c:385
-msgid ":: Starting local database upgrade...\n"
+#: src/pacman/sync.c:453
+msgid "failed to synchronize any databases"
+msgstr ""
+
+#: src/pacman/sync.c:459
+msgid ":: Starting full system upgrade...\n"
 msgstr ""
 
-#: ../sync.c:386
+#: src/pacman/sync.c:460
 msgid "starting full system upgrade"
 msgstr ""
 
-#: ../sync.c:404
+#: src/pacman/sync.c:478
 msgid ""
 "\n"
 ":: pacman has detected a newer version of the \"pacman\" package.\n"
 msgstr ""
 
-#: ../sync.c:405
+#: src/pacman/sync.c:479
 msgid ":: It is recommended that you allow pacman to upgrade itself\n"
 msgstr ""
 
-#: ../sync.c:406
+#: src/pacman/sync.c:480
 msgid ":: first, then you can re-run the operation with the newer version.\n"
 msgstr ""
 
-#: ../sync.c:408
+#: src/pacman/sync.c:482
 msgid ":: Upgrade pacman first? [Y/n] "
 msgstr ""
 
-#: ../sync.c:423 ../sync.c:444
+#: src/pacman/sync.c:497
+#, c-format
+msgid "pacman: %s\n"
+msgstr ""
+
+#: src/pacman/sync.c:517
 #, c-format
-msgid "could not add target '%s': %s\n"
+msgid "'%s': %s\n"
 msgstr ""
 
-#: ../sync.c:462
+#: src/pacman/sync.c:532
 msgid ":: Install whole content? [Y/n] "
 msgstr ""
 
-#: ../sync.c:469
+#: src/pacman/sync.c:539
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
 msgstr ""
 
-#: ../sync.c:492
+#: src/pacman/sync.c:563
 #, c-format
-msgid "could not add target '%s': not found in sync db\n"
+msgid "'%s': not found in sync db\n"
 msgstr ""
 
-#: ../sync.c:511
+#: src/pacman/sync.c:583
 msgid "requires"
 msgstr ""
 
-#: ../sync.c:511
+#: src/pacman/sync.c:583
 msgid "is required by"
 msgstr ""
 
-#: ../sync.c:588
-msgid ""
-"\n"
-"Remove:  "
-msgstr ""
-
-#: ../sync.c:604
-msgid ""
-"\n"
-"Targets: "
-msgstr ""
-
-#: ../sync.c:607
-#, c-format
-msgid ""
-"\n"
-"Total Package Size:   %.1f MB\n"
-msgstr ""
-
-#: ../sync.c:608
-#, c-format
-msgid ""
-"\n"
-"Total Uncompressed Package Size:   %.1f MB\n"
+#: src/pacman/sync.c:625
+msgid "local database is up to date\n"
 msgstr ""
 
-#: ../sync.c:614
+#: src/pacman/sync.c:634
 msgid ""
 "\n"
 "Beginning download...\n"
 msgstr ""
 
-#: ../sync.c:618
+#: src/pacman/sync.c:638
 msgid "Proceed with download? [Y/n] "
 msgstr ""
 
-#: ../sync.c:626
+#: src/pacman/sync.c:646
 msgid ""
 "\n"
 "Beginning upgrade process...\n"
 msgstr ""
 
-#: ../sync.c:630
-msgid "Proceed with upgrade? [Y/n] "
+#: src/pacman/sync.c:650
+msgid "Proceed with installation? [Y/n] "
 msgstr ""
 
-#: ../trans.c:57
+#: src/pacman/trans.c:57
+msgid "] 100%    LOCAL "
+msgstr ""
+
+#: src/pacman/trans.c:68
 msgid "checking dependencies... "
 msgstr ""
 
-#: ../trans.c:60
+#: src/pacman/trans.c:72
 msgid "checking for file conflicts... "
 msgstr ""
 
-#: ../trans.c:63
+#: src/pacman/trans.c:76
+msgid "cleaning up... "
+msgstr ""
+
+#: src/pacman/trans.c:79
 msgid "resolving dependencies... "
 msgstr ""
 
-#: ../trans.c:66
+#: src/pacman/trans.c:82
 msgid "looking for inter-conflicts... "
 msgstr ""
 
-#: ../trans.c:81
+#: src/pacman/trans.c:102
 #, c-format
 msgid "installing %s... "
 msgstr ""
 
-#: ../trans.c:88
+#: src/pacman/trans.c:109
 #, c-format
 msgid "installed %s (%s)"
 msgstr ""
 
-#: ../trans.c:95
+#: src/pacman/trans.c:116
 #, c-format
 msgid "removing %s... "
 msgstr ""
 
-#: ../trans.c:104
+#: src/pacman/trans.c:123
 #, c-format
 msgid "removed %s (%s)"
 msgstr ""
 
-#: ../trans.c:111
+#: src/pacman/trans.c:130
 #, c-format
 msgid "upgrading %s... "
 msgstr ""
 
-#: ../trans.c:118
+#: src/pacman/trans.c:137
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr ""
 
-#: ../trans.c:125
+#: src/pacman/trans.c:144
 msgid "checking package integrity... "
 msgstr ""
 
-#: ../trans.c:139
+#: src/pacman/trans.c:158
 msgid " done.\n"
 msgstr ""
 
-#: ../trans.c:141
+#: src/pacman/trans.c:160
 msgid " failed.\n"
 msgstr ""
 
-#: ../trans.c:148
+#: src/pacman/trans.c:167
 #, c-format
-msgid ""
-"\n"
-":: Retrieving packages from %s...\n"
-msgstr ""
-
-#: ../trans.c:158
-msgid "] 100%    LOCAL "
+msgid ":: Retrieving packages from %s...\n"
 msgstr ""
 
-#: ../trans.c:176
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ""
 
-#: ../trans.c:190
+#: src/pacman/trans.c:204
 #, c-format
-msgid ":: %s is designated as a HoldPkg.  Remove anyway? [Y/n] "
+msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ""
 
-#: ../trans.c:203
+#: src/pacman/trans.c:217
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ""
 
-#: ../trans.c:218
+#: src/pacman/trans.c:232
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ""
 
-#: ../trans.c:234
+#: src/pacman/trans.c:248
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ""
 
-#: ../trans.c:252
+#: src/pacman/trans.c:266
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ""
 
-#: ../trans.c:270
+#: src/pacman/trans.c:284
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ""
 
-#: ../trans.c:286
+#: src/pacman/trans.c:333
 msgid "installing"
 msgstr ""
 
-#: ../trans.c:287
+#: src/pacman/trans.c:336
 msgid "upgrading"
 msgstr ""
 
-#: ../trans.c:288
+#: src/pacman/trans.c:339
 msgid "removing"
 msgstr ""
 
-#: ../util.c:178
+#: src/pacman/trans.c:342
+msgid "checking for file conflicts"
+msgstr ""
+
+#: src/pacman/util.c:258
 #, c-format
-msgid "failed to allocated %d bytes\n"
+msgid "None\n"
+msgstr ""
+
+#: src/pacman/util.c:303
+msgid "Remove:"
+msgstr ""
+
+#: src/pacman/util.c:311
+#, c-format
+msgid ""
+"\n"
+"Total Removed Size:   %.2f MB\n"
+msgstr ""
+
+#: src/pacman/util.c:322
+#, c-format
+msgid ""
+"\n"
+"Total Package Size:   %.2f MB\n"
 msgstr ""
 
-#: ../util.c:232
+#: src/pacman/util.c:329
 #, c-format
-msgid "%s is not a valid regular expression.\n"
+msgid "Total Installed Size:   %.2f MB\n"
 msgstr ""