Big commit here, I'll try to cover all the bases.

* Updated all of the language files, as the POT file was updated. NOTE FOR
  TRANSLATORS, try to base your next contribution off of these, notice how
  some msgids and messages have been wrapped to the next line- it makes it
  easier to read anyway.
* More Makefile.am/configure.ac updates. 'make dist' and 'make distclean' now
  work properly, with only one caveat- the automatic testing in distclean
  doesn't do so hot as it is compiled with a default configure, which includes
  the fakeroot-proof code (which does not cooperate with pactest).
* Added a Makefile.am for the pactest directory.

1 files changed, 267 insertions, 210 deletions

diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 9800c843..17499c85 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-14 14:32-0500\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
 "PO-Revision-Date: 2007-02-06 20:16-0500\n"
 "Last-Translator: Dan McGee <pacman-dev@archlinux.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,38 +25,47 @@ msgstr ""
 msgid "loading target '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:175
+#: lib/libalpm/add.c:174
 #, c-format
 msgid "replacing older version %s-%s by %s in target list"
 msgstr ""
 
-#: lib/libalpm/add.c:184
+#: lib/libalpm/add.c:183
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping"
 msgstr ""
 
-#: lib/libalpm/add.c:191
+#: lib/libalpm/add.c:190
 #, c-format
 msgid "reading '%s' metadata"
 msgstr ""
 
-#: lib/libalpm/add.c:244 lib/libalpm/remove.c:110
+#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110
 msgid "looking for unsatisfied dependencies"
 msgstr ""
 
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:473
+#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476
 msgid "looking for conflicts"
 msgstr ""
 
-#: lib/libalpm/add.c:295 lib/libalpm/remove.c:146
+#: lib/libalpm/add.c:260
+msgid "replacing packages with -A and -U is not supported yet"
+msgstr ""
+
+#: lib/libalpm/add.c:261
+#, c-format
+msgid "please remove '%s' first, using -Rd"
+msgstr ""
+
+#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146
 msgid "sorting by dependencies"
 msgstr ""
 
-#: lib/libalpm/add.c:307
+#: lib/libalpm/add.c:314
 msgid "cleaning up"
 msgstr ""
 
-#: lib/libalpm/add.c:324
+#: lib/libalpm/add.c:329
 msgid "looking for file conflicts"
 msgstr ""
 
@@ -65,212 +74,200 @@ msgstr ""
 msgid "upgrading package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:419
+#: lib/libalpm/add.c:417
 #, c-format
-msgid "removing old package first (%s-%s)"
+msgid "adding package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:449
+#: lib/libalpm/add.c:430
 #, c-format
-msgid "adding package %s-%s"
+msgid "removing old package first (%s-%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:460
+#: lib/libalpm/add.c:457
 #, c-format
-msgid "adding new package %s-%s"
+msgid "adding %s to the NoUpgrade array temporarilly"
 msgstr ""
 
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:475
 msgid "extracting files"
 msgstr ""
 
-#: lib/libalpm/add.c:480 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:490 lib/libalpm/util.c:461
 msgid "could not get current working directory"
 msgstr ""
 
-#: lib/libalpm/add.c:538
+#: lib/libalpm/add.c:546
+#, c-format
+msgid "%s is in NoExtract, skipping extraction"
+msgstr ""
+
+#: lib/libalpm/add.c:547
 #, c-format
 msgid "notice: %s is in NoExtract -- skipping extraction"
 msgstr ""
 
-#: lib/libalpm/add.c:574 lib/libalpm/add.c:727
+#: lib/libalpm/add.c:554
+#, c-format
+msgid "%s is in trans->skip_add, skipping extraction"
+msgstr ""
+
+#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:617
+#: lib/libalpm/add.c:644
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:618 lib/libalpm/add.c:625
+#: lib/libalpm/add.c:646
 #, c-format
-msgid "current:  %s"
+msgid "checking sha1 hashes for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:619 lib/libalpm/add.c:626
+#: lib/libalpm/add.c:648
 #, c-format
-msgid "new:      %s"
+msgid "current:  %s"
 msgstr ""
 
-#: lib/libalpm/add.c:621 lib/libalpm/add.c:628
+#: lib/libalpm/add.c:649
 #, c-format
-msgid "original: %s"
+msgid "new:      %s"
 msgstr ""
 
-#: lib/libalpm/add.c:624
+#: lib/libalpm/add.c:650
 #, c-format
-msgid "checking sha1 hashes for %s"
+msgid "original: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:642
+#: lib/libalpm/add.c:662
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:663
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:647 lib/libalpm/add.c:691
+#: lib/libalpm/add.c:669 lib/libalpm/add.c:688
 #, c-format
-msgid "could not copy %s to %s (%s)"
+msgid "could not copy tempfile to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:648
+#: lib/libalpm/add.c:670
 #, c-format
-msgid "error: could not copy %s to %s (%s)"
+msgid "error: could not copy tempfile to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:652
+#: lib/libalpm/add.c:674
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr ""
 
-#: lib/libalpm/add.c:653
+#: lib/libalpm/add.c:675
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:663 lib/libalpm/add.c:666 lib/libalpm/add.c:672
-msgid "action: installing new file"
+#: lib/libalpm/add.c:685
+#, c-format
+msgid "action: installing new file: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706
 msgid "action: leaving existing file in place"
 msgstr ""
 
-#: lib/libalpm/add.c:676
+#: lib/libalpm/add.c:709
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 
-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:712
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:681
+#: lib/libalpm/add.c:713
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:683
+#: lib/libalpm/add.c:715
 #, c-format
 msgid "%s installed as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:684
+#: lib/libalpm/add.c:716
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:689 lib/libalpm/add.c:709
+#: lib/libalpm/add.c:730
 #, c-format
-msgid "extracting %s"
+msgid "%s is in NoUpgrade -- skipping"
 msgstr ""
 
-#: lib/libalpm/add.c:711
+#: lib/libalpm/add.c:731
 #, c-format
-msgid "%s is in NoUpgrade -- skipping"
+msgid "extracting %s as %s.pacnew"
 msgstr ""
 
-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:732
 #, c-format
-msgid "extracting %s as %s.pacnew"
+msgid "warning: extracting %s as %s.pacnew"
 msgstr ""
 
-#: lib/libalpm/add.c:714
+#: lib/libalpm/add.c:735
 #, c-format
-msgid "warning: extracting %s%s as %s"
+msgid "extracting %s"
 msgstr ""
 
-#: lib/libalpm/add.c:728
+#: lib/libalpm/add.c:751
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:738
-msgid "appending backup entry"
+#: lib/libalpm/add.c:763
+#, c-format
+msgid "appending backup entry for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:769 lib/libalpm/add.c:771
+#: lib/libalpm/add.c:795 lib/libalpm/add.c:797
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr ""
 
-#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
+#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
 msgid "upgrading"
 msgstr ""
 
-#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
+#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
 msgid "installing"
 msgstr ""
 
-#: lib/libalpm/add.c:793 lib/libalpm/add.c:849
-#, c-format
-msgid "adding '%s' in requiredby field for '%s'"
-msgstr ""
-
-#: lib/libalpm/add.c:804 lib/libalpm/remove.c:326
+#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321
 msgid "updating database"
 msgstr ""
 
-#: lib/libalpm/add.c:805
+#: lib/libalpm/add.c:813
 #, c-format
 msgid "adding database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:807
+#: lib/libalpm/add.c:816 lib/libalpm/add.c:818
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:809
-#, c-format
-msgid "error updating database for %s-%s!"
-msgstr ""
-
-#: lib/libalpm/add.c:813
+#: lib/libalpm/add.c:824
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr ""
 
-#: lib/libalpm/add.c:819 lib/libalpm/remove.c:336
-msgid "updating dependency packages 'requiredby' fields"
-msgstr ""
-
-#: lib/libalpm/add.c:841
-#, c-format
-msgid "could not find dependency '%s'"
-msgstr ""
-
-#: lib/libalpm/add.c:852 lib/libalpm/remove.c:378
-#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
-msgstr ""
-
-#: lib/libalpm/add.c:878 lib/libalpm/remove.c:391 lib/libalpm/sync.c:1043
+#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr ""
@@ -437,7 +434,7 @@ msgstr ""
 msgid "config: upgradedelay: %d"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129
 msgid "checking for package replacements"
 msgstr ""
 
@@ -456,17 +453,17 @@ msgstr ""
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:211
+#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499
+#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:232
+#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235
 #, c-format
 msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr ""
@@ -476,50 +473,60 @@ msgstr ""
 msgid "unpacking database '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:182
+#: lib/libalpm/be_files.c:75
+#, c-format
+msgid "opening database from path '%s'"
+msgstr ""
+
+#: lib/libalpm/be_files.c:179
+#, c-format
+msgid "db scan could not find package: %s"
+msgstr ""
+
+#: lib/libalpm/be_files.c:183
 #, c-format
 msgid "invalid name for dabatase entry '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:212
+#: lib/libalpm/be_files.c:213
 msgid "invalid package entry provided to _alpm_db_read, skipping"
 msgstr ""
 
-#: lib/libalpm/be_files.c:217
+#: lib/libalpm/be_files.c:218
 #, c-format
 msgid ""
 "request to read database info for a file-based package '%s', skipping..."
 msgstr ""
 
-#: lib/libalpm/be_files.c:225
+#: lib/libalpm/be_files.c:226
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr ""
 
-#: lib/libalpm/be_files.c:233
+#: lib/libalpm/be_files.c:234
 #, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:241 lib/libalpm/be_files.c:391
-#: lib/libalpm/be_files.c:414 lib/libalpm/be_files.c:502
-#: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618
+#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392
+#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503
+#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619
 #: lib/libalpm/package.c:197
 #, c-format
 msgid "could not open file %s: %s"
 msgstr ""
 
-#: lib/libalpm/be_files.c:499
+#: lib/libalpm/be_files.c:500
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:588
+#: lib/libalpm/be_files.c:589
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:615
+#: lib/libalpm/be_files.c:616
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr ""
@@ -529,27 +536,42 @@ msgstr ""
 msgid "loading package cache (infolevel=%#x) for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:83
+#: lib/libalpm/cache.c:64
+#, c-format
+msgid "adding '%s' to package cache for db '%s'"
+msgstr ""
+
+#: lib/libalpm/cache.c:84
 #, c-format
 msgid "freeing package cache for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:132
+#: lib/libalpm/cache.c:109
+#, c-format
+msgid "error: pkgcache is NULL for db '%s'"
+msgstr ""
+
+#: lib/libalpm/cache.c:136
 #, c-format
 msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
 msgstr ""
 
-#: lib/libalpm/cache.c:152
+#: lib/libalpm/cache.c:156
 #, c-format
 msgid "adding entry '%s' in '%s' cache"
 msgstr ""
 
-#: lib/libalpm/cache.c:178
+#: lib/libalpm/cache.c:182
 #, c-format
 msgid "removing entry '%s' from '%s' cache"
 msgstr ""
 
-#: lib/libalpm/cache.c:213
+#: lib/libalpm/cache.c:200
+#, c-format
+msgid "error: failed to get '%s' from NULL pkgcache"
+msgstr ""
+
+#: lib/libalpm/cache.c:223
 #, c-format
 msgid "loading group cache for repository '%s'"
 msgstr ""
@@ -584,11 +606,11 @@ msgstr ""
 msgid "db vs targs: found %s as a conflict for %s"
 msgstr ""
 
-#: lib/libalpm/conflict.c:297 lib/libalpm/conflict.c:346 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:78 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:604 lib/libalpm/sync.c:620 lib/libalpm/sync.c:716
-#: lib/libalpm/trans.c:49 lib/libalpm/util.c:607 lib/libalpm/util.c:614
+#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598
+#: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
+#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607
+#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52
+#: lib/libalpm/util.c:607 lib/libalpm/util.c:614
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr ""
@@ -630,94 +652,85 @@ msgstr ""
 msgid "possible dependency cycle detected"
 msgstr ""
 
-#: lib/libalpm/deps.c:178
+#: lib/libalpm/deps.c:177
 msgid "sorting dependencies finished"
 msgstr ""
 
-#: lib/libalpm/deps.c:219 lib/libalpm/deps.c:276
+#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275
 msgid "null package found in package list"
 msgstr ""
 
-#: lib/libalpm/deps.c:224
+#: lib/libalpm/deps.c:223
 #, c-format
 msgid "cannot find package installed '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:258 lib/libalpm/deps.c:379
+#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378
 #, c-format
 msgid "checkdeps: found %s as required by %s"
 msgstr ""
 
-#: lib/libalpm/deps.c:284
+#: lib/libalpm/deps.c:283
 #, 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 ""
-
-#: lib/libalpm/deps.c:478
+#: lib/libalpm/deps.c:329
 #, c-format
-msgid "cannot find package \"%s\" or anything that provides it!"
-msgstr ""
-
-#: lib/libalpm/deps.c:483
-msgid "dep is NULL!"
+msgid "missing dependency '%s' for package '%s'"
 msgstr ""
 
-#: lib/libalpm/deps.c:498
+#: lib/libalpm/deps.c:452
 #, c-format
 msgid "excluding %s -- explicitly installed"
 msgstr ""
 
-#: lib/libalpm/deps.c:515
+#: lib/libalpm/deps.c:499
 #, c-format
-msgid "loading ALL info for '%s'"
+msgid "cannot find package \"%s\" or anything that provides it!"
 msgstr ""
 
-#: lib/libalpm/deps.c:518
+#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
 #, c-format
 msgid "adding '%s' to the targets"
 msgstr ""
 
-#: lib/libalpm/deps.c:546
+#: lib/libalpm/deps.c:551
 msgid "started resolving dependencies"
 msgstr ""
 
-#: lib/libalpm/deps.c:564
+#: lib/libalpm/deps.c:569
 #, c-format
 msgid "%s provides dependency %s -- skipping"
 msgstr ""
 
-#: lib/libalpm/deps.c:589
+#: lib/libalpm/deps.c:594
 #, c-format
 msgid ""
 "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
 msgstr ""
 
-#: lib/libalpm/deps.c:606
+#: lib/libalpm/deps.c:611
 #, c-format
 msgid "dependency %s is already in the target list -- skipping"
 msgstr ""
 
-#: lib/libalpm/deps.c:626
+#: lib/libalpm/deps.c:631
 #, c-format
 msgid "pulling dependency %s (needed by %s)"
 msgstr ""
 
-#: lib/libalpm/deps.c:630
+#: lib/libalpm/deps.c:635
 #, c-format
 msgid "cannot resolve dependencies for \"%s\""
 msgstr ""
 
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:651
 #, c-format
 msgid "dependency cycle detected: %s"
 msgstr ""
 
-#: lib/libalpm/deps.c:650
+#: lib/libalpm/deps.c:655
 msgid "finished resolving dependencies"
 msgstr ""
 
@@ -813,7 +826,7 @@ msgstr ""
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:982
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985
 msgid "could not commit transaction"
 msgstr ""
 
@@ -925,27 +938,42 @@ msgstr ""
 msgid "unexpected error"
 msgstr ""
 
+#: lib/libalpm/handle.c:164
+#, c-format
+msgid "option 'root' = %s"
+msgstr ""
+
+#: lib/libalpm/handle.c:180
+#, c-format
+msgid "option 'dbpath' = %s"
+msgstr ""
+
+#: lib/libalpm/handle.c:196
+#, c-format
+msgid "option 'cachedir' = %s"
+msgstr ""
+
 #: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398
 #, c-format
 msgid "%s can't be opened\n"
 msgstr ""
 
-#: lib/libalpm/package.c:146
+#: lib/libalpm/package.c:148
 #, c-format
 msgid "%s: forcing upgrade to version %s"
 msgstr ""
 
-#: lib/libalpm/package.c:150
+#: lib/libalpm/package.c:152
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)"
 msgstr ""
 
-#: lib/libalpm/package.c:157
+#: lib/libalpm/package.c:159
 #, c-format
 msgid "%s-%s: ignoring package upgrade (%s)"
 msgstr ""
 
-#: lib/libalpm/package.c:162
+#: lib/libalpm/package.c:163
 #, c-format
 msgid "%s-%s: delaying upgrade of package (%s)"
 msgstr ""
@@ -993,6 +1021,11 @@ msgstr ""
 msgid "missing package filelist in %s, generating one"
 msgstr ""
 
+#: lib/libalpm/package.c:547
+#, c-format
+msgid "adding '%s' in requiredby field for '%s'"
+msgstr ""
+
 #: lib/libalpm/remove.c:78
 #, c-format
 msgid "could not find %s in database"
@@ -1017,277 +1050,301 @@ msgstr ""
 msgid "finding removable dependencies"
 msgstr ""
 
-#: lib/libalpm/remove.c:178
+#: lib/libalpm/remove.c:174
 #, c-format
 msgid "cannot remove file '%s': %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:218
+#: lib/libalpm/remove.c:212
+#, c-format
+msgid "Skipping removal of '%s' due to NoUpgrade"
+msgstr ""
+
+#: lib/libalpm/remove.c:219
 #, c-format
 msgid "file %s does not exist"
 msgstr ""
 
-#: lib/libalpm/remove.c:224
+#: lib/libalpm/remove.c:226
 #, c-format
 msgid "keeping directory %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:226
+#: lib/libalpm/remove.c:228
 #, c-format
 msgid "removing directory %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:240
+#: lib/libalpm/remove.c:235
 #, c-format
-msgid "skipping removal of %s as it has moved to another package"
+msgid "%s is in trans->skip_remove, skipping removal"
 msgstr ""
 
-#: lib/libalpm/remove.c:252
+#: lib/libalpm/remove.c:246
 #, c-format
 msgid "%s saved as %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:256
+#: lib/libalpm/remove.c:249
+#, c-format
+msgid "transaction is set to NOSAVE, not backing up '%s'"
+msgstr ""
+
+#: lib/libalpm/remove.c:253
 #, c-format
 msgid "unlinking %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:263
+#: lib/libalpm/remove.c:260
 #, c-format
 msgid "cannot remove file %s: %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:291
+#: lib/libalpm/remove.c:286
 #, c-format
 msgid "removing package %s-%s"
 msgstr ""
 
-#: lib/libalpm/remove.c:303
+#: lib/libalpm/remove.c:298
 #, c-format
 msgid "not removing package '%s', can't remove all files"
 msgstr ""
 
-#: lib/libalpm/remove.c:309
+#: lib/libalpm/remove.c:304
 msgid "removing files"
 msgstr ""
 
-#: lib/libalpm/remove.c:327
+#: lib/libalpm/remove.c:322
 #, c-format
 msgid "removing database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/remove.c:329
+#: lib/libalpm/remove.c:324
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/remove.c:332
+#: lib/libalpm/remove.c:327
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr ""
 
-#: lib/libalpm/remove.c:366
-#, c-format
-msgid "could not find dependency '%s' for removal"
+#: lib/libalpm/sync.c:199
+msgid "checking for package upgrades"
 msgstr ""
 
-#: lib/libalpm/remove.c:376
+#: lib/libalpm/sync.c:232
 #, c-format
-msgid "updating 'requiredby' field for package '%s'"
-msgstr ""
-
-#: lib/libalpm/sync.c:200
-msgid "checking for package upgrades"
+msgid "%s-%s: ignoring package upgrade (%s => %s)"
 msgstr ""
 
-#: lib/libalpm/sync.c:277
+#: lib/libalpm/sync.c:281
 #, c-format
 msgid "searching for target in repo '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
+#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr ""
 
-#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
+#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:298
+#: lib/libalpm/sync.c:302
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: lib/libalpm/sync.c:332
+#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr ""
 
-#: lib/libalpm/sync.c:352
+#: lib/libalpm/sync.c:356
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr ""
 
-#: lib/libalpm/sync.c:398
+#: lib/libalpm/sync.c:401
 msgid "resolving target's dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:418
+#: lib/libalpm/sync.c:421
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr ""
 
-#: lib/libalpm/sync.c:453
+#: lib/libalpm/sync.c:456
 msgid "looking for unresolvable dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:484
+#: lib/libalpm/sync.c:487
 #, c-format
 msgid "package '%s' is conflicting with '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:506
+#: lib/libalpm/sync.c:509
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr ""
 
-#: lib/libalpm/sync.c:517
+#: lib/libalpm/sync.c:520
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:540 lib/libalpm/sync.c:545
+#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr ""
 
-#: lib/libalpm/sync.c:557 lib/libalpm/sync.c:594
+#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
 #, c-format
 msgid "removing '%s' from target list"
 msgstr ""
 
-#: lib/libalpm/sync.c:566
+#: lib/libalpm/sync.c:569
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:589
+#: lib/libalpm/sync.c:592
 #, c-format
 msgid "electing '%s' for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616
+#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
 msgid "unresolvable package conflicts detected"
 msgstr ""
 
-#: lib/libalpm/sync.c:668
+#: lib/libalpm/sync.c:671
 msgid "checking dependencies of packages designated for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:682
+#: lib/libalpm/sync.c:685
 msgid "something has gone horribly wrong"
 msgstr ""
 
-#: lib/libalpm/sync.c:701
+#: lib/libalpm/sync.c:704
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr ""
 
-#: lib/libalpm/sync.c:797
+#: lib/libalpm/sync.c:800
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:811
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:809
+#: lib/libalpm/sync.c:812
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#: lib/libalpm/sync.c:814
+#: lib/libalpm/sync.c:817
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:815
+#: lib/libalpm/sync.c:818
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: lib/libalpm/sync.c:822
+#: lib/libalpm/sync.c:825
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:851 lib/libalpm/sync.c:863
+#: 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 ""
 
-#: lib/libalpm/sync.c:882
+#: lib/libalpm/sync.c:885
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:884
+#: lib/libalpm/sync.c:887
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:905
+#: lib/libalpm/sync.c:908
 msgid "could not create removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:911
+#: lib/libalpm/sync.c:914
 msgid "could not initialize the removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:931
+#: lib/libalpm/sync.c:934
 msgid "removing conflicting and to-be-replaced packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:933
+#: lib/libalpm/sync.c:936
 msgid "could not prepare removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:939
+#: lib/libalpm/sync.c:942
 msgid "could not commit removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:946
+#: lib/libalpm/sync.c:949
 msgid "installing packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:952
 msgid "could not create transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:954
+#: lib/libalpm/sync.c:957
 msgid "could not initialize transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:977
+#: lib/libalpm/sync.c:980
 msgid "could not prepare transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:989
+#: lib/libalpm/sync.c:992
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:1018
+#: lib/libalpm/sync.c:1021
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/sync.c:1027
+#: lib/libalpm/sync.c:1030
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr ""
 
+#: lib/libalpm/trans.c:262
+msgid "updating dependency packages 'requiredby' fields"
+msgstr ""
+
+#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323
+#, c-format
+msgid "updating 'requiredby' field for package '%s'"
+msgstr ""
+
+#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333
+#, c-format
+msgid "could not update 'requiredby' database entry %s-%s"
+msgstr ""
+
+#: lib/libalpm/trans.c:315
+#, c-format
+msgid "could not find dependency '%s'"
+msgstr ""
+
 #: lib/libalpm/util.c:278
 #, c-format
 msgid "could not open %s: %s\n"