Merge branch 'maint'

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

1 files changed, 2 insertions, 14 deletions

diff --git a/scripts/po/lt.po b/scripts/po/lt.po
index a2074fd2..796b8a0b 100644
--- a/scripts/po/lt.po
+++ b/scripts/po/lt.po
@@ -11,11 +11,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-05 07:27+0000\n"
 "Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/team/lt/)\n"
+"pacman/language/lt/)\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -784,18 +784,6 @@ msgstr "Nėra prieinamo slapto rakto kuriuo galima būtų pasirašyti."
 msgid "Use '%s' to generate a default secret key."
 msgstr "Naudokite „%s“ sukurti numatytąjį slaptą raktą."
 
-msgid "Verifying %s..."
-msgstr "Tikrinama %s..."
-
-msgid "File %s is unsigned, cannot continue."
-msgstr "Failas %s nepasirašytas, negaliu tęsti."
-
-msgid "The signature of file %s is not valid."
-msgstr "%s failo parašai netinkami."
-
-msgid "Verifying keyring file signatures..."
-msgstr "Tikrinami raktinės failo parašai..."
-
 msgid "No keyring files exist in %s."
 msgstr "Aplanke %s raktinės failų nėra."