Merge branch 'po-split'

1 files changed, 36 insertions, 21 deletions

diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index d6cd67d7..02037648 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"POT-Creation-Date: 2011-06-23 21:48-0500\n"
 "PO-Revision-Date: 2011-03-22 15:34+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -153,6 +153,10 @@ msgstr "missing package metadata in %s\n"
 msgid "removing invalid file: %s\n"
 msgstr "removing invalid file: %s\n"
 
+#, fuzzy, c-format
+msgid "could not parse package '%s' description file from db '%s'\n"
+msgstr "could not parse package description file in %s\n"
+
 #, c-format
 msgid "database path is undefined\n"
 msgstr "database path is undefined\n"
@@ -218,18 +222,6 @@ msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "failed retrieving file '%s' from %s : %s\n"
 
 #, c-format
-msgid "resuming download of %s not possible; starting over\n"
-msgstr "resuming download of %s not possible; starting over\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "error writing to file '%s': %s\n"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s\n"
-msgstr "failed retrieving file '%s' from %s\n"
-
-#, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
 msgstr "%s appears to be truncated: %jd/%jd bytes\n"
 
@@ -378,6 +370,18 @@ msgid "could not find repository for target"
 msgstr "could not find repository for target"
 
 #, c-format
+msgid "signature directory not configured correctly"
+msgstr ""
+
+#, c-format
+msgid "invalid PGP signature"
+msgstr ""
+
+#, c-format
+msgid "unknown PGP signature"
+msgstr ""
+
+#, c-format
 msgid "invalid or corrupted delta"
 msgstr "invalid or corrupted delta"
 
@@ -402,10 +406,6 @@ msgid "failed to retrieve some files"
 msgstr "failed to retrieve some files"
 
 #, c-format
-msgid "failed to copy some file"
-msgstr "failed to copy some file"
-
-#, c-format
 msgid "invalid regular expression"
 msgstr "invalid regular expression"
 
@@ -418,6 +418,10 @@ msgid "download library error"
 msgstr "download library error"
 
 #, c-format
+msgid "gpgme error"
+msgstr ""
+
+#, c-format
 msgid "error invoking external downloader"
 msgstr "error invoking external downloader"
 
@@ -426,10 +430,6 @@ msgid "unexpected error"
 msgstr "unexpected error"
 
 #, c-format
-msgid "database larger than maximum size\n"
-msgstr "database larger than maximum size\n"
-
-#, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "could not find %s in database -- skipping\n"
 
@@ -548,3 +548,18 @@ 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 "resuming download of %s not possible; starting over\n"
+#~ msgstr "resuming download of %s not possible; starting over\n"
+
+#~ msgid "error writing to file '%s': %s\n"
+#~ msgstr "error writing to file '%s': %s\n"
+
+#~ msgid "failed retrieving file '%s' from %s\n"
+#~ msgstr "failed retrieving file '%s' from %s\n"
+
+#~ msgid "failed to copy some file"
+#~ msgstr "failed to copy some file"
+
+#~ msgid "database larger than maximum size\n"
+#~ msgstr "database larger than maximum size\n"