Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c

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

1 files changed, 11 insertions, 6 deletions

diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 617ddb68..e7286b45 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -4,13 +4,14 @@
 #
 # Translators:
 #   <kwpolska@gmail.com>, 2011.
+# Michal Grzeszczuk <michal.grzeszczuk@zoho.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-22 01:48+0000\n"
+"Last-Translator: Michal Grzeszczuk <michal.grzeszczuk@zoho.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/pl/)\n"
 "Language: pl\n"
@@ -191,7 +192,7 @@ msgid "Generating %s file..."
 msgstr "Generuję plik %s..."
 
 msgid "Cannot find library listed in %s: %s"
-msgstr ""
+msgstr "Nie można odnaleźć biblioteki wymienionej w %s: %s"
 
 msgid "Please add a license line to your %s!"
 msgstr "Dodaj pole z licencją do %s!"
@@ -1023,12 +1024,16 @@ msgstr "'%s' nie ma poprawnego rozszerzenia archiwum"
 msgid "An entry for '%s' already existed"
 msgstr "Wpis dla '%s' już istniał"
 
-msgid "Computing checksums..."
-msgstr "Wyliczanie sum kontrolnych..."
+#, fuzzy
+msgid "Invalid package signature file '%s'."
+msgstr "Błędny plik pakietu '%s'."
 
 msgid "Adding package signature..."
 msgstr "Dodawanie podpisu dla pakietu..."
 
+msgid "Computing checksums..."
+msgstr "Wyliczanie sum kontrolnych..."
+
 msgid "Creating '%s' db entry..."
 msgstr "Tworzenie wpisu '%s' w bazie danych..."