Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c
	lib/libalpm/sync.c

1 files changed, 2 insertions, 14 deletions

diff --git a/scripts/po/kk.po b/scripts/po/kk.po
index a7b37dc9..49d10723 100644
--- a/scripts/po/kk.po
+++ b/scripts/po/kk.po
@@ -7,11 +7,11 @@ 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-02-02 00:05-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2012-02-02 06:08+0000\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/kk/)\n"
+"language/kk/)\n"
 "Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -727,18 +727,6 @@ msgstr ""
 msgid "Use '%s' to generate a default secret key."
 msgstr ""
 
-msgid "Verifying %s..."
-msgstr ""
-
-msgid "File %s is unsigned, cannot continue."
-msgstr ""
-
-msgid "The signature of file %s is not valid."
-msgstr ""
-
-msgid "Verifying keyring file signatures..."
-msgstr ""
-
 msgid "No keyring files exist in %s."
 msgstr ""