From a7d7c963579176dfefe424931a57e86bc8b51924 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Sun, 4 Mar 2007 06:28:48 +0000
Subject: * handle changes: callbacks should check handle first, as there's a
 few   occasions where some alpm stuff could be used without initializing the 
  library (vercmp is one).  TODO make these functions (handle accessors)  
 better by returning "library not initialized" instead of failing. * Removed
 NoUpgrade lines from pacman.conf - we need to test this! * Re-corrected the
 lib targets for src/util/* * make dist seems to have updated the po files

---
 src/pacman/po/pacman.pot | 145 ++++++++++++++++++++---------------------------
 1 file changed, 63 insertions(+), 82 deletions(-)

(limited to 'src/pacman/po/pacman.pot')

diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot
index 6cfe4af6..ec3effa3 100644
--- a/src/pacman/po/pacman.pot
+++ b/src/pacman/po/pacman.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-22 11:13-0500\n"
+"POT-Creation-Date: 2007-03-03 23:42-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:482 src/pacman/sync.c:531
+#: src/pacman/add.c:69 src/pacman/remove.c:79 src/pacman/sync.c:482
+#: src/pacman/sync.c:531
 #, c-format
 msgid ""
 "       if you're sure a package manager is not already running,\n"
@@ -33,10 +33,10 @@ msgstr ""
 msgid "failed to add target '%s' (%s)"
 msgstr ""
 
-#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
-#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
-#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
-#: src/pacman/trans.c:142
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:71
+#: src/pacman/trans.c:78 src/pacman/trans.c:82 src/pacman/trans.c:92
+#: src/pacman/trans.c:106 src/pacman/trans.c:120 src/pacman/trans.c:132
+#: src/pacman/trans.c:143
 msgid "done.\n"
 msgstr ""
 
@@ -45,77 +45,53 @@ msgstr ""
 msgid "failed to prepare transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/add.c:97
+#: src/pacman/add.c:101
 #, c-format
 msgid ":: %s: requires %s"
 msgstr ""
 
-#: src/pacman/add.c:118 src/pacman/sync.c:645
+#: src/pacman/add.c:122 src/pacman/sync.c:645
 #, c-format
 msgid ":: %s: conflicts with %s"
 msgstr ""
 
-#: src/pacman/add.c:127 src/pacman/sync.c:709
+#: src/pacman/add.c:131 src/pacman/sync.c:709
 #, c-format
-msgid "%s%s exists in both '%s' and '%s'\n"
+msgid "%s exists in both '%s' and '%s'\n"
 msgstr ""
 
-#: src/pacman/add.c:134 src/pacman/sync.c:716
+#: src/pacman/add.c:137 src/pacman/sync.c:715
 #, c-format
-msgid "%s: %s%s exists in filesystem\n"
+msgid "%s: %s exists in filesystem\n"
 msgstr ""
 
-#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729
+#: src/pacman/add.c:143 src/pacman/sync.c:721 src/pacman/sync.c:727
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
 msgstr ""
 
-#: src/pacman/add.c:151 src/pacman/sync.c:652
+#: src/pacman/add.c:153 src/pacman/sync.c:652
 #, c-format
 msgid ":: %.1f MB required, have %.1f MB"
 msgstr ""
 
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702
+#: src/pacman/add.c:166 src/pacman/remove.c:138 src/pacman/sync.c:702
 #, c-format
 msgid "failed to commit transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524
-#: src/pacman/sync.c:745
+#: src/pacman/add.c:176 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/sync.c:743
 #, c-format
 msgid "failed to release transaction (%s)\n"
 msgstr ""
 
-#: src/pacman/deptest.c:70
-msgid "memory allocation failure\n"
-msgstr ""
-
-#: src/pacman/deptest.c:81
-#, c-format
-msgid "add target %s\n"
-msgstr ""
-
-#: src/pacman/deptest.c:84
-#, c-format
-msgid "could not add target (%s)\n"
-msgstr ""
-
-#: src/pacman/deptest.c:103
+#: src/pacman/deptest.c:64
 #, c-format
 msgid "requires: %s"
 msgstr ""
 
-#: src/pacman/deptest.c:127
-#, c-format
-msgid "conflict: %s"
-msgstr ""
-
-#: src/pacman/deptest.c:141 src/pacman/deptest.c:159
-#, c-format
-msgid "could not release transaction (%s)"
-msgstr ""
-
 #: src/pacman/log.c:61
 #, c-format
 msgid "debug"
@@ -318,7 +294,7 @@ msgstr ""
 msgid "(none)\n"
 msgstr ""
 
-#: src/pacman/package.c:234
+#: src/pacman/package.c:243
 #, c-format
 msgid "No changelog available for '%s'.\n"
 msgstr ""
@@ -611,62 +587,62 @@ msgstr ""
 msgid "                       the terms of the GNU General Public License\n"
 msgstr ""
 
-#: src/pacman/pacman.c:298
+#: src/pacman/pacman.c:297
 #, c-format
 msgid "'%s' is not a valid debug level"
 msgstr ""
 
-#: src/pacman/pacman.c:313
+#: src/pacman/pacman.c:312
 #, c-format
 msgid "'%s' is not a valid cache directory\n"
 msgstr ""
 
-#: src/pacman/pacman.c:339
+#: src/pacman/pacman.c:330
 #, c-format
 msgid "'%s' is not a valid db path\n"
 msgstr ""
 
-#: src/pacman/pacman.c:369
+#: src/pacman/pacman.c:360
 #, c-format
 msgid "'%s' is not a valid root path\n"
 msgstr ""
 
-#: src/pacman/pacman.c:396
+#: src/pacman/pacman.c:387
 msgid "only one operation may be used at a time\n"
 msgstr ""
 
-#: src/pacman/pacman.c:442
+#: src/pacman/pacman.c:433
 msgid "warning: current locale is invalid; using default \"C\" locale"
 msgstr ""
 
-#: src/pacman/pacman.c:461
+#: src/pacman/pacman.c:452
 #, c-format
 msgid "failed to initilize alpm library (%s)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:494
+#: src/pacman/pacman.c:485
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr ""
 
-#: src/pacman/pacman.c:510
+#: src/pacman/pacman.c:501
 #, c-format
 msgid "failed to parse config (%s)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:511 src/pacman/remove.c:125 src/pacman/util.c:323
 msgid "Targets:"
 msgstr ""
 
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:517
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:533
+#: src/pacman/pacman.c:524
 msgid "no targets specified (use -h for help)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:546
+#: src/pacman/pacman.c:537
 msgid "no operation specified (use -h for help)\n"
 msgstr ""
 
@@ -907,117 +883,122 @@ msgstr ""
 msgid "Proceed with installation? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:52
+#: src/pacman/trans.c:53
 msgid "checking dependencies... "
 msgstr ""
 
-#: src/pacman/trans.c:56
+#: src/pacman/trans.c:57
 msgid "checking for file conflicts... "
 msgstr ""
 
-#: src/pacman/trans.c:60
+#: src/pacman/trans.c:61
 msgid "cleaning up... "
 msgstr ""
 
-#: src/pacman/trans.c:63
+#: src/pacman/trans.c:64
 msgid "resolving dependencies... "
 msgstr ""
 
-#: src/pacman/trans.c:66
+#: src/pacman/trans.c:67
 msgid "looking for inter-conflicts... "
 msgstr ""
 
-#: src/pacman/trans.c:86
+#: src/pacman/trans.c:87
 #, c-format
 msgid "installing %s... "
 msgstr ""
 
-#: src/pacman/trans.c:93
+#: src/pacman/trans.c:94
 #, c-format
 msgid "installed %s (%s)"
 msgstr ""
 
-#: src/pacman/trans.c:100
+#: src/pacman/trans.c:101
 #, c-format
 msgid "removing %s... "
 msgstr ""
 
-#: src/pacman/trans.c:107
+#: src/pacman/trans.c:108
 #, c-format
 msgid "removed %s (%s)"
 msgstr ""
 
-#: src/pacman/trans.c:114
+#: src/pacman/trans.c:115
 #, c-format
 msgid "upgrading %s... "
 msgstr ""
 
-#: src/pacman/trans.c:121
+#: src/pacman/trans.c:122
 #, c-format
 msgid "upgraded %s (%s -> %s)"
 msgstr ""
 
-#: src/pacman/trans.c:128
+#: src/pacman/trans.c:129
 msgid "checking package integrity... "
 msgstr ""
 
-#: src/pacman/trans.c:144
+#: src/pacman/trans.c:145
 msgid "failed.\n"
 msgstr ""
 
-#: src/pacman/trans.c:151
+#: src/pacman/trans.c:152
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
 msgstr ""
 
-#: src/pacman/trans.c:171
+#: src/pacman/trans.c:172
 #, c-format
 msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:185
+#: src/pacman/trans.c:177
+#, c-format
+msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] "
+msgstr ""
+
+#: src/pacman/trans.c:190
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:198
+#: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:213
+#: src/pacman/trans.c:218
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:229
+#: src/pacman/trans.c:234
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:247
+#: src/pacman/trans.c:252
 #, c-format
 msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:265
+#: src/pacman/trans.c:270
 #, c-format
 msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
 msgstr ""
 
-#: src/pacman/trans.c:319
+#: src/pacman/trans.c:326
 msgid "installing"
 msgstr ""
 
-#: src/pacman/trans.c:322
+#: src/pacman/trans.c:329
 msgid "upgrading"
 msgstr ""
 
-#: src/pacman/trans.c:325
+#: src/pacman/trans.c:332
 msgid "removing"
 msgstr ""
 
-#: src/pacman/trans.c:328
+#: src/pacman/trans.c:335
 msgid "checking for file conflicts"
 msgstr ""
 
-- 
cgit v1.2.3-24-g4f1b