Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/scripts/po/el.po b/scripts/po/el.po
index 319e2806..301e6971 100644
--- a/scripts/po/el.po
+++ b/scripts/po/el.po
@@ -9,7 +9,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-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-01-05 16:57-0600\n"
 "PO-Revision-Date: 2011-11-14 14:54+0000\n"
 "Last-Translator: nous <nous@archlinux.us>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -1047,12 +1047,16 @@ msgstr "Το '%s' δεν έχει έγκυρη επέκταση συμπιεσμ
 msgid "An entry for '%s' already existed"
 msgstr "Υπήρχε ήδη εγγραφή για το '%s'"
 
-msgid "Computing checksums..."
-msgstr "Υπολογισμός αθροισμάτων ελέγχου..."
+#, fuzzy
+msgid "Invalid package signature file '%s'."
+msgstr "Άκυρο όνομα πακέτου '%s'."
 
 msgid "Adding package signature..."
 msgstr "Προσθήκη υπογραφής πακέτου..."
 
+msgid "Computing checksums..."
+msgstr "Υπολογισμός αθροισμάτων ελέγχου..."
+
 msgid "Creating '%s' db entry..."
 msgstr "Δημιουργία εγγραφής '%s' στην βάση..."