Merge branch 'maint'

Conflicts:
	scripts/makepkg.sh.in

1 files changed, 76 insertions, 18 deletions

diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index e7286b45..a7915f09 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -9,9 +9,9 @@ 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-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"
+"POT-Creation-Date: 2012-01-30 21:40-0600\n"
+"PO-Revision-Date: 2012-01-05 23:01+0000\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/pl/)\n"
 "Language: pl\n"
@@ -475,8 +475,9 @@ msgstr "  --noprogressbar  Nie pokazuj paska postępu przy pobieraniu plików"
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
@@ -623,8 +624,9 @@ msgstr "Skończyłem tworzenie: %s"
 msgid "Usage: %s [pacman_db_root]"
 msgstr "Użycie: %s [pacman_db_root]"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
@@ -729,6 +731,9 @@ msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr ""
 
+msgid "The key identified by %s could not be found locally."
+msgstr ""
+
 msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr ""
 
@@ -780,9 +785,58 @@ msgstr ""
 msgid "Disabling key %s..."
 msgstr "Wyłączanie klucza %s..."
 
-msgid "The key identified by %s does not exist."
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+
+#, fuzzy
+msgid "The key identified by %s could not be edited."
+msgstr "Plik repozytorium '%s' nie mógł zostać stworzony."
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+
+#, fuzzy
+msgid "%s could not be imported."
+msgstr "Plik przyrostowy nie mogł zostać utworzony."
+
+#, fuzzy
+msgid "File %s does not exist and could not be imported."
+msgstr "%s nie istnieje lub nie jest katalogiem."
+
+#, fuzzy
+msgid "A specified key could not be listed."
+msgstr "Plik repozytorium '%s' nie mógł zostać stworzony."
+
+#, fuzzy
+msgid "A specified signature could not be listed."
+msgstr "Jeden lub więcej podpisów PGP nie może zostać zweryfikowanych!"
+
+msgid "A specified key could not be locally signed."
 msgstr ""
 
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+#, fuzzy
+msgid "The signature identified by %s could not be verified."
+msgstr "Jeden lub więcej podpisów PGP nie może zostać zweryfikowanych!"
+
+msgid "Updating trust database..."
+msgstr ""
+
+#, fuzzy
+msgid "Trust database could not be updated."
+msgstr "Plik przyrostowy nie mogł zostać utworzony."
+
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
 
@@ -801,9 +855,6 @@ msgstr ""
 msgid "Please run %s with each operation separately."
 msgstr "Proszę uruchomić %s osobno z każdą operacją."
 
-msgid "Updating trust database..."
-msgstr ""
-
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
@@ -920,9 +971,10 @@ msgstr ""
 "Sposób użycia: repo-add [opcje] <ścieżka-do-bazy-danych> <pakiet|delta> ..."
 "\\n"
 
+#, fuzzy
 msgid ""
 "repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 "repo-add aktualizuje bazę pakietów czytająć plik z pakietem.\\nW linii "
 "poleceń można podać wiele pakietów do dodania\\n\\n"
@@ -937,19 +989,24 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       uaktualnij listę plików w bazie\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+#, fuzzy
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 "Sposób użycia: repo-remove [opcje] <ścieżka-do-bazy-danych> <nazwapakietu|"
 "delta> ...\\n"
 
+#, fuzzy
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n\\n"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 "repo-remove uaktualni bazę pakietów usuwając pakiet o nazwie podanej w linii"
 "\\npoleceń. Wiele pakietów może być podanych w linii poleceń.\\n\\n"
 
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr ""
+
 msgid "  -q, --quiet       minimize output\\n"
 msgstr ""
 
@@ -967,19 +1024,21 @@ msgstr ""
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
 "Przykład:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
 
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+#, fuzzy
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 msgstr "Przykład: repo-remove /ścieżka/do/repo.db.tar.gz kernel26"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>\\n"
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
@@ -1024,9 +1083,8 @@ msgstr "'%s' nie ma poprawnego rozszerzenia archiwum"
 msgid "An entry for '%s' already existed"
 msgstr "Wpis dla '%s' już istniał"
 
-#, fuzzy
 msgid "Invalid package signature file '%s'."
-msgstr "Błędny plik pakietu '%s'."
+msgstr ""
 
 msgid "Adding package signature..."
 msgstr "Dodawanie podpisu dla pakietu..."