diff options
| author | Dan McGee <dan@archlinux.org> | 2008-08-23 18:28:58 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-08-23 18:28:58 -0500 |
| commit | a4100b384737d6b422a31eb0f6614b4f5f6070cb (patch) | |
| tree | 07e1c219f553de755025ec99435b7e1626fcf1c2 /lib/libalpm/po/en_GB.po | |
| parent | 14203d77f43c02e60770dcbd4a9cb2b39b38bcd6 (diff) | |
| parent | 68e59ecbaf5ab4b0ba8684ea8ce29ef90df84d7a (diff) | |
| download | pacman-a4100b384737d6b422a31eb0f6614b4f5f6070cb.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/po/en_GB.po')
| -rw-r--r-- | lib/libalpm/po/en_GB.po | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 62222bc1..71990fed 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-07-19 17:09+0200\n" -"PO-Revision-Date: 2008-07-19 17:31+0200\n" +"POT-Creation-Date: 2008-08-23 10:54-0500\n" +"PO-Revision-Date: 2008-08-23 23:38+0200\n" "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n" "Language-Team: English <en_gb@li.org>\n" "MIME-Version: 1.0\n" @@ -405,14 +405,6 @@ msgid "unexpected error" msgstr "unexpected error" #, c-format -msgid "%s: forcing upgrade to version %s\n" -msgstr "%s: forcing upgrade to version %s\n" - -#, c-format -msgid "%s: local (%s) is newer than %s (%s)\n" -msgstr "%s: local (%s) is newer than %s (%s)\n" - -#, c-format msgid "could not find %s in database -- skipping\n" msgstr "could not find %s in database -- skipping\n" @@ -433,6 +425,10 @@ 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" #, c-format +msgid "%s: local (%s) is newer than %s (%s)\n" +msgstr "%s: local (%s) is newer than %s (%s)\n" + +#, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" msgstr "%s: ignoring package upgrade (%s => %s)\n" @@ -449,6 +445,10 @@ msgid "%s-%s is up to date -- reinstalling\n" msgstr "%s-%s is up to date -- reinstalling\n" #, c-format +msgid "downgrading package %s (%s => %s)\n" +msgstr "downgrading package %s (%s => %s)\n" + +#, c-format msgid "unresolvable package conflicts detected\n" msgstr "unresolvable package conflicts detected\n" @@ -555,3 +555,6 @@ msgstr "no %s cache exists, creating...\n" #, c-format msgid "couldn't create package cache, using /tmp instead\n" msgstr "couldn't create package cache, using /tmp instead\n" + +#~ msgid "%s: forcing upgrade to version %s\n" +#~ msgstr "%s: forcing upgrade to version %s\n" |