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/kk.po b/scripts/po/kk.po
index b654235a..bffbc317 100644
--- a/scripts/po/kk.po
+++ b/scripts/po/kk.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-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-01-05 16:57-0600\n"
 "PO-Revision-Date: 2011-11-14 03:57+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -994,12 +994,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' жазбасын жасау..."