Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c

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

5 files changed, 31 insertions, 29 deletions

diff --git a/src/pacman/po/fi.po b/src/pacman/po/fi.po
index ecc9939a..5f6a8ee9 100644
--- a/src/pacman/po/fi.po
+++ b/src/pacman/po/fi.po
@@ -14,7 +14,7 @@ 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-21 17:16+0000\n"
+"PO-Revision-Date: 2011-12-06 17:08+0000\n"
 "Last-Translator: Larso <larso@gmx.com>\n"
 "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/fi/)\n"
@@ -946,7 +946,7 @@ msgstr "Tiedosto %s ei kuulu mihinkään pakettiin, poistetaanko se?"
 
 #, c-format
 msgid "failed to update %s (%s)\n"
-msgstr "Paketin %s päivittäminen epäonnistui (%s)\n"
+msgstr "Pakettivaraston %s päivittäminen epäonnistui (%s)\n"
 
 #, c-format
 msgid " %s is up to date\n"
@@ -974,7 +974,7 @@ msgstr "ohitetaan kohde: %s\n"
 
 #, c-format
 msgid "target not found: %s\n"
-msgstr "ei löydetä kohdetta: %s\n"
+msgstr "kohdetta %s ei löydy\n"
 
 #, c-format
 msgid ":: There are %d members in group %s:\n"
diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po
index 5e8bf75a..0c09a03f 100644
--- a/src/pacman/po/hu.po
+++ b/src/pacman/po/hu.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# György Balló <ballogy@freestart.hu>, 2011.
+# György Balló <ballogy@freestart.hu>, 2011, 2012.
 # ngaba <ngaba@bibl.u-szeged.hu>, 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"
+"PO-Revision-Date: 2012-01-03 22:35+0000\n"
+"Last-Translator: György Balló <ballogy@freestart.hu>\n"
 "Language-Team: Hungarian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/hu/)\n"
 "Language: hu\n"
@@ -1178,11 +1178,11 @@ msgstr "%s tároló\n"
 
 #, c-format
 msgid "invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "érvénytelen szám: %d nincs %d és %d között\n"
 
 #, c-format
 msgid "invalid number: %s\n"
-msgstr ""
+msgstr "érvénytelen szám: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
diff --git a/src/pacman/po/lt.po b/src/pacman/po/lt.po
index 4fa314ae..aee5b017 100644
--- a/src/pacman/po/lt.po
+++ b/src/pacman/po/lt.po
@@ -4,14 +4,15 @@
 #
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 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"
+"PO-Revision-Date: 2011-12-20 11:36+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"
@@ -1167,11 +1168,11 @@ msgstr "Saugykla %s\n"
 
 #, c-format
 msgid "invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "netinkama reikšmė: %d yra ne tarp %d ir %d\n"
 
 #, c-format
 msgid "invalid number: %s\n"
-msgstr ""
+msgstr "netinkamas skaičius: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
diff --git a/src/pacman/po/sk.po b/src/pacman/po/sk.po
index 68cd207d..a9181145 100644
--- a/src/pacman/po/sk.po
+++ b/src/pacman/po/sk.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+#   <archetyp@linuxmail.org>, 2011.
 # Dušan Lago <dusan.lago@gmail.com>, 2011.
 #   <jose1711@gmail.com>, 2011.
 # jose1711 <jose1711@gmail.com>, 2011.
@@ -11,8 +12,8 @@ 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"
+"PO-Revision-Date: 2011-11-25 15:12+0000\n"
+"Last-Translator: archetyp <archetyp@linuxmail.org>\n"
 "Language-Team: Slovak (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/sk/)\n"
 "Language: sk\n"
@@ -370,7 +371,7 @@ msgstr "Veľkosť sťahov.: %6.2f %s\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f %s\n"
-msgstr "Kompresovaná veľ %6.2f %s\n"
+msgstr "Komprimovaná veľkosť: %6.2f %s\n"
 
 #, c-format
 msgid "Installed Size : %6.2f %s\n"
@@ -823,16 +824,16 @@ msgstr "skupina '%s' nebola nájdená\n"
 #, c-format
 msgid "%s: %jd total file, "
 msgid_plural "%s: %jd total files, "
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s: %jd súbor celkom, "
+msgstr[1] "%s: %jd súbory celkom, "
+msgstr[2] "%s: %jd súborov celkom, "
 
 #, c-format
 msgid "%jd missing file\n"
 msgid_plural "%jd missing files\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%jd chýbajúci súbor\n"
+msgstr[1] "%jd chýbajúce súbory\n"
+msgstr[2] "%jd chýbajúcich súborov\n"
 
 #, c-format
 msgid "package '%s' was not found\n"
@@ -1155,7 +1156,7 @@ msgstr "Celková veľkosť inštal: %.2f %s\n"
 
 #, c-format
 msgid "Total Removed Size:     %.2f %s\n"
-msgstr ""
+msgstr "Celková uvoľnená veľkosť:     %.2f %s\n"
 
 #, c-format
 msgid "Net Upgrade Size:       %.2f %s\n"
@@ -1175,11 +1176,11 @@ msgstr "Repozitár %s\n"
 
 #, c-format
 msgid "invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "neplatná hodnota: %d nie je medzi %d a %d\n"
 
 #, c-format
 msgid "invalid number: %s\n"
-msgstr ""
+msgstr "neplatné číslo: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
diff --git a/src/pacman/po/uk.po b/src/pacman/po/uk.po
index 78e80b1e..3f6f3995 100644
--- a/src/pacman/po/uk.po
+++ b/src/pacman/po/uk.po
@@ -10,8 +10,8 @@ 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"
+"PO-Revision-Date: 2011-12-22 11:49+0000\n"
+"Last-Translator: Данило Коростіль <ted.korostiled@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/uk/)\n"
 "Language: uk\n"
@@ -305,7 +305,7 @@ msgstr "%s: причину встановлення вказано на «явн
 
 #, c-format
 msgid "Explicitly installed"
-msgstr "Явно встановлений"
+msgstr "Явно встановлено"
 
 #, c-format
 msgid "Installed as a dependency for another package"
@@ -1184,11 +1184,11 @@ msgstr "Сховище %s\n"
 
 #, c-format
 msgid "invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "неприпустиме значення: %d не міститься між %d та %d\n"
 
 #, c-format
 msgid "invalid number: %s\n"
-msgstr ""
+msgstr "неприпустиме число: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"