Merge branch 'maint'

Conflicts:
	lib/libalpm/sync.c
	src/util/pactree.c

1 files changed, 5 insertions, 2 deletions

diff --git a/scripts/po/en_GB.po b/scripts/po/en_GB.po
index 5c30a518..558fab9e 100644
--- a/scripts/po/en_GB.po
+++ b/scripts/po/en_GB.po
@@ -8,8 +8,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: 2012-01-30 21:40-0600\n"
-"PO-Revision-Date: 2012-01-30 21:54-0600\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 00:08-0600\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
@@ -498,6 +498,9 @@ msgstr "You do not have write permission to store packages in %s."
 msgid "You do not have write permission to store downloads in %s."
 msgstr "You do not have write permission to store downloads in %s."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr "You do not have write permission to store source tarballs in %s."
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0%s and %s cannot both be specified"