Merge branch 'maint'

1 files changed, 12 insertions, 26 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 76d2757f..58b8798f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ 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-03-14 13:57-0500\n"
-"PO-Revision-Date: 2011-03-04 18:33+0000\n"
+"POT-Creation-Date: 2011-03-23 02:03-0500\n"
+"PO-Revision-Date: 2011-03-22 15:36+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
@@ -624,10 +624,6 @@ msgid "only one operation may be used at a time\n"
 msgstr "only one operation may be used at a time\n"
 
 #, c-format
-msgid "no operation specified (use -h for help)\n"
-msgstr "no operation specified (use -h for help)\n"
-
-#, c-format
 msgid "invalid option\n"
 msgstr "invalid option\n"
 
@@ -652,12 +648,10 @@ msgid "could not change directory to %s (%s)\n"
 msgstr "could not change directory to %s (%s)\n"
 
 #, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr "directive '%s' without value not recognised\n"
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
-msgstr "directive '%s' with a value not recognised\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
+msgstr ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
 
 #, c-format
 msgid ""
@@ -692,20 +686,8 @@ msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr "config file %s, line %d: All directives must belong to a section.\n"
 
 #, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "config file %s, line %d: directive %s needs a value\n"
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr "config file %s, line %d: problem in options section\n"
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
-msgstr ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognised.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
+msgstr "config file %s, line %d: directive '%s' needs a value\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -724,6 +706,10 @@ msgid "you cannot perform this operation unless you are root.\n"
 msgstr "you cannot perform this operation unless you are root.\n"
 
 #, c-format
+msgid "no operation specified (use -h for help)\n"
+msgstr "no operation specified (use -h for help)\n"
+
+#, c-format
 msgid "no file was specified for --owns\n"
 msgstr "no file was specified for --owns\n"