diff options
author | Dan McGee <dan@archlinux.org> | 2012-04-07 18:23:55 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2012-04-07 18:23:55 +0200 |
commit | 4ca6590af58177964910588a6d0406f0d009bd0e (patch) | |
tree | 3ff2d0d07aa5bd38f13e9456c5f831bdef06b8e2 /scripts/po/nb.po | |
parent | 3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (diff) | |
parent | b752561a52a88f8e9cc3bcc9c2079eb685245110 (diff) | |
download | pacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.gz pacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.xz |
Merge branch 'maint'
Conflicts:
lib/libalpm/signing.c
lib/libalpm/sync.c
Diffstat (limited to 'scripts/po/nb.po')
-rw-r--r-- | scripts/po/nb.po | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scripts/po/nb.po b/scripts/po/nb.po index cc3617a5..1b75f984 100644 --- a/scripts/po/nb.po +++ b/scripts/po/nb.po @@ -9,11 +9,11 @@ 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-02-02 00:05-0600\n" +"POT-Creation-Date: 2012-03-28 18:00-0500\n" "PO-Revision-Date: 2012-02-03 09:12+0000\n" "Last-Translator: Alexander Rødseth <rodseth@gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/" -"archlinux-pacman/team/nb/)\n" +"archlinux-pacman/language/nb/)\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -780,18 +780,6 @@ msgstr "Det er ingen privat nøkkel tilgjengelig for å signere med." msgid "Use '%s' to generate a default secret key." msgstr "Bruk '%s' for å generere en standard privat nøkkel." -msgid "Verifying %s..." -msgstr "Verifiserer %s..." - -msgid "File %s is unsigned, cannot continue." -msgstr "Filen %s er usignert, kan ikke fortsette." - -msgid "The signature of file %s is not valid." -msgstr "Filsignaturen til %s er ugyldig." - -msgid "Verifying keyring file signatures..." -msgstr "Verifiserer nøkkelknippets filsignaturer..." - msgid "No keyring files exist in %s." msgstr "Ingen nøkkelknippefiler finnes i %s." |