From 8cb0758beb5f24ffc827925bbbc3841ca511dc86 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 12 Feb 2007 15:39:29 +0000
Subject: * Fixed an i18n bug; length of description string was hardcoded
 previously;   now uses an strlen call. * Updates of the *.pot files.

---
 lib/libalpm/po/libalpm.pot | 460 ++++++++++++++++++++++++---------------------
 1 file changed, 244 insertions(+), 216 deletions(-)

(limited to 'lib/libalpm/po')

diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 33bc7fe4..2ffa3c15 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-06 20:43-0500\n"
+"POT-Creation-Date: 2007-02-12 10:35-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"
@@ -45,7 +45,7 @@ msgstr ""
 msgid "looking for unsatisfied dependencies"
 msgstr ""
 
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:476
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:475
 msgid "looking for conflicts"
 msgstr ""
 
@@ -61,222 +61,222 @@ msgstr ""
 msgid "looking for file conflicts"
 msgstr ""
 
-#: lib/libalpm/add.c:391
+#: lib/libalpm/add.c:394
 #, c-format
 msgid "upgrading package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:401 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
+#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
 #, c-format
 msgid "loading FILES info for '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:423
+#: lib/libalpm/add.c:426
 #, c-format
 msgid "removing old package first (%s-%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:453
+#: lib/libalpm/add.c:456
 #, c-format
 msgid "adding package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:467
 #, c-format
 msgid "adding new package %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:468
+#: lib/libalpm/add.c:471
 msgid "extracting files"
 msgstr ""
 
-#: lib/libalpm/add.c:483 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:487 lib/libalpm/util.c:461
 msgid "could not get current working directory"
 msgstr ""
 
-#: lib/libalpm/add.c:529
+#: lib/libalpm/add.c:545
 #, c-format
 msgid "notice: %s is in NoExtract -- skipping extraction"
 msgstr ""
 
-#: lib/libalpm/add.c:565 lib/libalpm/add.c:718
+#: lib/libalpm/add.c:581 lib/libalpm/add.c:734
 #, c-format
 msgid "could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:608
+#: lib/libalpm/add.c:624
 #, c-format
 msgid "checking md5 hashes for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:609 lib/libalpm/add.c:616
+#: lib/libalpm/add.c:625 lib/libalpm/add.c:632
 #, c-format
 msgid "current:  %s"
 msgstr ""
 
-#: lib/libalpm/add.c:610 lib/libalpm/add.c:617
+#: lib/libalpm/add.c:626 lib/libalpm/add.c:633
 #, c-format
 msgid "new:      %s"
 msgstr ""
 
-#: lib/libalpm/add.c:612 lib/libalpm/add.c:619
+#: lib/libalpm/add.c:628 lib/libalpm/add.c:635
 #, c-format
 msgid "original: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:615
+#: lib/libalpm/add.c:631
 #, c-format
 msgid "checking sha1 hashes for %s"
 msgstr ""
 
-#: lib/libalpm/add.c:633
+#: lib/libalpm/add.c:649
 #, c-format
 msgid "could not rename %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:634
+#: lib/libalpm/add.c:650
 #, c-format
 msgid "error: could not rename %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:638 lib/libalpm/add.c:682
+#: lib/libalpm/add.c:654 lib/libalpm/add.c:698
 #, c-format
 msgid "could not copy %s to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:639
+#: lib/libalpm/add.c:655
 #, c-format
 msgid "error: could not copy %s to %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:659
 #, c-format
 msgid "%s saved as %s.pacorig"
 msgstr ""
 
-#: lib/libalpm/add.c:644
+#: lib/libalpm/add.c:660
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:654 lib/libalpm/add.c:657 lib/libalpm/add.c:663
+#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679
 msgid "action: installing new file"
 msgstr ""
 
-#: lib/libalpm/add.c:661
+#: lib/libalpm/add.c:677
 msgid "action: leaving existing file in place"
 msgstr ""
 
-#: lib/libalpm/add.c:667
+#: lib/libalpm/add.c:683
 msgid "action: keeping current file and installing new one with .pacnew ending"
 msgstr ""
 
-#: lib/libalpm/add.c:671
+#: lib/libalpm/add.c:687
 #, c-format
 msgid "could not install %s as %s: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:672
+#: lib/libalpm/add.c:688
 #, c-format
 msgid "error: could not install %s as %s: %s"
 msgstr ""
 
-#: lib/libalpm/add.c:674
+#: lib/libalpm/add.c:690
 #, c-format
 msgid "%s installed as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:675
+#: lib/libalpm/add.c:691
 #, c-format
 msgid "warning: %s installed as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:680 lib/libalpm/add.c:700
+#: lib/libalpm/add.c:696 lib/libalpm/add.c:716
 #, c-format
 msgid "extracting %s"
 msgstr ""
 
-#: lib/libalpm/add.c:702
+#: lib/libalpm/add.c:718
 #, c-format
 msgid "%s is in NoUpgrade -- skipping"
 msgstr ""
 
-#: lib/libalpm/add.c:704
+#: lib/libalpm/add.c:720
 #, c-format
 msgid "extracting %s as %s.pacnew"
 msgstr ""
 
-#: lib/libalpm/add.c:705
+#: lib/libalpm/add.c:721
 #, c-format
 msgid "warning: extracting %s%s as %s"
 msgstr ""
 
-#: lib/libalpm/add.c:719
+#: lib/libalpm/add.c:735
 #, c-format
 msgid "error: could not extract %s (%s)"
 msgstr ""
 
-#: lib/libalpm/add.c:729
+#: lib/libalpm/add.c:745
 msgid "appending backup entry"
 msgstr ""
 
-#: lib/libalpm/add.c:760 lib/libalpm/add.c:762
+#: lib/libalpm/add.c:776 lib/libalpm/add.c:778
 #, c-format
 msgid "errors occurred while %s %s"
 msgstr ""
 
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
 msgid "upgrading"
 msgstr ""
 
-#: lib/libalpm/add.c:761 lib/libalpm/add.c:763
+#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
 msgid "installing"
 msgstr ""
 
-#: lib/libalpm/add.c:784 lib/libalpm/add.c:840
+#: lib/libalpm/add.c:800 lib/libalpm/add.c:856
 #, c-format
 msgid "adding '%s' in requiredby field for '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:795 lib/libalpm/remove.c:293
+#: lib/libalpm/add.c:811 lib/libalpm/remove.c:334
 msgid "updating database"
 msgstr ""
 
-#: lib/libalpm/add.c:796
+#: lib/libalpm/add.c:812
 #, c-format
 msgid "adding database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:798
+#: lib/libalpm/add.c:814
 #, c-format
 msgid "could not update database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:800
+#: lib/libalpm/add.c:816
 #, c-format
 msgid "error updating database for %s-%s!"
 msgstr ""
 
-#: lib/libalpm/add.c:804
+#: lib/libalpm/add.c:820
 #, c-format
 msgid "could not add entry '%s' in cache"
 msgstr ""
 
-#: lib/libalpm/add.c:810 lib/libalpm/remove.c:303
+#: lib/libalpm/add.c:826 lib/libalpm/remove.c:344
 msgid "updating dependency packages 'requiredby' fields"
 msgstr ""
 
-#: lib/libalpm/add.c:832
+#: lib/libalpm/add.c:848
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr ""
 
-#: lib/libalpm/add.c:843 lib/libalpm/remove.c:345
+#: lib/libalpm/add.c:859 lib/libalpm/remove.c:386
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/add.c:870 lib/libalpm/remove.c:358 lib/libalpm/sync.c:1046
+#: lib/libalpm/add.c:885 lib/libalpm/remove.c:399 lib/libalpm/sync.c:1045
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr ""
@@ -362,185 +362,170 @@ msgstr ""
 msgid "md5sums do not match for package %s-%s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:791
+#: lib/libalpm/alpm.c:790
 #, c-format
 msgid "could not remove lock file %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:792
+#: lib/libalpm/alpm.c:791
 #, c-format
 msgid "warning: could not remove lock file %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:929
+#: lib/libalpm/alpm.c:926
 #, c-format
 msgid "config: new section '%s'"
 msgstr ""
 
-#: lib/libalpm/alpm.c:958
+#: lib/libalpm/alpm.c:955
 msgid "config: nopassiveftp"
 msgstr ""
 
-#: lib/libalpm/alpm.c:961
+#: lib/libalpm/alpm.c:958
 msgid "config: usesyslog"
 msgstr ""
 
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:961
 msgid "config: chomp"
 msgstr ""
 
-#: lib/libalpm/alpm.c:967
+#: lib/libalpm/alpm.c:964
 msgid "config: usecolor"
 msgstr ""
 
-#: lib/libalpm/alpm.c:976
+#: lib/libalpm/alpm.c:973
 #, c-format
 msgid "config: including %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991
+#: lib/libalpm/alpm.c:983 lib/libalpm/alpm.c:988
 #, c-format
 msgid "config: noupgrade: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004
+#: lib/libalpm/alpm.c:996 lib/libalpm/alpm.c:1001
 #, c-format
 msgid "config: noextract: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017
+#: lib/libalpm/alpm.c:1009 lib/libalpm/alpm.c:1014
 #, c-format
 msgid "config: ignorepkg: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1025 lib/libalpm/alpm.c:1030
+#: lib/libalpm/alpm.c:1022 lib/libalpm/alpm.c:1027
 #, c-format
 msgid "config: holdpkg: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1034
 #, c-format
 msgid "config: dbpath: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1044
+#: lib/libalpm/alpm.c:1041
 #, c-format
 msgid "config: cachedir: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1047
+#: lib/libalpm/alpm.c:1044
 #, c-format
 msgid "config: logfile: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1050
+#: lib/libalpm/alpm.c:1047
 #, c-format
 msgid "config: xfercommand: %s"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1055
+#: lib/libalpm/alpm.c:1052
 #, c-format
 msgid "config: upgradedelay: %d"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
 msgid "checking for package replacements"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1100 lib/libalpm/sync.c:138
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1105 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1102 lib/libalpm/sync.c:140
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1139 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:174
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1161 lib/libalpm/sync.c:212
+#: lib/libalpm/alpm.c:1157 lib/libalpm/sync.c:211
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1175 lib/libalpm/sync.c:226 lib/libalpm/sync.c:502
+#: lib/libalpm/alpm.c:1171 lib/libalpm/sync.c:225 lib/libalpm/sync.c:501
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr ""
 
-#: lib/libalpm/alpm.c:1185 lib/libalpm/package.c:144
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1191 lib/libalpm/package.c:149
-#, c-format
-msgid "%s-%s: ignoring package upgrade (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1195 lib/libalpm/package.c:154
-#, c-format
-msgid "%s-%s: delaying upgrade of package (%s)"
-msgstr ""
-
-#: lib/libalpm/alpm.c:1199 lib/libalpm/sync.c:233
+#: lib/libalpm/alpm.c:1177 lib/libalpm/sync.c:232
 #, c-format
 msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr ""
 
-#: lib/libalpm/be_files.c:59
+#: lib/libalpm/be_files.c:58
 #, c-format
 msgid "unpacking database '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:183
+#: lib/libalpm/be_files.c:182
 #, c-format
 msgid "invalid name for dabatase entry '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:211
+#: lib/libalpm/be_files.c:210
 msgid "invalid package entry provided to _alpm_db_read, skipping"
 msgstr ""
 
-#: lib/libalpm/be_files.c:216
+#: lib/libalpm/be_files.c:215
 #, c-format
 msgid ""
 "request to read database info for a file-based package '%s', skipping..."
 msgstr ""
 
-#: lib/libalpm/be_files.c:224
+#: lib/libalpm/be_files.c:223
 #, c-format
 msgid "loading package data for %s : level=%d"
 msgstr ""
 
-#: lib/libalpm/be_files.c:232
+#: lib/libalpm/be_files.c:231
 #, c-format
 msgid "cannot find '%s-%s' in db '%s'"
 msgstr ""
 
-#: lib/libalpm/be_files.c:240 lib/libalpm/be_files.c:384
-#: lib/libalpm/be_files.c:407 lib/libalpm/be_files.c:495
-#: lib/libalpm/be_files.c:581 lib/libalpm/be_files.c:608
-#: lib/libalpm/package.c:185
+#: lib/libalpm/be_files.c:239 lib/libalpm/be_files.c:383
+#: lib/libalpm/be_files.c:406 lib/libalpm/be_files.c:494
+#: lib/libalpm/be_files.c:580 lib/libalpm/be_files.c:607
+#: lib/libalpm/package.c:194
 #, c-format
 msgid "could not open file %s: %s"
 msgstr ""
 
-#: lib/libalpm/be_files.c:492
+#: lib/libalpm/be_files.c:491
 #, c-format
 msgid "writing %s-%s DESC information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:578
+#: lib/libalpm/be_files.c:577
 #, c-format
 msgid "writing %s-%s FILES information back to db"
 msgstr ""
 
-#: lib/libalpm/be_files.c:605
+#: lib/libalpm/be_files.c:604
 #, c-format
 msgid "writing %s-%s DEPENDS information back to db"
 msgstr ""
@@ -607,8 +592,8 @@ msgstr ""
 
 #: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
 #: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:74 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:607 lib/libalpm/sync.c:623 lib/libalpm/sync.c:719
+#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
+#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:718
 #: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
@@ -755,11 +740,11 @@ msgid "insufficient privileges"
 msgstr ""
 
 #: lib/libalpm/error.c:40
-msgid "wrong or NULL argument passed"
+msgid "could not find or read file"
 msgstr ""
 
 #: lib/libalpm/error.c:42
-msgid "could not find or read file"
+msgid "wrong or NULL argument passed"
 msgstr ""
 
 #: lib/libalpm/error.c:45
@@ -802,135 +787,147 @@ msgstr ""
 msgid "could not remove database entry"
 msgstr ""
 
-#: lib/libalpm/error.c:71
-msgid "could not set parameter"
+#: lib/libalpm/error.c:67
+msgid "invalid url for server"
 msgstr ""
 
-#: lib/libalpm/error.c:74 lib/libalpm/error.c:80
-msgid "transaction not initialized"
+#: lib/libalpm/error.c:74
+msgid "could not set parameter"
 msgstr ""
 
-#: lib/libalpm/error.c:76
+#: lib/libalpm/error.c:77
 msgid "transaction already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:78
+#: lib/libalpm/error.c:79 lib/libalpm/error.c:83
+msgid "transaction not initialized"
+msgstr ""
+
+#: lib/libalpm/error.c:81
 msgid "duplicate target"
 msgstr ""
 
-#: lib/libalpm/error.c:82
+#: lib/libalpm/error.c:85
 msgid "transaction not prepared"
 msgstr ""
 
-#: lib/libalpm/error.c:84
+#: lib/libalpm/error.c:87
 msgid "transaction aborted"
 msgstr ""
 
-#: lib/libalpm/error.c:86
+#: lib/libalpm/error.c:89
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: lib/libalpm/error.c:89
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:984
+msgid "could not commit transaction"
+msgstr ""
+
+#: lib/libalpm/error.c:93
+msgid "could not download all files"
+msgstr ""
+
+#: lib/libalpm/error.c:96
 msgid "could not find or read package"
 msgstr ""
 
-#: lib/libalpm/error.c:91
+#: lib/libalpm/error.c:98
 msgid "invalid or corrupted package"
 msgstr ""
 
-#: lib/libalpm/error.c:93
+#: lib/libalpm/error.c:100
 msgid "cannot open package file"
 msgstr ""
 
-#: lib/libalpm/error.c:95
+#: lib/libalpm/error.c:102
 msgid "cannot load package data"
 msgstr ""
 
-#: lib/libalpm/error.c:97
+#: lib/libalpm/error.c:104
 msgid "package already installed"
 msgstr ""
 
-#: lib/libalpm/error.c:99
+#: lib/libalpm/error.c:106
 msgid "package not installed or lesser version"
 msgstr ""
 
-#: lib/libalpm/error.c:101
+#: lib/libalpm/error.c:108
+msgid "cannot remove all files for package"
+msgstr ""
+
+#: lib/libalpm/error.c:110
 msgid "package name is not valid"
 msgstr ""
 
-#: lib/libalpm/error.c:103
+#: lib/libalpm/error.c:112
 msgid "corrupted package"
 msgstr ""
 
-#: lib/libalpm/error.c:105
+#: lib/libalpm/error.c:114
 msgid "no such repository"
 msgstr ""
 
-#: lib/libalpm/error.c:108
+#: lib/libalpm/error.c:117
 msgid "group not found"
 msgstr ""
 
-#: lib/libalpm/error.c:111
+#: lib/libalpm/error.c:120
 msgid "could not satisfy dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:113
+#: lib/libalpm/error.c:122
 msgid "conflicting dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:115
+#: lib/libalpm/error.c:124
 msgid "conflicting files"
 msgstr ""
 
-#: lib/libalpm/error.c:118
-msgid "user aborted"
+#: lib/libalpm/error.c:127
+msgid "user aborted the operation"
 msgstr ""
 
-#: lib/libalpm/error.c:120
-msgid "libarchive error"
+#: lib/libalpm/error.c:129
+msgid "internal error"
 msgstr ""
 
-#: lib/libalpm/error.c:122
-msgid "internal error"
+#: lib/libalpm/error.c:131
+msgid "libarchive error"
 msgstr ""
 
-#: lib/libalpm/error.c:124
-msgid "not enough space"
+#: lib/libalpm/error.c:133
+msgid "not enough space on disk"
 msgstr ""
 
-#: lib/libalpm/error.c:126
+#: lib/libalpm/error.c:136
 msgid "not confirmed"
 msgstr ""
 
-#: lib/libalpm/error.c:129
-msgid "bad section name"
+#: lib/libalpm/error.c:139
+msgid "bad configuration section name"
 msgstr ""
 
-#: lib/libalpm/error.c:131
-msgid "'local' is reserved and cannot be used as a package tree"
+#: lib/libalpm/error.c:141
+msgid "'local' is reserved and cannot be used as a repository name"
 msgstr ""
 
-#: lib/libalpm/error.c:133
-msgid "syntax error"
+#: lib/libalpm/error.c:143
+msgid "syntax error in config file"
 msgstr ""
 
-#: lib/libalpm/error.c:135
+#: lib/libalpm/error.c:145
 msgid "all directives must belong to a section"
 msgstr ""
 
-#: lib/libalpm/error.c:137
+#: lib/libalpm/error.c:147
 msgid "invalid regular expression"
 msgstr ""
 
-#: lib/libalpm/error.c:139
+#: lib/libalpm/error.c:150
 msgid "connection to remote host failed"
 msgstr ""
 
-#: lib/libalpm/error.c:141
-msgid "forking process failed"
-msgstr ""
-
-#: lib/libalpm/error.c:143
+#: lib/libalpm/error.c:153
 msgid "unexpected error"
 msgstr ""
 
@@ -939,40 +936,65 @@ msgstr ""
 msgid "%s can't be opened\n"
 msgstr ""
 
-#: lib/libalpm/package.c:202 lib/libalpm/package.c:262
+#: lib/libalpm/package.c:146
+#, c-format
+msgid "%s: forcing upgrade to version %s"
+msgstr ""
+
+#: lib/libalpm/package.c:150
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:155
+#, c-format
+msgid "%s-%s: ignoring package upgrade (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:160
+#, c-format
+msgid "%s-%s: delaying upgrade of package (%s)"
+msgstr ""
+
+#: lib/libalpm/package.c:165
+#, c-format
+msgid "compare versions for %s: %s vs %s, result=%d"
+msgstr ""
+
+#: lib/libalpm/package.c:208 lib/libalpm/package.c:263
 #, c-format
 msgid "%s: syntax error in description file line %d"
 msgstr ""
 
-#: lib/libalpm/package.c:331
+#: lib/libalpm/package.c:337
 msgid "could not parse the package description file"
 msgstr ""
 
-#: lib/libalpm/package.c:335
+#: lib/libalpm/package.c:341
 #, c-format
 msgid "missing package name in %s"
 msgstr ""
 
-#: lib/libalpm/package.c:339
+#: lib/libalpm/package.c:345
 #, c-format
 msgid "missing package version in %s"
 msgstr ""
 
-#: lib/libalpm/package.c:374
+#: lib/libalpm/package.c:380
 #, c-format
 msgid "could not remove tempfile %s"
 msgstr ""
 
-#: lib/libalpm/package.c:387 lib/libalpm/package.c:394
+#: lib/libalpm/package.c:393 lib/libalpm/package.c:400
 #, c-format
 msgid "error while reading package: %s"
 msgstr ""
 
-#: lib/libalpm/package.c:400
+#: lib/libalpm/package.c:406
 msgid "missing package metadata"
 msgstr ""
 
-#: lib/libalpm/package.c:407
+#: lib/libalpm/package.c:413
 #, c-format
 msgid "missing package filelist in %s, generating one"
 msgstr ""
@@ -1001,71 +1023,81 @@ msgstr ""
 msgid "finding removable dependencies"
 msgstr ""
 
-#: lib/libalpm/remove.c:193
+#: lib/libalpm/remove.c:186
+#, c-format
+msgid "cannot remove file '%s': %s"
+msgstr ""
+
+#: lib/libalpm/remove.c:226
 #, c-format
 msgid "file %s does not exist"
 msgstr ""
 
-#: lib/libalpm/remove.c:199
+#: lib/libalpm/remove.c:232
 #, c-format
 msgid "keeping directory %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:201
+#: lib/libalpm/remove.c:234
 #, c-format
 msgid "removing directory %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:215
+#: lib/libalpm/remove.c:248
 #, c-format
 msgid "skipping removal of %s as it has moved to another package"
 msgstr ""
 
-#: lib/libalpm/remove.c:227
+#: lib/libalpm/remove.c:260
 #, c-format
 msgid "%s saved as %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:231
+#: lib/libalpm/remove.c:264
 #, c-format
 msgid "unlinking %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:237
+#: lib/libalpm/remove.c:271
 #, c-format
 msgid "cannot remove file %s: %s"
 msgstr ""
 
-#: lib/libalpm/remove.c:265
+#: lib/libalpm/remove.c:299
 #, c-format
 msgid "removing package %s-%s"
 msgstr ""
 
-#: lib/libalpm/remove.c:276
+#: lib/libalpm/remove.c:311
+#, c-format
+msgid "not removing package '%s', can't remove all files"
+msgstr ""
+
+#: lib/libalpm/remove.c:317
 msgid "removing files"
 msgstr ""
 
-#: lib/libalpm/remove.c:294
+#: lib/libalpm/remove.c:335
 #, c-format
 msgid "removing database entry '%s'"
 msgstr ""
 
-#: lib/libalpm/remove.c:296
+#: lib/libalpm/remove.c:337
 #, c-format
 msgid "could not remove database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/remove.c:299
+#: lib/libalpm/remove.c:340
 #, c-format
 msgid "could not remove entry '%s' from cache"
 msgstr ""
 
-#: lib/libalpm/remove.c:333
+#: lib/libalpm/remove.c:374
 #, c-format
 msgid "could not find dependency '%s' for removal"
 msgstr ""
 
-#: lib/libalpm/remove.c:343
+#: lib/libalpm/remove.c:384
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr ""
@@ -1074,194 +1106,190 @@ msgstr ""
 msgid "checking for package upgrades"
 msgstr ""
 
-#: lib/libalpm/sync.c:278
+#: lib/libalpm/sync.c:277
 #, c-format
 msgid "searching for target in repo '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:287 lib/libalpm/sync.c:310
+#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr ""
 
-#: lib/libalpm/sync.c:292 lib/libalpm/sync.c:315
+#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:299
+#: lib/libalpm/sync.c:298
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: lib/libalpm/sync.c:333
+#: lib/libalpm/sync.c:332
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr ""
 
-#: lib/libalpm/sync.c:353
+#: lib/libalpm/sync.c:352
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr ""
 
-#: lib/libalpm/sync.c:401
+#: lib/libalpm/sync.c:400
 msgid "resolving target's dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:421
+#: lib/libalpm/sync.c:420
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr ""
 
-#: lib/libalpm/sync.c:456
+#: lib/libalpm/sync.c:455
 msgid "looking for unresolvable dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:487
+#: lib/libalpm/sync.c:486
 #, c-format
 msgid "package '%s' is conflicting with '%s'"
 msgstr ""
 
-#: lib/libalpm/sync.c:509
+#: lib/libalpm/sync.c:508
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr ""
 
-#: lib/libalpm/sync.c:520
+#: lib/libalpm/sync.c:519
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
+#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr ""
 
-#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
+#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
 #, c-format
 msgid "removing '%s' from target list"
 msgstr ""
 
-#: lib/libalpm/sync.c:569
+#: lib/libalpm/sync.c:568
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr ""
 
-#: lib/libalpm/sync.c:592
+#: lib/libalpm/sync.c:591
 #, c-format
 msgid "electing '%s' for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
+#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
 msgid "unresolvable package conflicts detected"
 msgstr ""
 
-#: lib/libalpm/sync.c:671
+#: lib/libalpm/sync.c:670
 msgid "checking dependencies of packages designated for removal"
 msgstr ""
 
-#: lib/libalpm/sync.c:685
+#: lib/libalpm/sync.c:684
 msgid "something has gone horribly wrong"
 msgstr ""
 
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:703
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr ""
 
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:799
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:810
 #, c-format
 msgid "no %s cache exists.  creating...\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:811
 #, c-format
 msgid "warning: no %s cache exists.  creating..."
 msgstr ""
 
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:816
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:818
+#: lib/libalpm/sync.c:817
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:824
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
+#: lib/libalpm/sync.c:853 lib/libalpm/sync.c:865
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:885
+#: lib/libalpm/sync.c:884
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:887
+#: lib/libalpm/sync.c:886
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:908
+#: lib/libalpm/sync.c:907
 msgid "could not create removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:914
+#: lib/libalpm/sync.c:913
 msgid "could not initialize the removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:934
+#: lib/libalpm/sync.c:933
 msgid "removing conflicting and to-be-replaced packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:936
+#: lib/libalpm/sync.c:935
 msgid "could not prepare removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:942
+#: lib/libalpm/sync.c:941
 msgid "could not commit removal transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:948
 msgid "installing packages"
 msgstr ""
 
-#: lib/libalpm/sync.c:952
+#: lib/libalpm/sync.c:951
 msgid "could not create transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:957
+#: lib/libalpm/sync.c:956
 msgid "could not initialize transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:980
+#: lib/libalpm/sync.c:979
 msgid "could not prepare transaction"
 msgstr ""
 
-#: lib/libalpm/sync.c:985
-msgid "could not commit transaction"
-msgstr ""
-
-#: lib/libalpm/sync.c:992
+#: lib/libalpm/sync.c:991
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 
-#: lib/libalpm/sync.c:1021
+#: lib/libalpm/sync.c:1020
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""
 
-#: lib/libalpm/sync.c:1030
+#: lib/libalpm/sync.c:1029
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr ""
-- 
cgit v1.2.3-70-g09d2