Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c

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

1 files changed, 7 insertions, 3 deletions

diff --git a/scripts/po/nb.po b/scripts/po/nb.po
index 23daf81d..ea7c0762 100644
--- a/scripts/po/nb.po
+++ b/scripts/po/nb.po
@@ -9,7 +9,7 @@ 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"
+"POT-Creation-Date: 2012-01-05 16:57-0600\n"
 "PO-Revision-Date: 2011-11-14 07:33+0000\n"
 "Last-Translator: Jonhoo <jon@thesquareplanet.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/"
@@ -1050,12 +1050,16 @@ msgstr "'%s' har ikke en gyldig filendelse for at arkiv."
 msgid "An entry for '%s' already existed"
 msgstr "En oppføring for '%s' finnes allerede"
 
-msgid "Computing checksums..."
-msgstr "Kalkulerer sjekksummer..."
+#, fuzzy
+msgid "Invalid package signature file '%s'."
+msgstr "Ugyldig pakkefil '%s'."
 
 msgid "Adding package signature..."
 msgstr "Legger til pakkesignatur..."
 
+msgid "Computing checksums..."
+msgstr "Kalkulerer sjekksummer..."
+
 msgid "Creating '%s' db entry..."
 msgstr "Oppretter databaseoppføring '%s'..."