From 3170106149ce21d3ba5c68fc134672f08ddf793b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 2 Dec 2007 21:42:41 -0600 Subject: Update all translation files in anticipation of 3.1 release Update all of the pot and po files with the latest messages available. Translators- you are encouraged to do this as well every time you update the translation, and the directions in 'translation-help' should help. Also feel free to delete all the old translations that end up at the bottom of these files and only clutter things up. Signed-off-by: Dan McGee --- lib/libalpm/po/en_GB.po | 326 ++++++++++++++++++++++++++++-------------------- 1 file changed, 194 insertions(+), 132 deletions(-) (limited to 'lib/libalpm/po/en_GB.po') diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index f0ecd2d8..427f75cc 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-11-06 18:03+1100\n" +"POT-Creation-Date: 2007-12-02 21:40-0600\n" "PO-Revision-Date: 2007-11-06 18:09+1000\n" "Last-Translator: Jeff Bailes \n" "Language-Team: English \n" @@ -16,26 +16,33 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/libalpm/add.c:98 +#: lib/libalpm/add.c:88 #, c-format msgid "replacing older version %s-%s by %s in target list\n" msgstr "replacing older version %s-%s by %s in target list\n" -#: lib/libalpm/add.c:107 +#: lib/libalpm/add.c:97 #, c-format msgid "newer version %s-%s is in the target list -- skipping\n" msgstr "newer version %s-%s is in the target list -- skipping\n" +#: lib/libalpm/add.c:168 +msgid "conflicting packages were found in the target list\n" +msgstr "" + #: lib/libalpm/add.c:169 +msgid "you cannot install two conflicting packages at the same time\n" +msgstr "" + +#: lib/libalpm/add.c:172 msgid "replacing packages with -A and -U is not supported yet\n" msgstr "replacing packages with -A and -U is not supported yet\n" -#: lib/libalpm/add.c:170 -#, c-format -msgid "please remove '%s' first, using -Rd\n" -msgstr "please remove '%s' first, using -Rd\n" +#: lib/libalpm/add.c:173 +msgid "you can replace packages manually using -Rd and -U\n" +msgstr "" -#: lib/libalpm/add.c:396 +#: lib/libalpm/add.c:365 #, c-format msgid "" "directory permissions differ on %s\n" @@ -44,98 +51,89 @@ msgstr "" "directory permissions differ on %s\n" "filesystem: %o package: %o\n" -#: lib/libalpm/add.c:423 +#: lib/libalpm/add.c:392 #, c-format msgid "extract: symlink %s does not point to dir\n" msgstr "extract: symlink %s does not point to dir\n" -#: lib/libalpm/add.c:430 +#: lib/libalpm/add.c:399 #, c-format msgid "extract: not overwriting dir with file %s\n" msgstr "extract: not overwriting dir with file %s\n" -#: lib/libalpm/add.c:483 -#: lib/libalpm/add.c:627 -#: lib/libalpm/util.c:412 +#: lib/libalpm/add.c:454 lib/libalpm/add.c:598 lib/libalpm/util.c:422 #, c-format msgid "could not extract %s (%s)\n" msgstr "could not extract %s (%s)\n" -#: lib/libalpm/add.c:534 +#: lib/libalpm/add.c:505 #, c-format msgid "could not rename %s (%s)\n" msgstr "could not rename %s (%s)\n" -#: lib/libalpm/add.c:541 -#: lib/libalpm/add.c:561 -#: lib/libalpm/trans.c:580 +#: lib/libalpm/add.c:512 lib/libalpm/add.c:532 lib/libalpm/trans.c:508 #, c-format msgid "could not copy tempfile to %s (%s)\n" msgstr "could not copy tempfile to %s (%s)\n" -#: lib/libalpm/add.c:546 -#: lib/libalpm/remove.c:235 +#: lib/libalpm/add.c:517 lib/libalpm/remove.c:234 #, c-format msgid "%s saved as %s\n" msgstr "%s saved as %s\n" -#: lib/libalpm/add.c:585 +#: lib/libalpm/add.c:556 #, c-format msgid "could not install %s as %s: %s\n" msgstr "could not install %s as %s: %s\n" -#: lib/libalpm/add.c:588 +#: lib/libalpm/add.c:559 #, c-format msgid "%s installed as %s\n" msgstr "%s installed as %s\n" -#: lib/libalpm/add.c:605 +#: lib/libalpm/add.c:576 #, c-format msgid "extracting %s as %s.pacnew\n" msgstr "extracting %s as %s.pacnew\n" -#: lib/libalpm/add.c:740 -#: lib/libalpm/trans.c:596 +#: lib/libalpm/add.c:711 lib/libalpm/trans.c:529 msgid "could not get current working directory\n" msgstr "could not get current working directory\n" -#: lib/libalpm/add.c:794 +#: lib/libalpm/add.c:765 #, c-format msgid "problem occurred while upgrading %s\n" msgstr "problem occurred while upgrading %s\n" -#: lib/libalpm/add.c:799 +#: lib/libalpm/add.c:770 #, c-format msgid "problem occurred while installing %s\n" msgstr "problem occurred while installing %s\n" -#: lib/libalpm/add.c:818 +#: lib/libalpm/add.c:785 #, c-format msgid "could not update database entry %s-%s\n" msgstr "could not update database entry %s-%s\n" -#: lib/libalpm/add.c:826 +#: lib/libalpm/add.c:793 #, c-format msgid "could not add entry '%s' in cache\n" msgstr "could not add entry '%s' in cache\n" -#: lib/libalpm/be_files.c:221 +#: lib/libalpm/be_files.c:223 #, c-format msgid "invalid name for database entry '%s'\n" msgstr "invalid name for database entry '%s'\n" -#: lib/libalpm/be_files.c:273 +#: lib/libalpm/be_files.c:275 #, c-format msgid "loading package data for %s : level=%d\n" msgstr "loading package data for %s : level=%d\n" -#: lib/libalpm/be_files.c:290 -#: lib/libalpm/be_files.c:419 -#: lib/libalpm/be_files.c:442 -#: lib/libalpm/be_files.c:556 -#: lib/libalpm/be_files.c:634 -#: lib/libalpm/be_files.c:662 -#: lib/libalpm/package.c:820 +#: lib/libalpm/be_files.c:292 lib/libalpm/be_files.c:429 +#: lib/libalpm/be_files.c:452 lib/libalpm/be_files.c:563 +#: lib/libalpm/be_files.c:641 lib/libalpm/be_files.c:669 +#: lib/libalpm/package.c:787 #, c-format msgid "could not open file %s: %s\n" msgstr "could not open file %s: %s\n" @@ -150,42 +148,33 @@ msgstr "adding '%s' to package cache for db '%s'\n" msgid "could not remove database entry %s%s\n" msgstr "could not remove database entry %s%s\n" -#: lib/libalpm/db.c:466 -#: lib/libalpm/sync.c:123 -#, c-format -msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" -msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" - -#: lib/libalpm/db.c:688 +#: lib/libalpm/db.c:553 msgid "attempt to re-register the 'local' DB\n" msgstr "attempt to re-register the 'local' DB\n" -#: lib/libalpm/db.c:697 -#: lib/libalpm/db.c:748 +#: lib/libalpm/db.c:562 lib/libalpm/db.c:613 msgid "database path is undefined\n" msgstr "database path is undefined\n" -#: lib/libalpm/deps.c:194 -msgid "dependency cycle detected\n" +#: lib/libalpm/deps.c:173 +#, fuzzy +msgid "dependency cycle detected:\n" msgstr "dependency cycle detected\n" -#: lib/libalpm/deps.c:713 +#: lib/libalpm/deps.c:175 #, c-format -msgid "cannot resolve \"%s\", a dependency of \"%s\"\n" -msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n" +msgid "%s will be removed after its %s dependency\n" +msgstr "" -#: lib/libalpm/deps.c:718 -#: lib/libalpm/deps.c:749 -#: lib/libalpm/sync.c:596 -#: lib/libalpm/sync.c:612 +#: lib/libalpm/deps.c:177 #, c-format -msgid "malloc failure: could not allocate %zd bytes\n" -msgstr "malloc failure: could not allocate %zd bytes\n" +msgid "%s will be installed before its %s dependency\n" +msgstr "" -#: lib/libalpm/deps.c:746 +#: lib/libalpm/deps.c:573 #, c-format -msgid "cannot resolve dependencies for \"%s\"\n" -msgstr "cannot resolve dependencies for \"%s\"\n" +msgid "cannot resolve \"%s\", a dependency of \"%s\"\n" +msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n" #: lib/libalpm/error.c:43 msgid "out of memory!" @@ -263,8 +252,7 @@ msgstr "could not set parameter" msgid "transaction already initialized" msgstr "transaction already initialised" -#: lib/libalpm/error.c:90 -#: lib/libalpm/error.c:94 +#: lib/libalpm/error.c:90 lib/libalpm/error.c:94 msgid "transaction not initialized" msgstr "transaction not initialised" @@ -394,215 +382,266 @@ msgstr "could not get md5sum for package %s-%s\n" msgid "md5sums do not match for package %s-%s\n" msgstr "md5sums do not match for package %s-%s\n" -#: lib/libalpm/package.c:761 -#, c-format -msgid "%s-%s: ignoring package upgrade (%s)\n" -msgstr "%s-%s: ignoring package upgrade (%s)\n" - -#: lib/libalpm/package.c:770 +#: lib/libalpm/package.c:737 #, c-format msgid "%s: forcing upgrade to version %s\n" msgstr "%s: forcing upgrade to version %s\n" -#: lib/libalpm/package.c:775 +#: lib/libalpm/package.c:742 #, c-format msgid "%s: local (%s) is newer than %s (%s)\n" msgstr "%s: local (%s) is newer than %s (%s)\n" -#: lib/libalpm/package.c:783 +#: lib/libalpm/package.c:750 #, c-format msgid "%s-%s: delaying upgrade of package (%s)\n" msgstr "%s-%s: delaying upgrade of package (%s)\n" -#: lib/libalpm/package.c:961 +#: lib/libalpm/package.c:931 #, c-format msgid "could not parse package description file in %s\n" msgstr "could not parse package description file in %s\n" -#: lib/libalpm/package.c:966 +#: lib/libalpm/package.c:936 #, c-format msgid "missing package name in %s\n" msgstr "missing package name in %s\n" -#: lib/libalpm/package.c:970 +#: lib/libalpm/package.c:940 #, c-format msgid "missing package version in %s\n" msgstr "missing package version in %s\n" -#: lib/libalpm/package.c:1000 +#: lib/libalpm/package.c:970 #, c-format msgid "could not remove tempfile %s\n" msgstr "could not remove tempfile %s\n" -#: lib/libalpm/package.c:1015 -#: lib/libalpm/package.c:1028 +#: lib/libalpm/package.c:985 lib/libalpm/package.c:998 #, c-format msgid "error while reading package %s: %s\n" msgstr "error while reading package %s: %s\n" -#: lib/libalpm/package.c:1035 +#: lib/libalpm/package.c:1005 #, c-format msgid "missing package metadata in %s\n" msgstr "missing package metadata in %s\n" -#: lib/libalpm/package.c:1042 +#: lib/libalpm/package.c:1012 #, c-format msgid "missing package filelist in %s, generating one\n" msgstr "missing package filelist in %s, generating one\n" -#: lib/libalpm/remove.c:122 +#: lib/libalpm/remove.c:121 #, c-format msgid "could not find %s in database -- skipping\n" msgstr "could not find %s in database -- skipping\n" -#: lib/libalpm/remove.c:173 -#: lib/libalpm/remove.c:244 +#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:243 #, c-format msgid "cannot remove file '%s': %s\n" msgstr "cannot remove file '%s': %s\n" -#: lib/libalpm/remove.c:338 +#: lib/libalpm/remove.c:337 #, c-format msgid "could not remove database entry %s-%s\n" msgstr "could not remove database entry %s-%s\n" -#: lib/libalpm/remove.c:343 +#: lib/libalpm/remove.c:342 #, c-format msgid "could not remove entry '%s' from cache\n" msgstr "could not remove entry '%s' from cache\n" -#: lib/libalpm/sync.c:291 +#: lib/libalpm/server.c:56 +#, c-format +msgid "url '%s' is invalid, ignoring\n" +msgstr "" + +#: lib/libalpm/server.c:60 +msgid "url scheme not specified, assuming http\n" +msgstr "" + +#: lib/libalpm/server.c:241 +msgid "disk" +msgstr "" + +#: lib/libalpm/server.c:245 +#, fuzzy, c-format +msgid "failed retrieving file '%s' from %s : %s\n" +msgstr "failed to retrieve some files from %s\n" + +#: lib/libalpm/server.c:275 +msgid "cannot resume download, starting over\n" +msgstr "" + +#: lib/libalpm/server.c:288 +#, fuzzy, c-format +msgid "cannot write to file '%s'\n" +msgstr "cannot remove file '%s': %s\n" + +#: lib/libalpm/server.c:307 +#, fuzzy, c-format +msgid "error downloading '%s': %s\n" +msgstr "error while reading package %s: %s\n" + +#: lib/libalpm/server.c:319 +#, fuzzy, c-format +msgid "error writing to file '%s': %s\n" +msgstr "cannot remove file '%s': %s\n" + +#: lib/libalpm/server.c:387 +#, fuzzy, c-format +msgid "could not chdir to %s\n" +msgstr "could not change directory to / (%s)\n" + +#: lib/libalpm/server.c:394 +msgid "running XferCommand: fork failed!\n" +msgstr "" + +#: lib/libalpm/server.c:445 +msgid "URL does not contain a file for download\n" +msgstr "" + +#: lib/libalpm/server.c:458 +#, fuzzy, c-format +msgid "failed to download %s\n" +msgstr "could not download all files" + +#: lib/libalpm/sync.c:135 +#, c-format +msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" +msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" + +#: lib/libalpm/sync.c:250 +#, fuzzy, c-format +msgid "%s: ignoring package upgrade (%s => %s)\n" +msgstr "%s-%s: ignoring package upgrade (%s)\n" + +#: lib/libalpm/sync.c:320 #, c-format msgid "repository '%s' not found\n" msgstr "repository '%s' not found\n" -#: lib/libalpm/sync.c:333 +#: lib/libalpm/sync.c:354 #, c-format msgid "%s-%s is up to date -- skipping\n" msgstr "%s-%s is up to date -- skipping\n" -#: lib/libalpm/sync.c:592 -#: lib/libalpm/sync.c:608 +#: lib/libalpm/sync.c:358 +#, fuzzy, c-format +msgid "%s-%s is up to date -- reinstalling\n" +msgstr "%s-%s is up to date -- skipping\n" + +#: lib/libalpm/sync.c:613 lib/libalpm/sync.c:618 msgid "unresolvable package conflicts detected\n" msgstr "unresolvable package conflicts detected\n" -#: lib/libalpm/sync.c:845 +#: lib/libalpm/sync.c:628 +#, c-format +msgid "malloc failure: could not allocate %zd bytes\n" +msgstr "malloc failure: could not allocate %zd bytes\n" + +#: lib/libalpm/sync.c:825 #, c-format msgid "command: %s\n" msgstr "command: %s\n" -#: lib/libalpm/sync.c:908 -#: lib/libalpm/sync.c:916 +#: lib/libalpm/sync.c:888 lib/libalpm/sync.c:896 #, c-format msgid "can't get md5 checksum for file %s\n" msgstr "can't get md5 checksum for file %s\n" -#: lib/libalpm/sync.c:930 +#: lib/libalpm/sync.c:910 #, c-format msgid "file %s was corrupted (bad MD5 checksum)\n" msgstr "file %s was corrupted (bad MD5 checksum)\n" -#: lib/libalpm/sync.c:1066 +#: lib/libalpm/sync.c:1056 #, c-format msgid "failed to retrieve some files from %s\n" msgstr "failed to retrieve some files from %s\n" -#: lib/libalpm/sync.c:1147 +#: lib/libalpm/sync.c:1137 msgid "could not create removal transaction\n" msgstr "could not create removal transaction\n" -#: lib/libalpm/sync.c:1153 +#: lib/libalpm/sync.c:1143 msgid "could not initialize the removal transaction\n" msgstr "could not initialise the removal transaction\n" -#: lib/libalpm/sync.c:1175 +#: lib/libalpm/sync.c:1165 msgid "could not prepare removal transaction\n" msgstr "could not prepare removal transaction\n" -#: lib/libalpm/sync.c:1181 +#: lib/libalpm/sync.c:1171 msgid "could not commit removal transaction\n" msgstr "could not commit removal transaction\n" -#: lib/libalpm/sync.c:1192 +#: lib/libalpm/sync.c:1182 msgid "could not create transaction\n" msgstr "could not create transaction\n" -#: lib/libalpm/sync.c:1197 +#: lib/libalpm/sync.c:1187 msgid "could not initialize transaction\n" msgstr "could not initialise transaction\n" -#: lib/libalpm/sync.c:1224 +#: lib/libalpm/sync.c:1214 msgid "could not prepare transaction\n" msgstr "could not prepare transaction\n" -#: lib/libalpm/sync.c:1229 +#: lib/libalpm/sync.c:1219 msgid "could not commit transaction\n" msgstr "could not commit transaction\n" -#: lib/libalpm/sync.c:1266 -#, c-format -msgid "could not update requiredby for database entry %s-%s\n" -msgstr "could not update requiredby for database entry %s-%s\n" - -#: lib/libalpm/sync.c:1275 -#, c-format -msgid "could not update new database entry %s-%s\n" -msgstr "could not update new database entry %s-%s\n" - -#: lib/libalpm/trans.c:215 +#: lib/libalpm/trans.c:214 #, c-format msgid "could not remove lock file %s\n" msgstr "could not remove lock file %s\n" -#: lib/libalpm/trans.c:496 -#, c-format -msgid "could not update 'requiredby' database entry %s-%s\n" -msgstr "could not update 'requiredby' database entry %s-%s\n" - -#: lib/libalpm/trans.c:557 +#: lib/libalpm/trans.c:483 #, c-format msgid "No /bin/sh in root dir (%s), aborting scriptlet\n" msgstr "No /bin/sh in root dir (%s), aborting scriptlet\n" -#: lib/libalpm/trans.c:568 +#: lib/libalpm/trans.c:494 msgid "could not create temp directory\n" msgstr "could not create temp directory\n" -#: lib/libalpm/trans.c:603 +#: lib/libalpm/trans.c:536 #, c-format msgid "could not change directory to %s (%s)\n" msgstr "could not change directory to %s (%s)\n" -#: lib/libalpm/trans.c:621 +#: lib/libalpm/trans.c:554 #, c-format msgid "could not fork a new process (%s)\n" msgstr "could not fork a new process (%s)\n" -#: lib/libalpm/trans.c:631 +#: lib/libalpm/trans.c:564 #, c-format msgid "could not change the root directory (%s)\n" msgstr "could not change the root directory (%s)\n" -#: lib/libalpm/trans.c:636 +#: lib/libalpm/trans.c:569 #, c-format msgid "could not change directory to / (%s)\n" msgstr "could not change directory to / (%s)\n" -#: lib/libalpm/trans.c:645 +#: lib/libalpm/trans.c:578 #, c-format msgid "call to popen failed (%s)" msgstr "call to popen failed (%s)" -#: lib/libalpm/trans.c:664 +#: lib/libalpm/trans.c:597 #, c-format msgid "call to waitpid failed (%s)\n" msgstr "call to waitpid failed (%s)\n" -#: lib/libalpm/trans.c:673 +#: lib/libalpm/trans.c:606 msgid "scriptlet failed to execute correctly\n" msgstr "scriptlet failed to execute correctly\n" -#: lib/libalpm/trans.c:682 +#: lib/libalpm/trans.c:615 #, c-format msgid "could not remove tmpdir %s\n" msgstr "could not remove tmpdir %s\n" @@ -612,54 +651,77 @@ msgstr "could not remove tmpdir %s\n" msgid "failed to make path '%s' : %s\n" msgstr "failed to make path '%s' : %s\n" -#: lib/libalpm/util.c:390 +#: lib/libalpm/util.c:389 #, c-format msgid "could not open %s: %s\n" msgstr "could not open %s: %s\n" -#: lib/libalpm/util.c:574 +#: lib/libalpm/util.c:573 #, c-format msgid "no %s cache exists, creating...\n" msgstr "no %s cache exists, creating...\n" -#: lib/libalpm/util.c:594 +#: lib/libalpm/util.c:593 msgid "couldn't create package cache, using /tmp instead\n" msgstr "couldn't create package cache, using /tmp instead\n" -#: lib/libalpm/util.c:644 +#: lib/libalpm/util.c:643 #, c-format msgid "md5: %s can't be opened\n" msgstr "md5: %s can't be opened\n" -#: lib/libalpm/util.c:646 +#: lib/libalpm/util.c:645 #, c-format msgid "md5: %s can't be read\n" msgstr "md5: %s can't be read\n" +#~ msgid "please remove '%s' first, using -Rd\n" +#~ msgstr "please remove '%s' first, using -Rd\n" + +#~ msgid "cannot resolve dependencies for \"%s\"\n" +#~ msgstr "cannot resolve dependencies for \"%s\"\n" + +#~ msgid "could not update requiredby for database entry %s-%s\n" +#~ msgstr "could not update requiredby for database entry %s-%s\n" + +#~ msgid "could not update new database entry %s-%s\n" +#~ msgstr "could not update new database entry %s-%s\n" + +#~ msgid "could not update 'requiredby' database entry %s-%s\n" +#~ msgstr "could not update 'requiredby' database entry %s-%s\n" + #~ msgid "could not extract %s (%s)" #~ msgstr "could not extract %s (%s)" + #~ msgid "could not update provision '%s' from '%s'" #~ msgstr "could not update provision '%s' from '%s'" #, fuzzy #~ msgid "%s: description file is missing" #~ msgstr "%s: syntax error in description file line %d" + #~ msgid "malloc failed: could not allocate %d bytes" #~ msgstr "malloc failed: could not allocate %d bytes" + #~ msgid "" #~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" #~ msgstr "" #~ "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" + #~ msgid "cannot canonicalize specified root path '%s'" #~ msgstr "cannot canonicalise specified root path '%s'" + #~ msgid "could not get sha1sum for package %s-%s" #~ msgstr "could not get sha1sum for package %s-%s" + #~ msgid "sha1sums do not match for package %s-%s" #~ msgstr "sha1sums do not match for package %s-%s" + #~ msgid "cannot remove file %s: %s" #~ msgstr "cannot remove file %s: %s" + #~ msgid "sha1: %s can't be opened\n" #~ msgstr "sha1: %s can't be opened\n" + #~ msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" #~ msgstr "archive %s is corrupted (bad MD5 or SHA1 checksum)\n" - -- cgit v1.2.3-24-g4f1b