From f8d0601b8ddd0ed1913c13c6cf9fd61a933efa6c Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sat, 24 Mar 2007 04:18:17 +0000 Subject: * Added a mirror list for [testing] (it appears most mirrors mirror testing) * Commented ftp.archlinux.org in the official mirror list * ran a make dist, which updated some translation files --- Makefile.am | 4 +- etc/pacman.conf.in | 2 +- etc/pacman.d/Makefile.am | 2 +- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/en_GB.po | 2 +- lib/libalpm/po/fr.po | 2 +- lib/libalpm/po/hu.po | 2 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/libalpm.pot | 234 ++++++++++++++++++++++----------------------- lib/libalpm/po/pt_BR.po | 2 +- lib/libalpm/po/ru_RU.po | 2 +- src/pacman/po/de.po | 48 ++++++---- src/pacman/po/en_GB.po | 2 +- src/pacman/po/fr.po | 2 +- src/pacman/po/hu.po | 2 +- src/pacman/po/it.po | 2 +- src/pacman/po/pacman.pot | 206 ++++++++++++++++++++------------------- src/pacman/po/pt_BR.po | 2 +- src/pacman/po/ru_RU.po | 2 +- 19 files changed, 274 insertions(+), 248 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0ef2a5da..700f32aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest contrib EXTRA_DIST = HACKING check-local: src/pacman - python $(top_srcdir)/pactest/pactest.py --test $(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman + python $(top_srcdir)/pactest/pactest.py --debug=1 \ + --test $(top_srcdir)/pactest/tests/*.py \ + -p $(top_builddir)/src/pacman/pacman rm -rf $(top_builddir)/root diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index feba20ea..56b1f833 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -20,7 +20,7 @@ HoldPkg = pacman glibc # have identical names, regardless of version number # #[testing] -#Server = ftp://ftp.archlinux.org/testing/os/@CARCH@ +#Include = /etc/pacman.d/testing [current] # Add your preferred servers here, they will be used first diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am index 57e23cf0..c8dded4b 100644 --- a/etc/pacman.d/Makefile.am +++ b/etc/pacman.d/Makefile.am @@ -1,5 +1,5 @@ pkgsysconfdir = ${sysconfdir}/pacman.d -dist_pkgsysconf_DATA = community current extra release unstable +dist_pkgsysconf_DATA = community current extra release testing unstable $(dist_pkgsysconf_DATA): mirrorlist sed "s|@@REPO@@|$@|g" <$< >$@ diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index 6870125f..528b34f5 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 18:01+0100\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-07 09:12+0100\n" "Last-Translator: Pierre Schmitz \n" "Language-Team: Deutsch \n" diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index b7b8203b..67b53346 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.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-03-22 14:15-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-07 21:05+1100\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index c2b3abf8..d9f1f6e4 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.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-03-22 14:15-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-22 12:20+0100\n" "Last-Translator: solsTiCe d'hiver \n" "Language-Team: solsTiCe d'Hiver \n" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index debbf423..992cea76 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-22 14:15-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-14 13:45+0100\n" "Last-Translator: Nagy Gabor \n" "Language-Team: \n" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index d501d294..fb6cb77c 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-22 14:15-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-22 12:30+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index d6460fcc..35648e8d 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-03-07 11:45-0500\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ msgstr "" msgid "looking for unsatisfied dependencies" msgstr "" -#: lib/libalpm/add.c:203 lib/libalpm/sync.c:469 +#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475 msgid "looking for conflicts" msgstr "" @@ -65,215 +65,215 @@ msgstr "" msgid "looking for file conflicts" msgstr "" -#: lib/libalpm/add.c:342 +#: lib/libalpm/add.c:346 #, c-format msgid "upgrading package %s-%s" msgstr "" -#: lib/libalpm/add.c:366 +#: lib/libalpm/add.c:370 #, c-format msgid "adding package %s-%s" msgstr "" -#: lib/libalpm/add.c:379 +#: lib/libalpm/add.c:383 #, c-format msgid "removing old package first (%s-%s)" msgstr "" -#: lib/libalpm/add.c:407 +#: lib/libalpm/add.c:411 #, c-format msgid "adding %s to the NoUpgrade array temporarily" msgstr "" -#: lib/libalpm/add.c:425 +#: lib/libalpm/add.c:429 msgid "extracting files" msgstr "" -#: lib/libalpm/add.c:440 lib/libalpm/util.c:465 +#: lib/libalpm/add.c:444 lib/libalpm/util.c:465 msgid "could not get current working directory" msgstr "" -#: lib/libalpm/add.c:496 lib/libalpm/add.c:497 +#: lib/libalpm/add.c:500 lib/libalpm/add.c:501 #, c-format msgid "%s is in NoExtract, skipping extraction" msgstr "" -#: lib/libalpm/add.c:504 +#: lib/libalpm/add.c:508 #, c-format msgid "%s is in trans->skip_add, skipping extraction" msgstr "" -#: lib/libalpm/add.c:550 lib/libalpm/add.c:551 lib/libalpm/add.c:700 +#: lib/libalpm/add.c:554 lib/libalpm/add.c:555 lib/libalpm/add.c:704 #, c-format msgid "could not extract %s (%s)" msgstr "" -#: lib/libalpm/add.c:594 +#: lib/libalpm/add.c:598 #, c-format msgid "checking md5 hashes for %s" msgstr "" -#: lib/libalpm/add.c:596 +#: lib/libalpm/add.c:600 #, c-format msgid "checking sha1 hashes for %s" msgstr "" -#: lib/libalpm/add.c:598 +#: lib/libalpm/add.c:602 #, c-format msgid "current: %s" msgstr "" -#: lib/libalpm/add.c:599 +#: lib/libalpm/add.c:603 #, c-format msgid "new: %s" msgstr "" -#: lib/libalpm/add.c:600 +#: lib/libalpm/add.c:604 #, c-format msgid "original: %s" msgstr "" -#: lib/libalpm/add.c:612 +#: lib/libalpm/add.c:616 #, c-format msgid "could not rename %s (%s)" msgstr "" -#: lib/libalpm/add.c:613 +#: lib/libalpm/add.c:617 #, c-format msgid "error: could not rename %s (%s)" msgstr "" -#: lib/libalpm/add.c:619 lib/libalpm/add.c:638 +#: lib/libalpm/add.c:623 lib/libalpm/add.c:642 #, c-format msgid "could not copy tempfile to %s (%s)" msgstr "" -#: lib/libalpm/add.c:620 +#: lib/libalpm/add.c:624 #, c-format msgid "error: could not copy tempfile to %s (%s)" msgstr "" -#: lib/libalpm/add.c:624 lib/libalpm/remove.c:247 +#: lib/libalpm/add.c:628 lib/libalpm/remove.c:247 #, c-format msgid "%s saved as %s" msgstr "" -#: lib/libalpm/add.c:625 +#: lib/libalpm/add.c:629 #, c-format msgid "warning: %s saved as %s" msgstr "" -#: lib/libalpm/add.c:635 +#: lib/libalpm/add.c:639 #, c-format msgid "action: installing new file: %s" msgstr "" -#: lib/libalpm/add.c:645 lib/libalpm/add.c:651 lib/libalpm/add.c:656 +#: lib/libalpm/add.c:649 lib/libalpm/add.c:655 lib/libalpm/add.c:660 msgid "action: leaving existing file in place" msgstr "" -#: lib/libalpm/add.c:659 +#: lib/libalpm/add.c:663 msgid "action: keeping current file and installing new one with .pacnew ending" msgstr "" -#: lib/libalpm/add.c:662 +#: lib/libalpm/add.c:666 #, c-format msgid "could not install %s as %s: %s" msgstr "" -#: lib/libalpm/add.c:663 +#: lib/libalpm/add.c:667 #, c-format msgid "error: could not install %s as %s: %s" msgstr "" -#: lib/libalpm/add.c:665 +#: lib/libalpm/add.c:669 #, c-format msgid "%s installed as %s" msgstr "" -#: lib/libalpm/add.c:666 +#: lib/libalpm/add.c:670 #, c-format msgid "warning: %s installed as %s" msgstr "" -#: lib/libalpm/add.c:680 +#: lib/libalpm/add.c:684 #, c-format msgid "%s is in NoUpgrade -- skipping" msgstr "" -#: lib/libalpm/add.c:681 +#: lib/libalpm/add.c:685 #, c-format msgid "extracting %s as %s.pacnew" msgstr "" -#: lib/libalpm/add.c:682 +#: lib/libalpm/add.c:686 #, c-format msgid "warning: extracting %s as %s.pacnew" msgstr "" -#: lib/libalpm/add.c:685 +#: lib/libalpm/add.c:689 #, c-format msgid "extracting %s" msgstr "" -#: lib/libalpm/add.c:701 +#: lib/libalpm/add.c:705 #, c-format msgid "error: could not extract %s (%s)" msgstr "" -#: lib/libalpm/add.c:713 +#: lib/libalpm/add.c:717 #, c-format msgid "appending backup entry for %s" msgstr "" -#: lib/libalpm/add.c:745 lib/libalpm/add.c:747 +#: lib/libalpm/add.c:749 lib/libalpm/add.c:751 #, c-format msgid "errors occurred while %s %s" msgstr "" -#: lib/libalpm/add.c:746 lib/libalpm/add.c:748 +#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 msgid "upgrading" msgstr "" -#: lib/libalpm/add.c:746 lib/libalpm/add.c:748 +#: lib/libalpm/add.c:750 lib/libalpm/add.c:752 msgid "installing" msgstr "" -#: lib/libalpm/add.c:765 +#: lib/libalpm/add.c:769 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" msgstr "" -#: lib/libalpm/add.c:777 +#: lib/libalpm/add.c:781 #, c-format msgid "updating '%s' due to provision change (%s)" msgstr "" -#: lib/libalpm/add.c:781 lib/libalpm/add.c:782 +#: lib/libalpm/add.c:785 lib/libalpm/add.c:786 #, c-format msgid "could not update provision '%s' from '%s'" msgstr "" -#: lib/libalpm/add.c:795 lib/libalpm/remove.c:338 +#: lib/libalpm/add.c:799 lib/libalpm/remove.c:336 msgid "updating database" msgstr "" -#: lib/libalpm/add.c:796 +#: lib/libalpm/add.c:800 #, c-format msgid "adding database entry '%s'" msgstr "" -#: lib/libalpm/add.c:799 lib/libalpm/add.c:801 +#: lib/libalpm/add.c:803 lib/libalpm/add.c:805 #, c-format msgid "could not update database entry %s-%s" msgstr "" -#: lib/libalpm/add.c:807 +#: lib/libalpm/add.c:811 #, c-format msgid "could not add entry '%s' in cache" msgstr "" -#: lib/libalpm/add.c:840 lib/libalpm/remove.c:365 lib/libalpm/sync.c:1041 +#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "" @@ -464,7 +464,7 @@ msgstr "" msgid "'%s' not found in sync db -- skipping" msgstr "" -#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:495 +#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "" @@ -491,7 +491,7 @@ msgstr "" #: lib/libalpm/be_files.c:186 #, c-format -msgid "invalid name for dabatase entry '%s'" +msgid "invalid name for database entry '%s'" msgstr "" #: lib/libalpm/be_files.c:221 @@ -504,35 +504,35 @@ msgid "" "request to read database info for a file-based package '%s', skipping..." msgstr "" -#: lib/libalpm/be_files.c:234 +#: lib/libalpm/be_files.c:239 #, c-format msgid "loading package data for %s : level=%d" msgstr "" -#: lib/libalpm/be_files.c:242 +#: lib/libalpm/be_files.c:247 #, c-format msgid "cannot find '%s-%s' in db '%s'" msgstr "" -#: lib/libalpm/be_files.c:250 lib/libalpm/be_files.c:396 -#: lib/libalpm/be_files.c:419 lib/libalpm/be_files.c:510 -#: lib/libalpm/be_files.c:599 lib/libalpm/be_files.c:626 +#: lib/libalpm/be_files.c:255 lib/libalpm/be_files.c:401 +#: lib/libalpm/be_files.c:424 lib/libalpm/be_files.c:515 +#: lib/libalpm/be_files.c:605 lib/libalpm/be_files.c:632 #: lib/libalpm/package.c:206 #, c-format msgid "could not open file %s: %s" msgstr "" -#: lib/libalpm/be_files.c:507 +#: lib/libalpm/be_files.c:512 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "" -#: lib/libalpm/be_files.c:596 +#: lib/libalpm/be_files.c:602 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "" -#: lib/libalpm/be_files.c:623 +#: lib/libalpm/be_files.c:629 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "" @@ -625,8 +625,8 @@ msgstr "" #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67 -#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616 lib/libalpm/sync.c:713 -#: lib/libalpm/trans.c:55 lib/libalpm/util.c:611 lib/libalpm/util.c:618 +#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719 +#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "" @@ -652,7 +652,7 @@ msgstr "" #: lib/libalpm/db.c:186 #, c-format -msgid "database directory '%s' does not exist, try creating it" +msgid "database directory '%s' does not exist, creating it" msgstr "" #: lib/libalpm/db.c:197 @@ -852,7 +852,7 @@ msgstr "" msgid "operation not compatible with the transaction type" msgstr "" -#: lib/libalpm/error.c:97 lib/libalpm/sync.c:980 +#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986 msgid "could not commit transaction" msgstr "" @@ -1052,12 +1052,12 @@ msgstr "" msgid "missing package filelist in %s, generating one" msgstr "" -#: lib/libalpm/package.c:562 +#: lib/libalpm/package.c:568 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "" -#: lib/libalpm/package.c:573 +#: lib/libalpm/package.c:582 #, c-format msgid "adding '%s' in requiredby field for '%s' (provides: %s)" msgstr "" @@ -1131,7 +1131,7 @@ msgstr "" msgid "cannot remove file %s: %s" msgstr "" -#: lib/libalpm/remove.c:292 +#: lib/libalpm/remove.c:294 #, c-format msgid "removing package %s-%s" msgstr "" @@ -1146,17 +1146,17 @@ msgstr "" msgid "removing %d files" msgstr "" -#: lib/libalpm/remove.c:339 +#: lib/libalpm/remove.c:337 #, c-format msgid "removing database entry '%s'" msgstr "" -#: lib/libalpm/remove.c:341 +#: lib/libalpm/remove.c:339 #, c-format msgid "could not remove database entry %s-%s" msgstr "" -#: lib/libalpm/remove.c:346 +#: lib/libalpm/remove.c:344 #, c-format msgid "could not remove entry '%s' from cache" msgstr "" @@ -1219,185 +1219,185 @@ msgstr "" msgid "adding package %s-%s to the transaction targets" msgstr "" -#: lib/libalpm/sync.c:449 +#: lib/libalpm/sync.c:455 msgid "looking for unresolvable dependencies" msgstr "" -#: lib/libalpm/sync.c:480 +#: lib/libalpm/sync.c:486 #, c-format msgid "package '%s' conflicts with '%s'" msgstr "" -#: lib/libalpm/sync.c:502 +#: lib/libalpm/sync.c:508 #, c-format msgid "'%s' not found in transaction set -- skipping" msgstr "" -#: lib/libalpm/sync.c:513 +#: lib/libalpm/sync.c:519 #, c-format msgid "package '%s' provides its own conflict" msgstr "" -#: lib/libalpm/sync.c:536 lib/libalpm/sync.c:541 +#: 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:553 lib/libalpm/sync.c:590 +#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596 #, c-format msgid "removing '%s' from target list" msgstr "" -#: lib/libalpm/sync.c:562 +#: lib/libalpm/sync.c:568 #, c-format msgid "resolving package '%s' conflict" msgstr "" -#: lib/libalpm/sync.c:585 +#: lib/libalpm/sync.c:591 #, c-format msgid "electing '%s' for removal" msgstr "" -#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:612 +#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618 msgid "unresolvable package conflicts detected" msgstr "" -#: lib/libalpm/sync.c:664 +#: lib/libalpm/sync.c:670 msgid "checking dependencies of packages designated for removal" msgstr "" -#: lib/libalpm/sync.c:678 +#: lib/libalpm/sync.c:684 msgid "something has gone horribly wrong" msgstr "" -#: lib/libalpm/sync.c:698 +#: lib/libalpm/sync.c:704 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" msgstr "" -#: lib/libalpm/sync.c:794 +#: lib/libalpm/sync.c:800 #, c-format msgid "%s is already in the cache\n" msgstr "" -#: lib/libalpm/sync.c:805 +#: lib/libalpm/sync.c:811 #, c-format msgid "no %s cache exists, creating...\n" msgstr "" -#: lib/libalpm/sync.c:806 +#: lib/libalpm/sync.c:812 #, c-format msgid "warning: no %s cache exists, creating..." msgstr "" -#: lib/libalpm/sync.c:811 +#: lib/libalpm/sync.c:817 msgid "couldn't create package cache, using /tmp instead\n" msgstr "" -#: lib/libalpm/sync.c:812 +#: lib/libalpm/sync.c:818 msgid "warning: couldn't create package cache, using /tmp instead" msgstr "" -#: lib/libalpm/sync.c:819 +#: lib/libalpm/sync.c:825 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "" -#: lib/libalpm/sync.c:849 lib/libalpm/sync.c:861 +#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867 #, c-format msgid "can't get md5 or sha1 checksum for package %s\n" msgstr "" -#: lib/libalpm/sync.c:880 +#: lib/libalpm/sync.c:886 #, c-format msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n" msgstr "" -#: lib/libalpm/sync.c:882 +#: lib/libalpm/sync.c:888 #, c-format msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" msgstr "" -#: lib/libalpm/sync.c:903 +#: lib/libalpm/sync.c:909 msgid "could not create removal transaction" msgstr "" -#: lib/libalpm/sync.c:909 +#: lib/libalpm/sync.c:915 msgid "could not initialize the removal transaction" msgstr "" -#: lib/libalpm/sync.c:929 +#: lib/libalpm/sync.c:935 msgid "removing conflicting and to-be-replaced packages" msgstr "" -#: lib/libalpm/sync.c:931 +#: lib/libalpm/sync.c:937 msgid "could not prepare removal transaction" msgstr "" -#: lib/libalpm/sync.c:937 +#: lib/libalpm/sync.c:943 msgid "could not commit removal transaction" msgstr "" -#: lib/libalpm/sync.c:944 +#: lib/libalpm/sync.c:950 msgid "installing packages" msgstr "" -#: lib/libalpm/sync.c:947 +#: lib/libalpm/sync.c:953 msgid "could not create transaction" msgstr "" -#: lib/libalpm/sync.c:952 +#: lib/libalpm/sync.c:958 msgid "could not initialize transaction" msgstr "" -#: lib/libalpm/sync.c:975 +#: lib/libalpm/sync.c:981 msgid "could not prepare transaction" msgstr "" -#: lib/libalpm/sync.c:987 +#: lib/libalpm/sync.c:993 msgid "updating database for replaced packages' dependencies" msgstr "" -#: lib/libalpm/sync.c:1016 +#: lib/libalpm/sync.c:1022 #, c-format msgid "could not update requiredby for database entry %s-%s" msgstr "" -#: lib/libalpm/sync.c:1025 +#: lib/libalpm/sync.c:1031 #, c-format msgid "could not update new database entry %s-%s" msgstr "" -#: lib/libalpm/sync.c:1065 +#: lib/libalpm/sync.c:1071 #, c-format msgid "found package '%s-%s' in sync" msgstr "" -#: lib/libalpm/sync.c:1071 +#: lib/libalpm/sync.c:1077 #, c-format msgid "package '%s' not found in sync" msgstr "" -#: lib/libalpm/trans.c:267 +#: lib/libalpm/trans.c:270 #, c-format msgid "updating dependency packages 'requiredby' fields for %s-%s" msgstr "" -#: lib/libalpm/trans.c:270 +#: lib/libalpm/trans.c:273 msgid "package has no dependencies, no other packages to update" msgstr "" -#: lib/libalpm/trans.c:307 lib/libalpm/trans.c:333 +#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "" -#: lib/libalpm/trans.c:318 lib/libalpm/trans.c:344 +#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "" -#: lib/libalpm/trans.c:325 +#: lib/libalpm/trans.c:332 #, c-format msgid "could not find dependency '%s'" msgstr "" @@ -1417,7 +1417,7 @@ msgstr "" msgid "could not extract %s: %s\n" msgstr "" -#: lib/libalpm/util.c:351 +#: lib/libalpm/util.c:350 #, c-format msgid "logaction called: %s" msgstr "" @@ -1431,52 +1431,52 @@ msgstr "" msgid "could not change directory to %s (%s)" msgstr "" -#: lib/libalpm/util.c:475 +#: lib/libalpm/util.c:476 #, c-format msgid "executing %s script..." msgstr "" -#: lib/libalpm/util.c:488 +#: lib/libalpm/util.c:489 #, c-format msgid "could not fork a new process (%s)" msgstr "" -#: lib/libalpm/util.c:495 +#: lib/libalpm/util.c:496 #, c-format msgid "chrooting in %s" msgstr "" -#: lib/libalpm/util.c:497 +#: lib/libalpm/util.c:498 #, c-format msgid "could not change the root directory (%s)" msgstr "" -#: lib/libalpm/util.c:501 +#: lib/libalpm/util.c:502 #, c-format msgid "could not change directory to / (%s)" msgstr "" -#: lib/libalpm/util.c:505 +#: lib/libalpm/util.c:506 #, c-format msgid "executing \"%s\"" msgstr "" -#: lib/libalpm/util.c:508 +#: lib/libalpm/util.c:509 #, c-format msgid "call to popen failed (%s)" msgstr "" -#: lib/libalpm/util.c:540 +#: lib/libalpm/util.c:541 #, c-format msgid "call to waitpid failed (%s)" msgstr "" -#: lib/libalpm/util.c:549 +#: lib/libalpm/util.c:550 #, c-format msgid "could not remove tmpdir %s" msgstr "" -#: lib/libalpm/util.c:606 +#: lib/libalpm/util.c:607 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "" diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index 4e014f6b..08f8e6a4 100644 --- a/lib/libalpm/po/pt_BR.po +++ b/lib/libalpm/po/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-22 14:15-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-07 01:18-0300\n" "Last-Translator: Douglas Soares de Andrade \n" "Language-Team: Português do Brasil \n" diff --git a/lib/libalpm/po/ru_RU.po b/lib/libalpm/po/ru_RU.po index 8635f943..1550593d 100644 --- a/lib/libalpm/po/ru_RU.po +++ b/lib/libalpm/po/ru_RU.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-03-22 14:15-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-16 02:52+1000\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n" "MIME-Version: 1.0\n" diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index cea24cb6..f84ae482 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-23 18:01+0100\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-23 18:08+0100\n" "Last-Translator: Pierre Schmitz \n" "Language-Team: German \n" @@ -369,7 +369,8 @@ msgstr " -d, --nodeps Überspringt die Abhängigkeitsprüfung\n" #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr " -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" +msgstr "" +" -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" #: src/pacman/pacman.c:106 #, c-format @@ -378,12 +379,15 @@ msgstr "Benutzung: %s {-R --remove} [Optionen] \n" #: src/pacman/pacman.c:108 #, c-format -msgid " -c, --cascade remove packages and all packages that depend on them\n" -msgstr " -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" +msgid "" +" -c, --cascade remove packages and all packages that depend on them\n" +msgstr "" +" -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" #: src/pacman/pacman.c:110 #, c-format -msgid " -k, --dbonly only remove database entry, do not remove files\n" +msgid "" +" -k, --dbonly only remove database entry, do not remove files\n" msgstr " -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien\n" #: src/pacman/pacman.c:111 @@ -393,7 +397,8 @@ msgstr " -n, --nosave Auch Konfigurationsdateien entfernen\n" #: src/pacman/pacman.c:112 #, c-format -msgid " -s, --recursive remove dependencies also (that won't break packages)\n" +msgid "" +" -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" " -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine " "Pakete)\n" @@ -449,7 +454,8 @@ msgstr " -l, --list Zeigt den Inhalt des abgefragten Paketes an\n" #: src/pacman/pacman.c:131 #, c-format -msgid " -m, --foreign list installed packages not found in sync db(s)\n" +msgid "" +" -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" " -m, --foreign Zeigt alle Pakete an, die nicht in den Sync db(s)\n" " gefunden wurden\n" @@ -471,7 +477,8 @@ msgstr "" msgid "" " -s, --search search locally-installed packages for matching " "strings\n" -msgstr " -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n" +msgstr "" +" -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n" #: src/pacman/pacman.c:135 #, c-format @@ -513,8 +520,10 @@ msgstr "" #: src/pacman/pacman.c:147 #, c-format -msgid " -s, --search search remote repositories for matching strings\n" -msgstr " -s, --search Durchsuche entfernte Repositorien nach einem Wort\n" +msgid "" +" -s, --search search remote repositories for matching strings\n" +msgstr "" +" -s, --search Durchsuche entfernte Repositorien nach einem Wort\n" #: src/pacman/pacman.c:148 #, c-format @@ -532,7 +541,8 @@ msgstr "" #: src/pacman/pacman.c:150 #, c-format -msgid " -y, --refresh download fresh package databases from the server\n" +msgid "" +" -y, --refresh download fresh package databases from the server\n" msgstr " -y, --refresh Lade frische Paketdatenbank vom Server\n" #: src/pacman/pacman.c:151 @@ -556,20 +566,25 @@ msgstr " --noconfirm Niemals nach einer Bestätigung fragen\n" #: src/pacman/pacman.c:155 #, c-format -msgid " --ask pre-specify answers for questions (see manpage)\n" -msgstr " --ask Antworten für Fragen vorherbestimmen (Siehe manpage)\n" +msgid "" +" --ask pre-specify answers for questions (see manpage)\n" +msgstr "" +" --ask Antworten für Fragen vorherbestimmen (Siehe manpage)\n" #: src/pacman/pacman.c:156 #, c-format -msgid " --noprogressbar do not show a progress bar when downloading files\n" +msgid "" +" --noprogressbar do not show a progress bar when downloading files\n" msgstr "" " --noprogressbar Keine Fortschrittsanzeige anzeigen, wenn Dateien\n" " heruntergeladen werden\n" #: src/pacman/pacman.c:157 #, c-format -msgid " --noscriptlet do not execute the install scriptlet if there is any\n" -msgstr " --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" +msgid "" +" --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr "" +" --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" #: src/pacman/pacman.c:158 #, c-format @@ -1073,4 +1088,3 @@ msgstr "" #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Gesamtgröße der installierten Pakete : %.2f MB\n" - diff --git a/src/pacman/po/en_GB.po b/src/pacman/po/en_GB.po index 60fb3cb3..e7f0cb91 100644 --- a/src/pacman/po/en_GB.po +++ b/src/pacman/po/en_GB.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-03-22 14:16-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-07 21:16+1100\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po index 9768cfa7..a215ad38 100644 --- a/src/pacman/po/fr.po +++ b/src/pacman/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-22 14:16-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-22 12:50+0100\n" "Last-Translator: solsTiCe d'hiver \n" "Language-Team: \n" diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po index cabfb15c..43ea80e9 100644 --- a/src/pacman/po/hu.po +++ b/src/pacman/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-22 14:16-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2006-09-03 13:52+0200\n" "Last-Translator: Nagy Gabor \n" "Language-Team: Hungarian \n" diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po index 761e3d93..6be03ac5 100644 --- a/src/pacman/po/it.po +++ b/src/pacman/po/it.po @@ -9,7 +9,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-03-22 14:16-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-22 12:40+0100\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot index 70218d7b..465c21f5 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-03-07 11:45-0500\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,9 +34,8 @@ msgid "failed to add target '%s' (%s)" msgstr "" #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 -#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94 -#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134 -#: src/pacman/trans.c:145 +#: src/pacman/trans.c:80 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 msgid "done.\n" msgstr "" @@ -50,44 +49,44 @@ msgstr "" msgid ":: %s: requires %s" msgstr "" -#: src/pacman/add.c:125 src/pacman/sync.c:645 +#: src/pacman/add.c:125 src/pacman/sync.c:643 #, c-format msgid ":: %s: conflicts with %s" msgstr "" -#: src/pacman/add.c:134 src/pacman/sync.c:709 +#: src/pacman/add.c:134 src/pacman/sync.c:707 #, c-format msgid "%s exists in both '%s' and '%s'\n" msgstr "" -#: src/pacman/add.c:140 src/pacman/sync.c:715 +#: src/pacman/add.c:140 src/pacman/sync.c:713 #, c-format msgid "%s: %s exists in filesystem\n" msgstr "" -#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727 +#: src/pacman/add.c:146 src/pacman/sync.c:719 src/pacman/sync.c:725 msgid "" "\n" "errors occurred, no packages were upgraded.\n" msgstr "" -#: src/pacman/add.c:156 src/pacman/sync.c:652 +#: src/pacman/add.c:156 src/pacman/sync.c:650 #, c-format msgid ":: %.1f MB required, have %.1f MB" msgstr "" -#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702 +#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:700 #, c-format msgid "failed to commit transaction (%s)\n" msgstr "" #: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524 -#: src/pacman/sync.c:743 +#: src/pacman/sync.c:741 #, c-format msgid "failed to release transaction (%s)\n" msgstr "" -#: src/pacman/deptest.c:86 +#: src/pacman/deptest.c:84 #, c-format msgid "requires: %s" msgstr "" @@ -187,9 +186,9 @@ msgstr "" msgid "Conflicts With :" msgstr "" -#: src/pacman/package.c:86 +#: src/pacman/package.c:86 src/pacman/package.c:136 #, c-format -msgid "Installed Size : %ld K\n" +msgid "Installed Size : %6.2f K\n" msgstr "" #: src/pacman/package.c:87 @@ -249,11 +248,6 @@ msgstr "" msgid "Download Size : %6.2f K\n" msgstr "" -#: src/pacman/package.c:136 -#, c-format -msgid "Installed Size : %6.2f K\n" -msgstr "" - #: src/pacman/package.c:144 #, c-format msgid "MD5 Sum : %s" @@ -446,8 +440,7 @@ msgstr "" #: src/pacman/pacman.c:131 #, c-format msgid "" -" -m, --foreign list all packages that were not found in the sync db" -"(s)\n" +" -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" #: src/pacman/pacman.c:132 @@ -457,15 +450,13 @@ msgstr "" #: src/pacman/pacman.c:133 #, c-format -msgid "" -" -p, --file query the package file [package] instead of the " -"database\n" +msgid " -p, --file query a package file instead of the database\n" msgstr "" #: src/pacman/pacman.c:134 #, c-format msgid "" -" -s, --search search locally-installed packages for matching " +" -s, --search search locally-installed packages for matching " "strings\n" msgstr "" @@ -493,200 +484,219 @@ msgstr "" #: src/pacman/pacman.c:145 #, c-format +msgid " -l, --list view a list of packages in a repo\n" +msgstr "" + +#: src/pacman/pacman.c:146 +#, c-format msgid "" " -p, --print-uris print out URIs for given packages and their " "dependencies\n" msgstr "" -#: src/pacman/pacman.c:146 +#: src/pacman/pacman.c:147 #, c-format msgid "" -" -s, --search search remote repositories for matching strings\n" +" -s, --search search remote repositories for matching strings\n" msgstr "" -#: src/pacman/pacman.c:147 +#: src/pacman/pacman.c:148 #, c-format msgid " -u, --sysupgrade upgrade all packages that are out of date\n" msgstr "" -#: src/pacman/pacman.c:148 +#: src/pacman/pacman.c:149 #, c-format msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" msgstr "" -#: src/pacman/pacman.c:149 +#: src/pacman/pacman.c:150 #, c-format msgid "" " -y, --refresh download fresh package databases from the server\n" msgstr "" -#: src/pacman/pacman.c:150 +#: src/pacman/pacman.c:151 #, c-format msgid "" " --ignore ignore a package upgrade (can be used more than " "once)\n" msgstr "" -#: src/pacman/pacman.c:152 +#: src/pacman/pacman.c:153 #, c-format msgid " --config set an alternate configuration file\n" msgstr "" -#: src/pacman/pacman.c:153 +#: src/pacman/pacman.c:154 #, c-format -msgid " --noconfirm do not ask for anything confirmation\n" +msgid " --noconfirm do not ask for any confirmation\n" msgstr "" -#: src/pacman/pacman.c:154 +#: src/pacman/pacman.c:155 #, c-format msgid "" " --ask pre-specify answers for questions (see manpage)\n" msgstr "" -#: src/pacman/pacman.c:155 +#: src/pacman/pacman.c:156 #, c-format msgid "" " --noprogressbar do not show a progress bar when downloading files\n" msgstr "" -#: src/pacman/pacman.c:156 +#: src/pacman/pacman.c:157 #, c-format msgid "" " --noscriptlet do not execute the install scriptlet if there is any\n" msgstr "" -#: src/pacman/pacman.c:157 +#: src/pacman/pacman.c:158 #, c-format msgid " -v, --verbose be verbose\n" msgstr "" -#: src/pacman/pacman.c:158 +#: src/pacman/pacman.c:159 #, c-format msgid " -r, --root set an alternate installation root\n" msgstr "" -#: src/pacman/pacman.c:159 +#: src/pacman/pacman.c:160 #, c-format msgid " -b, --dbpath set an alternate database location\n" msgstr "" -#: src/pacman/pacman.c:160 +#: src/pacman/pacman.c:161 #, c-format msgid " --cachedir set an alternate package cache location\n" msgstr "" -#: src/pacman/pacman.c:173 +#: src/pacman/pacman.c:174 #, c-format msgid " This program may be freely redistributed under\n" msgstr "" -#: src/pacman/pacman.c:174 +#: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" msgstr "" -#: src/pacman/pacman.c:299 +#: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" msgstr "" -#: src/pacman/pacman.c:314 +#: src/pacman/pacman.c:315 #, c-format msgid "'%s' is not a valid cache directory\n" msgstr "" -#: src/pacman/pacman.c:332 +#: src/pacman/pacman.c:333 #, c-format msgid "'%s' is not a valid db path\n" msgstr "" -#: src/pacman/pacman.c:362 +#: src/pacman/pacman.c:363 #, c-format msgid "'%s' is not a valid root path\n" msgstr "" -#: src/pacman/pacman.c:389 +#: src/pacman/pacman.c:390 msgid "only one operation may be used at a time\n" msgstr "" -#: src/pacman/pacman.c:435 +#: src/pacman/pacman.c:436 msgid "warning: current locale is invalid; using default \"C\" locale" msgstr "" -#: src/pacman/pacman.c:455 +#: src/pacman/pacman.c:456 #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "" -#: src/pacman/pacman.c:488 +#: src/pacman/pacman.c:489 msgid "you cannot perform this operation unless you are root.\n" msgstr "" -#: src/pacman/pacman.c:504 +#: src/pacman/pacman.c:505 #, c-format msgid "failed to parse config (%s)\n" msgstr "" -#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324 -msgid "Targets:" +#: src/pacman/pacman.c:516 +msgid "Targets :" msgstr "" -#: src/pacman/pacman.c:520 +#: src/pacman/pacman.c:522 #, c-format msgid "could not register 'local' database (%s)\n" msgstr "" -#: src/pacman/pacman.c:527 +#: src/pacman/pacman.c:529 msgid "no targets specified (use -h for help)\n" msgstr "" -#: src/pacman/pacman.c:540 +#: src/pacman/pacman.c:542 msgid "no operation specified (use -h for help)\n" msgstr "" -#: src/pacman/query.c:56 +#: src/pacman/query.c:90 msgid "no file was specified for --owns\n" msgstr "" -#: src/pacman/query.c:74 +#: src/pacman/query.c:95 +#, c-format +msgid "failed to read file '%s': %s" +msgstr "" + +#: src/pacman/query.c:100 +msgid "cannot determine ownership of a directory" +msgstr "" + +#: src/pacman/query.c:105 +#, c-format +msgid "cannot determine real path for '%s': %s" +msgstr "" + +#: src/pacman/query.c:119 #, c-format msgid "%s is owned by %s %s\n" msgstr "" -#: src/pacman/query.c:81 +#: src/pacman/query.c:127 #, c-format msgid "No package owns %s\n" msgstr "" -#: src/pacman/query.c:122 src/pacman/sync.c:453 +#: src/pacman/query.c:170 src/pacman/sync.c:453 msgid "no usable package repositories configured.\n" msgstr "" -#: src/pacman/query.c:128 +#: src/pacman/query.c:176 msgid "Checking for package upgrades..." msgstr "" -#: src/pacman/query.c:135 +#: src/pacman/query.c:183 msgid "no upgrades found" msgstr "" -#: src/pacman/query.c:173 +#: src/pacman/query.c:221 #, c-format msgid "group \"%s\" was not found\n" msgstr "" -#: src/pacman/query.c:184 +#: src/pacman/query.c:232 msgid "no package file was specified for --file\n" msgstr "" -#: src/pacman/query.c:188 +#: src/pacman/query.c:236 #, c-format msgid "failed to load package '%s' (%s)\n" msgstr "" -#: src/pacman/query.c:226 src/pacman/query.c:258 +#: src/pacman/query.c:273 src/pacman/query.c:305 #, c-format msgid "package \"%s\" not found\n" msgstr "" @@ -720,6 +730,10 @@ msgstr "" msgid ":: %s is required by %s\n" msgstr "" +#: src/pacman/remove.c:128 src/pacman/util.c:324 +msgid "Targets:" +msgstr "" + #: src/pacman/remove.c:131 msgid "" "\n" @@ -851,35 +865,31 @@ msgstr "" msgid "'%s': not found in sync db\n" msgstr "" -#: src/pacman/sync.c:623 +#: src/pacman/sync.c:621 msgid "requires" msgstr "" -#: src/pacman/sync.c:623 -msgid "is required by" -msgstr "" - -#: src/pacman/sync.c:665 +#: src/pacman/sync.c:663 msgid " local database is up to date\n" msgstr "" -#: src/pacman/sync.c:674 +#: src/pacman/sync.c:672 msgid "" "\n" "Beginning download...\n" msgstr "" -#: src/pacman/sync.c:678 +#: src/pacman/sync.c:676 msgid "Proceed with download? [Y/n] " msgstr "" -#: src/pacman/sync.c:686 +#: src/pacman/sync.c:684 msgid "" "\n" "Beginning upgrade process...\n" msgstr "" -#: src/pacman/sync.c:690 +#: src/pacman/sync.c:688 msgid "Proceed with installation? [Y/n] " msgstr "" @@ -903,102 +913,102 @@ msgstr "" msgid "looking for inter-conflicts... " msgstr "" -#: src/pacman/trans.c:89 +#: src/pacman/trans.c:86 #, c-format msgid "installing %s... " msgstr "" -#: src/pacman/trans.c:96 +#: src/pacman/trans.c:93 #, c-format msgid "installed %s (%s)" msgstr "" -#: src/pacman/trans.c:103 +#: src/pacman/trans.c:100 #, c-format msgid "removing %s... " msgstr "" -#: src/pacman/trans.c:110 +#: src/pacman/trans.c:107 #, c-format msgid "removed %s (%s)" msgstr "" -#: src/pacman/trans.c:117 +#: src/pacman/trans.c:114 #, c-format msgid "upgrading %s... " msgstr "" -#: src/pacman/trans.c:124 +#: src/pacman/trans.c:121 #, c-format msgid "upgraded %s (%s -> %s)" msgstr "" -#: src/pacman/trans.c:131 +#: src/pacman/trans.c:128 msgid "checking package integrity... " msgstr "" -#: src/pacman/trans.c:147 +#: src/pacman/trans.c:144 msgid "failed.\n" msgstr "" -#: src/pacman/trans.c:154 +#: src/pacman/trans.c:151 #, c-format msgid ":: Retrieving packages from %s...\n" msgstr "" -#: src/pacman/trans.c:175 +#: src/pacman/trans.c:172 #, c-format msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " msgstr "" -#: src/pacman/trans.c:180 +#: src/pacman/trans.c:177 #, c-format msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " msgstr "" -#: src/pacman/trans.c:193 +#: src/pacman/trans.c:190 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " msgstr "" -#: src/pacman/trans.c:206 +#: src/pacman/trans.c:203 #, c-format msgid ":: Replace %s with %s/%s? [Y/n] " msgstr "" -#: src/pacman/trans.c:221 +#: src/pacman/trans.c:218 #, c-format msgid ":: %s conflicts with %s. Remove %s? [Y/n] " msgstr "" -#: src/pacman/trans.c:237 +#: src/pacman/trans.c:234 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " msgstr "" -#: src/pacman/trans.c:255 +#: 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:273 +#: 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:329 +#: src/pacman/trans.c:326 msgid "installing" msgstr "" -#: src/pacman/trans.c:332 +#: src/pacman/trans.c:329 msgid "upgrading" msgstr "" -#: src/pacman/trans.c:335 +#: src/pacman/trans.c:332 msgid "removing" msgstr "" -#: src/pacman/trans.c:338 +#: src/pacman/trans.c:335 msgid "checking for file conflicts" msgstr "" diff --git a/src/pacman/po/pt_BR.po b/src/pacman/po/pt_BR.po index 42630c4f..a8618101 100644 --- a/src/pacman/po/pt_BR.po +++ b/src/pacman/po/pt_BR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-03-22 14:16-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-22 13:52-0300\n" "Last-Translator: Douglas Soares de Andrade \n" "Language-Team: Archlinux-br \n" diff --git a/src/pacman/po/ru_RU.po b/src/pacman/po/ru_RU.po index e1580955..acc5ed88 100644 --- a/src/pacman/po/ru_RU.po +++ b/src/pacman/po/ru_RU.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-03-22 14:16-0400\n" +"POT-Creation-Date: 2007-03-23 20:46-0500\n" "PO-Revision-Date: 2007-03-07 11:45-0500\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven@gmail.com>\n" "MIME-Version: 1.0\n" -- cgit v1.2.3-70-g09d2