Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c

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

1 files changed, 12 insertions, 7 deletions

diff --git a/scripts/po/lt.po b/scripts/po/lt.po
index 9476621c..618d17d5 100644
--- a/scripts/po/lt.po
+++ b/scripts/po/lt.po
@@ -4,15 +4,16 @@
 #
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011.
 # FULL NAME <EMAIL@ADDRESS>, 2011.
 # toofishes <dpmcgee@gmail.com>, 2011.
 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"
-"PO-Revision-Date: 2011-11-14 03:57+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2012-01-05 16:57-0600\n"
+"PO-Revision-Date: 2011-12-20 11:34+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"
 "Language: lt\n"
@@ -504,10 +505,10 @@ msgid "%s signal caught. Exiting..."
 msgstr "%s signalas pagautas. Išeinama..."
 
 msgid "Aborted by user! Exiting..."
-msgstr ""
+msgstr "Naudotojas nutraukė! Išeinama..."
 
 msgid "An unknown error has occurred. Exiting..."
-msgstr ""
+msgstr "Kilo nežinoma klaida. Išeinama..."
 
 msgid "%s not found."
 msgstr "%s nerasta."
@@ -1053,12 +1054,16 @@ msgstr "'%s' neturi reikiamo archyvo plėtinio."
 msgid "An entry for '%s' already existed"
 msgstr "Įrašas apie '%s' jau yra"
 
-msgid "Computing checksums..."
-msgstr "Skaičiuojamos kontrolinės sumos..."
+#, fuzzy
+msgid "Invalid package signature file '%s'."
+msgstr "Neteisingas paketo failas '%s'."
 
 msgid "Adding package signature..."
 msgstr "Pridedamas paketo parašas..."
 
+msgid "Computing checksums..."
+msgstr "Skaičiuojamos kontrolinės sumos..."
+
 msgid "Creating '%s' db entry..."
 msgstr "Kuriamas '%s' duomenų bazės įrašas..."