From d37ad048732fbcef38aec001993553896dbe4198 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sun, 15 Oct 2006 19:31:03 +0000 Subject: Merged frugalware changes (too many to list). Also added some config file handling changes (support [sections] to carry over to included files - this helps with backwards compatibility with existing pacman config files) --- lib/libalpm/po/LINGUAS | 3 + lib/libalpm/po/Makefile.in.in | 5 +- lib/libalpm/po/Makevars | 4 +- lib/libalpm/po/POTFILES.in | 1 + lib/libalpm/po/libalpm.pot | 746 +++++++++++++++++++++++++++++------------- 5 files changed, 522 insertions(+), 237 deletions(-) (limited to 'lib/libalpm/po') diff --git a/lib/libalpm/po/LINGUAS b/lib/libalpm/po/LINGUAS index cd849b16..cc891622 100644 --- a/lib/libalpm/po/LINGUAS +++ b/lib/libalpm/po/LINGUAS @@ -3,3 +3,6 @@ # This file is in the public domain. # # Set of available languages. +de +fr +hu diff --git a/lib/libalpm/po/Makefile.in.in b/lib/libalpm/po/Makefile.in.in index dd08e989..6f2e2e94 100644 --- a/lib/libalpm/po/Makefile.in.in +++ b/lib/libalpm/po/Makefile.in.in @@ -18,19 +18,18 @@ SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = @top_srcdir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ datadir = @datadir@ +datarootdir = @datarootdir@ localedir = $(datadir)/locale gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) +mkinstalldirs = @INSTALL@ -d GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ diff --git a/lib/libalpm/po/Makevars b/lib/libalpm/po/Makevars index 12e3233f..8499e269 100644 --- a/lib/libalpm/po/Makevars +++ b/lib/libalpm/po/Makevars @@ -20,7 +20,7 @@ XGETTEXT_OPTIONS = \ # 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 = Judd Vinet +COPYRIGHT_HOLDER = Yoyodyne, Inc. # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: @@ -36,7 +36,7 @@ COPYRIGHT_HOLDER = Judd Vinet # 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 = pacman-dev@archlinux.org +MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.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 804d6270..093b3baa 100644 --- a/lib/libalpm/po/POTFILES.in +++ b/lib/libalpm/po/POTFILES.in @@ -16,6 +16,7 @@ md5driver.c package.c provide.c remove.c +sha1.c sync.c trans.c util.c diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index 03bc06ad..2b294973 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: \n" -"POT-Creation-Date: 2006-05-31 12:01-0700\n" +"POT-Creation-Date: 2006-09-03 13:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,281 +16,334 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../add.c:85 +#: ../add.c:95 #, c-format msgid "could not parse token %s" msgstr "" -#: ../add.c:117 +#: ../add.c:127 #, c-format msgid "loading target '%s'" msgstr "" -#: ../add.c:159 +#: ../add.c:169 #, c-format msgid "replacing older version %s-%s by %s in target list" msgstr "" -#: ../add.c:168 +#: ../add.c:178 #, c-format msgid "newer version %s-%s is in the target list -- skipping" msgstr "" -#: ../add.c:175 +#: ../add.c:185 #, c-format msgid "reading '%s' metadata" msgstr "" #. look for unsatisfied dependencies -#: ../add.c:214 ../remove.c:83 +#: ../add.c:227 ../remove.c:104 msgid "looking for unsatisfied dependencies" msgstr "" #. no unsatisfied deps, so look for conflicts -#: ../add.c:226 ../sync.c:449 +#: ../add.c:239 ../sync.c:504 msgid "looking for conflicts" msgstr "" #. re-order w.r.t. dependencies -#: ../add.c:238 ../remove.c:119 +#: ../add.c:251 ../remove.c:140 msgid "sorting by dependencies" msgstr "" -#: ../add.c:254 +#: ../add.c:263 +msgid "cleaning up" +msgstr "" + +#: ../add.c:280 msgid "looking for file conflicts" msgstr "" -#: ../add.c:310 +#: ../add.c:345 #, c-format msgid "upgrading package %s-%s" msgstr "" -#: ../add.c:316 ../alpm.c:447 ../conflict.c:273 ../conflict.c:303 +#: ../add.c:355 ../alpm.c:567 ../conflict.c:274 ../conflict.c:304 #, c-format msgid "loading FILES info for '%s'" msgstr "" -#: ../add.c:324 ../alpm.c:427 ../alpm.c:555 +#: ../add.c:365 ../alpm.c:547 ../alpm.c:679 ../alpm.c:726 #, c-format msgid "loading DESC info for '%s'" msgstr "" -#: ../add.c:336 +#: ../add.c:378 #, c-format msgid "removing old package first (%s-%s)" msgstr "" -#: ../add.c:365 +#: ../add.c:408 #, c-format msgid "adding package %s-%s" msgstr "" -#: ../add.c:372 +#: ../add.c:419 #, c-format msgid "adding new package %s-%s" msgstr "" -#: ../add.c:376 +#: ../add.c:423 msgid "extracting files" msgstr "" -#: ../add.c:411 +#: ../add.c:438 ../util.c:456 +msgid "could not get current working directory" +msgstr "" + +#: ../add.c:492 #, c-format msgid "notice: %s is in NoExtract -- skipping extraction" msgstr "" -#: ../add.c:442 ../add.c:561 ../util.c:235 +#: ../add.c:528 ../add.c:681 #, c-format msgid "could not extract %s (%s)" msgstr "" -#: ../add.c:473 +#: ../add.c:571 #, c-format msgid "checking md5 hashes for %s" msgstr "" -#: ../add.c:474 +#: ../add.c:572 ../add.c:579 #, c-format msgid "current: %s" msgstr "" -#: ../add.c:475 +#: ../add.c:573 ../add.c:580 #, c-format msgid "new: %s" msgstr "" -#: ../add.c:477 +#: ../add.c:575 ../add.c:582 #, c-format msgid "original: %s" msgstr "" -#: ../add.c:489 +#: ../add.c:578 +#, c-format +msgid "checking sha1 hashes for %s" +msgstr "" + +#: ../add.c:596 #, c-format msgid "could not rename %s (%s)" msgstr "" -#: ../add.c:490 +#: ../add.c:597 #, c-format msgid "error: could not rename %s (%s)" msgstr "" -#: ../add.c:493 ../add.c:530 +#: ../add.c:601 ../add.c:645 #, c-format msgid "could not copy %s to %s (%s)" msgstr "" -#: ../add.c:494 +#: ../add.c:602 #, c-format msgid "error: could not copy %s to %s (%s)" msgstr "" -#: ../add.c:497 +#: ../add.c:606 #, c-format msgid "%s saved as %s.pacorig" msgstr "" -#: ../add.c:498 +#: ../add.c:607 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: ../add.c:508 ../add.c:511 ../add.c:517 +#: ../add.c:617 ../add.c:620 ../add.c:626 msgid "action: installing new file" msgstr "" -#: ../add.c:515 +#: ../add.c:624 msgid "action: leaving existing file in place" msgstr "" -#: ../add.c:520 -msgid "action: leaving file in place, installing new one as .pacnew" +#: ../add.c:630 +msgid "action: keeping current file and installing new one with .pacnew ending" msgstr "" -#: ../add.c:523 ../add.c:548 +#: ../add.c:634 #, c-format -msgid "extracting %s as %s.pacnew" +msgid "could not install %s as %s: %s" msgstr "" -#: ../add.c:524 ../add.c:549 +#: ../add.c:635 #, c-format -msgid "warning: extracting %s%s as %s" +msgid "error: could not install %s as %s: %s" msgstr "" -#: ../add.c:528 ../add.c:544 +#: ../add.c:637 +#, c-format +msgid "%s installed as %s" +msgstr "" + +#: ../add.c:638 +#, c-format +msgid "warning: %s installed as %s" +msgstr "" + +#: ../add.c:643 ../add.c:663 #, c-format msgid "extracting %s" msgstr "" -#: ../add.c:546 +#: ../add.c:665 #, c-format msgid "%s is in NoUpgrade -- skipping" msgstr "" -#: ../add.c:562 +#: ../add.c:667 +#, c-format +msgid "extracting %s as %s.pacnew" +msgstr "" + +#: ../add.c:668 +#, c-format +msgid "warning: extracting %s%s as %s" +msgstr "" + +#: ../add.c:682 #, c-format msgid "error: could not extract %s (%s)" msgstr "" -#: ../add.c:573 +#: ../add.c:693 msgid "appending backup entry" msgstr "" -#: ../add.c:593 ../add.c:595 +#: ../add.c:725 ../add.c:727 #, c-format msgid "errors occurred while %s %s" msgstr "" -#: ../add.c:594 ../add.c:596 +#: ../add.c:726 ../add.c:728 msgid "upgrading" msgstr "" -#: ../add.c:594 ../add.c:596 +#: ../add.c:726 ../add.c:728 msgid "installing" msgstr "" -#: ../add.c:617 ../add.c:668 +#: ../add.c:749 ../add.c:800 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "" #. remove the package from the database -#: ../add.c:628 ../remove.c:247 +#: ../add.c:760 ../remove.c:284 msgid "updating database" msgstr "" -#: ../add.c:629 +#: ../add.c:761 #, c-format msgid "adding database entry '%s'" msgstr "" -#: ../add.c:631 +#: ../add.c:763 #, c-format msgid "could not update database entry %s-%s" msgstr "" -#: ../add.c:633 +#: ../add.c:765 #, c-format msgid "error updating database for %s-%s!" msgstr "" -#: ../add.c:637 +#: ../add.c:769 #, c-format msgid "could not add entry '%s' in cache" msgstr "" #. update dependency packages' REQUIREDBY fields -#: ../add.c:642 ../remove.c:257 +#: ../add.c:774 ../remove.c:294 msgid "updating dependency packages 'requiredby' fields" msgstr "" -#: ../add.c:663 ../remove.c:285 +#: ../add.c:795 ../remove.c:322 #, c-format msgid "could not find dependency '%s'" msgstr "" -#: ../add.c:671 ../remove.c:295 +#: ../add.c:803 ../remove.c:332 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "" -#. run ldconfig if it exists -#: ../add.c:692 ../remove.c:307 +#: ../add.c:830 ../remove.c:345 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "" -#: ../alpm.c:193 +#: ../alpm.c:201 #, c-format msgid "registering database '%s'" msgstr "" -#: ../alpm.c:198 +#: ../alpm.c:206 #, c-format msgid "database directory '%s' does not exist -- try creating it" msgstr "" -#: ../alpm.c:209 +#: ../alpm.c:217 #, c-format msgid "opening database '%s'" msgstr "" -#: ../alpm.c:253 +#: ../alpm.c:261 #, c-format msgid "unregistering database '%s'" msgstr "" -#: ../alpm.c:258 +#: ../alpm.c:266 #, c-format msgid "closing database '%s'" msgstr "" +#: ../alpm.c:344 +#, c-format +msgid "" +"adding new server to database '%s': protocol '%s', server '%s', path '%s'" +msgstr "" + +#: ../alpm.c:348 +#, c-format +msgid "serverlist flushed for '%s'" +msgstr "" + +#: ../alpm.c:383 +#, c-format +msgid "failed to get lastupdate time for %s (no big deal)\n" +msgstr "" + +#: ../alpm.c:402 +#, c-format +msgid "sync: new mtime for %s: %s\n" +msgstr "" + #. remove the old dir -#: ../alpm.c:308 +#: ../alpm.c:408 #, c-format msgid "flushing database %s/%s" msgstr "" -#: ../alpm.c:312 +#: ../alpm.c:412 #, c-format msgid "could not remove database entry %s/%s" msgstr "" @@ -299,777 +352,1006 @@ msgstr "" #. 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:326 +#: ../alpm.c:426 #, c-format msgid "unpacking %s" msgstr "" -#: ../alpm.c:454 +#: ../alpm.c:574 #, c-format msgid "loading SCRIPLET info for '%s'" msgstr "" -#: ../alpm.c:549 +#: ../alpm.c:673 #, c-format -msgid "could not get md5 checksum for package %s-%s\n" +msgid "could not get sha1 checksum for package %s-%s\n" msgstr "" -#: ../alpm.c:560 +#: ../alpm.c:684 ../alpm.c:731 #, c-format msgid "checksums for package %s-%s are matching" msgstr "" -#: ../alpm.c:563 +#: ../alpm.c:687 +#, c-format +msgid "sha1sums do not match for package %s-%s\n" +msgstr "" + +#: ../alpm.c:720 +#, c-format +msgid "could not get md5 checksum for package %s-%s\n" +msgstr "" + +#: ../alpm.c:734 #, c-format msgid "md5sums do not match for package %s-%s\n" msgstr "" -#: ../alpm.c:810 +#: ../alpm.c:993 #, c-format msgid "could not remove lock file %s" msgstr "" -#: ../alpm.c:811 +#: ../alpm.c:994 #, c-format msgid "warning: could not remove lock file %s" msgstr "" -#: ../be_files.c:142 +#: ../alpm.c:1232 +#, c-format +msgid "config: new section '%s'\n" +msgstr "" + +#: ../alpm.c:1275 +msgid "config: usesyslog\n" +msgstr "" + +#: ../alpm.c:1286 +#, c-format +msgid "config: including %s\n" +msgstr "" + +#: ../alpm.c:1298 ../alpm.c:1306 +#, c-format +msgid "config: noupgrade: %s\n" +msgstr "" + +#: ../alpm.c:1316 ../alpm.c:1324 +#, c-format +msgid "config: noextract: %s\n" +msgstr "" + +#: ../alpm.c:1334 ../alpm.c:1342 +#, c-format +msgid "config: ignorepkg: %s\n" +msgstr "" + +#: ../alpm.c:1352 ../alpm.c:1360 +#, c-format +msgid "config: holdpkg: %s\n" +msgstr "" + +#: ../alpm.c:1370 +#, c-format +msgid "config: dbpath: %s\n" +msgstr "" + +#: ../alpm.c:1380 +#, c-format +msgid "config: cachedir: %s\n" +msgstr "" + +#: ../alpm.c:1386 +#, c-format +msgid "config: log file: %s\n" +msgstr "" + +#. The config value is in days, we use seconds +#: ../alpm.c:1394 +#, c-format +msgid "config: UpgradeDelay: %i\n" +msgstr "" + +#. add to the list +#: ../alpm.c:1415 +#, c-format +msgid "config: %s: server: %s\n" +msgstr "" + +#: ../be_files.c:151 #, c-format msgid "invalid name for dabatase entry '%s'" msgstr "" -#: ../be_files.c:379 +#: ../be_files.c:432 #, c-format msgid "db_write: could not open file %s/desc" msgstr "" -#: ../be_files.c:450 +#: ../be_files.c:517 #, c-format msgid "db_write: could not open file %s/files" msgstr "" -#: ../be_files.c:476 +#: ../be_files.c:543 #, c-format msgid "db_write: could not open file %s/depends" msgstr "" -#: ../cache.c:55 +#: ../cache.c:57 #, c-format msgid "loading package cache (infolevel=%#x) for repository '%s'" msgstr "" -#: ../cache.c:75 +#: ../cache.c:77 #, c-format msgid "freeing package cache for repository '%s'" msgstr "" -#: ../cache.c:110 +#: ../cache.c:112 #, c-format msgid "adding entry '%s' in '%s' cache" msgstr "" -#: ../cache.c:132 +#: ../cache.c:134 #, c-format msgid "removing entry '%s' from '%s' cache" msgstr "" -#: ../cache.c:163 +#: ../cache.c:165 #, c-format msgid "loading group cache for repository '%s'" msgstr "" #. CHECK 1: check targets against database -#: ../conflict.c:63 +#: ../conflict.c:71 #, c-format msgid "checkconflicts: targ '%s' vs db" msgstr "" #. conflict #. confict -#: ../conflict.c:72 ../conflict.c:86 +#: ../conflict.c:80 ../conflict.c:94 #, c-format msgid "targs vs db: found %s as a conflict for %s" msgstr "" #. CHECK 2: check targets against targets -#: ../conflict.c:99 +#: ../conflict.c:107 #, c-format msgid "checkconflicts: targ '%s' vs targs" msgstr "" #. otp is listed in tp's conflict list -#: ../conflict.c:108 ../conflict.c:121 +#: ../conflict.c:116 ../conflict.c:129 #, c-format msgid "targs vs targs: found %s as a conflict for %s" msgstr "" #. CHECK 3: check database against targets -#: ../conflict.c:135 +#: ../conflict.c:143 #, c-format msgid "checkconflicts: db vs targ '%s'" msgstr "" -#: ../conflict.c:162 ../conflict.c:177 +#: ../conflict.c:170 ../conflict.c:185 #, c-format msgid "db vs targs: found %s as a conflict for %s" msgstr "" -#: ../conflict.c:226 ../conflict.c:335 ../deps.c:48 ../deps.c:568 -#: ../deps.c:608 ../group.c:40 ../handle.c:50 ../package.c:93 ../sync.c:58 -#: ../sync.c:580 ../sync.c:596 ../sync.c:692 ../trans.c:46 +#: ../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 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "" -#: ../db.c:47 ../db.c:54 +#: ../db.c:57 ../db.c:64 #, c-format msgid "malloc failed: could not allocate %d bytes" msgstr "" -#: ../deps.c:116 +#: ../deps.c:118 +msgid "started sorting dependencies" +msgstr "" + +#: ../deps.c:123 msgid "possible dependency cycle detected" msgstr "" -#: ../deps.c:243 ../deps.c:374 +#: ../deps.c:166 +msgid "sorting dependencies finished" +msgstr "" + +#: ../deps.c:260 ../deps.c:406 #, c-format msgid "checkdeps: found %s as required by %s" msgstr "" -#: ../deps.c:353 +#: ../deps.c:370 #, c-format msgid "checkdeps: found %s as a dependency for %s" msgstr "" -#: ../deps.c:461 +#: ../deps.c:494 #, c-format msgid "cannot find package \"%s\" or anything that provides it!" msgstr "" -#: ../deps.c:466 +#: ../deps.c:499 msgid "dep is NULL!" msgstr "" -#: ../deps.c:478 +#: ../deps.c:511 #, c-format msgid "excluding %s -- explicitly installed" msgstr "" #. add it to the target list -#: ../deps.c:495 +#: ../deps.c:528 #, c-format msgid "loading ALL info for '%s'" msgstr "" -#: ../deps.c:498 +#: ../deps.c:531 #, c-format msgid "adding '%s' to the targets" msgstr "" -#: ../deps.c:540 +#: ../deps.c:573 #, c-format msgid "%s provides dependency %s -- skipping" msgstr "" -#: ../deps.c:564 +#: ../deps.c:597 #, 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:581 +#: ../deps.c:614 #, c-format msgid "dependency %s is already in the target list -- skipping" msgstr "" -#: ../deps.c:601 +#: ../deps.c:634 #, c-format msgid "pulling dependency %s (needed by %s)" msgstr "" -#: ../deps.c:605 +#: ../deps.c:638 #, c-format msgid "cannot resolve dependencies for \"%s\"" msgstr "" #. cycle detected -- skip it -#: ../deps.c:621 +#: ../deps.c:654 #, c-format msgid "dependency cycle detected: %s" msgstr "" -#: ../error.c:31 +#: ../error.c:34 msgid "out of memory!" msgstr "" -#: ../error.c:33 ../error.c:115 +#: ../error.c:36 ../error.c:135 msgid "unexpected error" msgstr "" -#: ../error.c:35 +#: ../error.c:38 msgid "insufficient privileges" msgstr "" -#: ../error.c:37 +#: ../error.c:40 msgid "wrong or NULL argument passed" msgstr "" -#: ../error.c:39 +#: ../error.c:42 msgid "could not find or read file" msgstr "" -#: ../error.c:42 +#: ../error.c:45 msgid "library not initialized" msgstr "" -#: ../error.c:44 +#: ../error.c:47 msgid "library already initialized" msgstr "" -#: ../error.c:46 +#: ../error.c:49 msgid "unable to lock database" msgstr "" -#: ../error.c:49 +#: ../error.c:52 msgid "could not open database" msgstr "" -#: ../error.c:51 +#: ../error.c:54 msgid "could not create database" msgstr "" -#: ../error.c:53 +#: ../error.c:56 msgid "database not initialized" msgstr "" -#: ../error.c:55 +#: ../error.c:58 msgid "database already registered" msgstr "" -#: ../error.c:57 +#: ../error.c:60 msgid "could not find database" msgstr "" -#: ../error.c:59 +#: ../error.c:62 msgid "could not update database" msgstr "" -#: ../error.c:61 +#: ../error.c:64 msgid "could not remove database entry" msgstr "" -#: ../error.c:68 +#: ../error.c:71 msgid "could not set parameter" msgstr "" -#: ../error.c:71 ../error.c:77 +#: ../error.c:74 ../error.c:80 msgid "transaction not initialized" msgstr "" -#: ../error.c:73 +#: ../error.c:76 msgid "transaction already initialized" msgstr "" -#: ../error.c:75 +#: ../error.c:78 msgid "duplicate target" msgstr "" -#: ../error.c:79 +#: ../error.c:82 msgid "transaction not prepared" msgstr "" -#: ../error.c:81 +#: ../error.c:84 msgid "transaction aborted" msgstr "" -#: ../error.c:83 +#: ../error.c:86 msgid "operation not compatible with the transaction type" msgstr "" -#: ../error.c:86 +#: ../error.c:89 msgid "could not find or read package" msgstr "" -#: ../error.c:88 +#: ../error.c:91 msgid "invalid or corrupted package" msgstr "" -#: ../error.c:90 +#: ../error.c:93 msgid "cannot open package file" msgstr "" -#: ../error.c:92 +#: ../error.c:95 msgid "cannot load package data" msgstr "" -#: ../error.c:94 +#: ../error.c:97 msgid "package already installed" msgstr "" -#: ../error.c:96 +#: ../error.c:99 msgid "package not installed or lesser version" msgstr "" -#: ../error.c:98 +#: ../error.c:101 msgid "package name is not valid" msgstr "" -#: ../error.c:101 +#: ../error.c:103 +msgid "corrupted package" +msgstr "" + +#: ../error.c:106 msgid "group not found" msgstr "" -#: ../error.c:104 +#: ../error.c:109 msgid "could not satisfy dependencies" msgstr "" -#: ../error.c:106 +#: ../error.c:111 msgid "conflicting dependencies" msgstr "" -#: ../error.c:108 +#: ../error.c:113 msgid "conflicting files" msgstr "" -#: ../error.c:111 +#: ../error.c:116 msgid "user aborted" msgstr "" -#: ../error.c:113 +#: ../error.c:118 +msgid "libarchive error" +msgstr "" + +#: ../error.c:120 msgid "internal error" msgstr "" -#: ../handle.c:127 +#: ../error.c:122 +msgid "not enough space" +msgstr "" + +#: ../error.c:124 +msgid "not confirmed" +msgstr "" + +#: ../error.c:127 +msgid "bad section name" +msgstr "" + +#: ../error.c:129 +msgid "'local' is reserved and cannot be used as a package tree" +msgstr "" + +#: ../error.c:131 +msgid "syntax error" +msgstr "" + +#: ../error.c:133 +msgid "all directives must belong to a section" +msgstr "" + +#: ../handle.c:143 #, c-format msgid "PM_OPT_DBPATH set to '%s'" msgstr "" -#: ../handle.c:134 +#: ../handle.c:150 #, c-format msgid "PM_OPT_CACHEDIR set to '%s'" msgstr "" -#: ../handle.c:151 +#: ../handle.c:167 #, c-format msgid "can't open log file %s" msgstr "" -#: ../handle.c:155 +#: ../handle.c:171 #, c-format msgid "PM_OPT_LOGFILE set to '%s'" msgstr "" -#: ../handle.c:160 +#: ../handle.c:176 #, c-format msgid "'%s' added to PM_OPT_NOUPGRADE" msgstr "" -#: ../handle.c:163 +#: ../handle.c:179 msgid "PM_OPT_NOUPGRADE flushed" msgstr "" -#: ../handle.c:169 +#: ../handle.c:185 #, c-format msgid "'%s' added to PM_OPT_NOEXTRACT" msgstr "" -#: ../handle.c:172 +#: ../handle.c:188 msgid "PM_OPT_NOEXTRACT flushed" msgstr "" -#: ../handle.c:178 +#: ../handle.c:194 #, c-format msgid "'%s' added to PM_OPT_IGNOREPKG" msgstr "" -#: ../handle.c:181 +#: ../handle.c:197 msgid "PM_OPT_IGNOREPKG flushed" msgstr "" -#: ../handle.c:197 +#: ../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:204 +#: ../handle.c:262 #, c-format msgid "PM_OPT_LOGMASK set to '%02x'" msgstr "" -#: ../md5driver.c:48 +#: ../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'" +msgstr "" + +#: ../handle.c:296 +#, c-format +msgid "PM_OPT_XFERCOMMAND set to '%s'" +msgstr "" + +#: ../handle.c:300 +#, c-format +msgid "PM_OPT_NOPASSIVEFTP set to '%d'" +msgstr "" + +#: ../handle.c:304 +#, c-format +msgid "PM_OPT_CHOMP set to '%d'" +msgstr "" + +#: ../md5driver.c:48 ../sha1.c:395 #, c-format msgid "%s can't be opened\n" msgstr "" -#: ../package.c:173 +#: ../package.c:185 #, c-format msgid "could not open file %s" msgstr "" -#: ../package.c:190 ../package.c:231 +#: ../package.c:202 ../package.c:262 #, c-format msgid "%s: syntax error in description file line %d" msgstr "" -#: ../package.c:291 +#: ../package.c:319 msgid "could not parse the package description file" msgstr "" -#: ../package.c:331 +#: ../package.c:327 +#, c-format +msgid "missing package name in %s" +msgstr "" + +#: ../package.c:335 +#, c-format +msgid "missing package version in %s" +msgstr "" + +#: ../package.c:374 #, c-format msgid "could not remove tempfile %s" msgstr "" -#: ../package.c:348 +#: ../package.c:391 #, c-format msgid "bad package file in %s" msgstr "" -#: ../package.c:357 +#: ../package.c:399 #, c-format msgid "missing package info file in %s" msgstr "" -#: ../remove.c:63 +#: ../remove.c:76 #, c-format msgid "could not find %s in database" msgstr "" -#: ../remove.c:67 +#: ../remove.c:88 #, c-format msgid "adding %s in the targets list" msgstr "" -#: ../remove.c:93 +#: ../remove.c:114 #, c-format msgid "pulling %s in the targets list" msgstr "" -#: ../remove.c:96 +#: ../remove.c:117 #, c-format msgid "could not find %s in database -- skipping" msgstr "" -#: ../remove.c:114 +#: ../remove.c:135 msgid "finding removable dependencies" msgstr "" -#: ../remove.c:154 +#: ../remove.c:180 #, c-format msgid "removing package %s-%s" msgstr "" -#: ../remove.c:164 +#: ../remove.c:191 msgid "removing files" msgstr "" -#: ../remove.c:183 +#: ../remove.c:217 #, c-format msgid "file %s does not exist" msgstr "" #. this is okay, other packages are probably using it. -#: ../remove.c:189 +#: ../remove.c:223 #, c-format msgid "keeping directory %s" msgstr "" -#: ../remove.c:191 +#: ../remove.c:225 #, c-format msgid "removing directory %s" msgstr "" -#: ../remove.c:205 +#: ../remove.c:239 #, c-format msgid "skipping removal of %s as it has moved to another package" msgstr "" -#: ../remove.c:217 ../remove.c:218 +#: ../remove.c:251 ../remove.c:252 #, c-format msgid "%s saved as %s" msgstr "" -#: ../remove.c:220 ../remove.c:227 +#: ../remove.c:254 ../remove.c:261 #, c-format msgid "unlinking %s" msgstr "" -#: ../remove.c:222 ../remove.c:229 +#: ../remove.c:256 ../remove.c:266 #, c-format msgid "cannot remove file %s" msgstr "" -#: ../remove.c:248 +#: ../remove.c:285 #, c-format msgid "removing database entry '%s'" msgstr "" -#: ../remove.c:250 +#: ../remove.c:287 #, c-format msgid "could not remove database entry %s-%s" msgstr "" -#: ../remove.c:253 +#: ../remove.c:290 #, c-format msgid "could not remove entry '%s' from cache" msgstr "" -#: ../remove.c:293 +#: ../remove.c:330 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "" #. check for "recommended" package replacements -#: ../sync.c:142 +#: ../sync.c:160 msgid "checking for package replacements" msgstr "" -#: ../sync.c:151 +#: ../sync.c:169 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "" -#: ../sync.c:153 +#: ../sync.c:171 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "" -#: ../sync.c:187 +#: ../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:199 +#: ../sync.c:217 msgid "checking for package upgrades" msgstr "" -#: ../sync.c:211 +#: ../sync.c:229 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "" -#: ../sync.c:225 +#: ../sync.c:243 ../sync.c:530 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "" #. local version is newer -#: ../sync.c:234 +#: ../sync.c:252 #, c-format msgid "%s-%s: local version is newer" msgstr "" #. package should be ignored (IgnorePkg) -#: ../sync.c:240 +#: ../sync.c:258 #, c-format msgid "%s-%s: ignoring package upgrade (%s)" msgstr "" -#: ../sync.c:243 +#. 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:294 ../sync.c:313 +#: ../sync.c:317 ../sync.c:336 #, c-format msgid "target '%s' not found -- looking for provisions" msgstr "" -#: ../sync.c:299 ../sync.c:318 +#: ../sync.c:322 ../sync.c:341 #, c-format msgid "found '%s' as a provision for '%s'" msgstr "" -#: ../sync.c:337 +#: ../sync.c:360 #, c-format msgid "%s-%s: local version is newer -- skipping" msgstr "" -#: ../sync.c:345 +#: ../sync.c:368 #, c-format msgid "%s-%s is up to date -- skipping" msgstr "" -#: ../sync.c:365 +#: ../sync.c:388 #, c-format msgid "adding target '%s' to the transaction set" msgstr "" -#: ../sync.c:405 +#: ../sync.c:433 msgid "resolving targets dependencies" msgstr "" -#: ../sync.c:424 +#: ../sync.c:453 #, c-format msgid "adding package %s-%s to the transaction targets" msgstr "" -#: ../sync.c:430 +#: ../sync.c:485 msgid "looking for unresolvable dependencies" msgstr "" -#: ../sync.c:460 +#: ../sync.c:515 #, c-format msgid "package '%s' is conflicting with '%s'" msgstr "" +#: ../sync.c:537 +#, 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:494 +#: ../sync.c:548 #, c-format msgid "package '%s' provides its own conflict" msgstr "" -#: ../sync.c:517 ../sync.c:522 +#: ../sync.c:571 ../sync.c:576 #, c-format msgid "'%s' is in the target list -- keeping it" msgstr "" -#: ../sync.c:532 ../sync.c:570 +#: ../sync.c:588 ../sync.c:625 #, c-format msgid "removing '%s' from target list" msgstr "" #. It's a conflict -- see if they want to remove it #. -#: ../sync.c:542 +#: ../sync.c:597 #, c-format msgid "resolving package '%s' conflict" msgstr "" #. append to the replaces list -#: ../sync.c:565 +#: ../sync.c:620 #, c-format msgid "electing '%s' for removal" msgstr "" #. abort -#: ../sync.c:576 ../sync.c:592 +#: ../sync.c:631 ../sync.c:647 msgid "unresolvable package conflicts detected" msgstr "" -#: ../sync.c:658 +#: ../sync.c:699 +msgid "checking dependencies of packages designated for removal" +msgstr "" + +#: ../sync.c:713 msgid "something has gone horribly wrong" msgstr "" #. found matching provisio -- we're good to go -#: ../sync.c:677 +#: ../sync.c:732 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "" -#: ../sync.c:736 +#: ../sync.c:825 +#, c-format +msgid "%s-%s-%s%s is already in the cache\n" +msgstr "" + +#. no cache directory.... try creating it +#: ../sync.c:837 +#, c-format +msgid "no %s cache exists. creating...\n" +msgstr "" + +#: ../sync.c:838 +#, 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 +msgid "couldn't create package cache, using /tmp instead\n" +msgstr "" + +#: ../sync.c:844 +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 +#, c-format +msgid "failed to retrieve some files from %s\n" +msgstr "" + +#: ../sync.c:883 ../sync.c:895 +#, c-format +msgid "can't get md5 or sha1 checksum for package %s\n" +msgstr "" + +#: ../sync.c:914 +#, c-format +msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" +msgstr "" + +#: ../sync.c:916 +#, c-format +msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" +msgstr "" + +#: ../sync.c:936 msgid "could not create removal transaction" msgstr "" -#: ../sync.c:743 +#: ../sync.c:942 msgid "could not initialize the removal transaction" msgstr "" -#: ../sync.c:763 +#: ../sync.c:962 msgid "removing conflicting and to-be-replaced packages" msgstr "" -#: ../sync.c:765 +#: ../sync.c:964 msgid "could not prepare removal transaction" msgstr "" -#: ../sync.c:771 +#: ../sync.c:970 msgid "could not commit removal transaction" msgstr "" #. install targets -#: ../sync.c:778 +#: ../sync.c:977 msgid "installing packages" msgstr "" -#: ../sync.c:781 +#: ../sync.c:980 msgid "could not create transaction" msgstr "" -#: ../sync.c:787 +#: ../sync.c:985 msgid "could not initialize transaction" msgstr "" -#: ../sync.c:806 +#: ../sync.c:1004 msgid "could not prepare transaction" msgstr "" -#: ../sync.c:810 +#: ../sync.c:1009 msgid "could not commit transaction" msgstr "" -#: ../sync.c:817 -msgid "updating database for replaced packages dependencies" +#: ../sync.c:1016 +msgid "updating database for replaced packages' dependencies" msgstr "" -#: ../sync.c:846 +#: ../sync.c:1045 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "" -#: ../sync.c:855 +#: ../sync.c:1054 #, c-format msgid "could not update new database entry %s-%s" msgstr "" -#: ../util.c:227 +#: ../util.c:285 #, c-format -msgid "bad tar archive: %s" +msgid "could not extract %s: %s\n" msgstr "" -#: ../util.c:383 +#: ../util.c:436 msgid "could not create temp directory" msgstr "" -#: ../util.c:403 -msgid "could not get current working directory" -msgstr "" - -#: ../util.c:410 +#: ../util.c:463 #, c-format msgid "could not change directory to %s (%s)" msgstr "" -#: ../util.c:413 +#: ../util.c:466 #, c-format msgid "executing %s script..." msgstr "" -#: ../util.c:426 +#: ../util.c:479 #, c-format msgid "could not fork a new process (%s)" msgstr "" -#: ../util.c:432 +#: ../util.c:486 #, c-format msgid "chrooting in %s" msgstr "" -#: ../util.c:434 +#: ../util.c:488 #, c-format msgid "could not change the root directory (%s)" msgstr "" -#: ../util.c:438 +#: ../util.c:492 #, c-format msgid "could not change directory to / (%s)" msgstr "" -#: ../util.c:442 +#: ../util.c:496 #, c-format msgid "executing \"%s\"" msgstr "" -#: ../util.c:447 +#: ../util.c:499 +#, c-format +msgid "call to popen failed (%s)" +msgstr "" + +#: ../util.c:521 #, c-format msgid "call to waitpid failed (%s)" msgstr "" -#: ../util.c:455 +#: ../util.c:529 #, c-format msgid "could not remove tmpdir %s" msgstr "" + +#: ../util.c:593 +#, c-format +msgid "check_freespace: total pkg size: %lld, disk space: %lld" +msgstr "" -- cgit v1.2.3-70-g09d2