[debian-edu-commits] debian-edu/ 01/01: Norwegian Bokmål: Ingrid Yrvin and Ole-Erik Yrvin.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch jessie
in repository debian-edu-doc.

commit f2bfd026e76337e89ec26f5ec92f369b8255393c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 3 14:51:44 2016 +0200

    Norwegian Bokmål: Ingrid Yrvin and Ole-Erik Yrvin.
    
    copied from e60e38d
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                                   |  1 +
 .../debian-edu-jessie-manual.nb.po                 | 29 +++++++---------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 708fa9d..64880ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ debian-edu-doc (1.6~20160918+deb8u3) UNRELEASED; urgency=medium
 
   [ Jessie Manual translation updates ]
   * German: Wolfgang Schweer.
+  * Norwegian Bokmål: Ingrid Yrvin and Ole-Erik Yrvin.
 
  -- Holger Levsen <holger at debian.org>  Sun, 18 Sep 2016 11:03:55 +0200
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index 7bc8d8f..5f0da5c 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -21,8 +21,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-10-01 14:33+0200\n"
-"PO-Revision-Date: 2016-08-05 07:55+0000\n"
+"POT-Creation-Date: 2016-10-03 14:25+0200\n"
+"PO-Revision-Date: 2016-10-03 08:32+0000\n"
 "Last-Translator: Ingrid Yrvin <ingrid.yrvin at gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/debian-"
 "edu-skolelinux/debian-edu-doc/language/nb_NO/)\n"
@@ -6515,18 +6515,7 @@ msgstr ""
 "nettarkiv, eller du kan legge til"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "# install the debian-keyring securely:\n"
-#| "apt-get install debian-keyring\n"
-#| "# fetch the deb-multimedia key insecurely:\n"
-#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
-#| "# add repository to sources.list - please check the homepages for mirrors!\n"
-#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
-#| "# update the list of available packages:\n"
-#| "apt-get update"
+#, no-wrap
 msgid ""
 "# install the debian-keyring securely:\n"
 "apt-get install debian-keyring\n"
@@ -6539,14 +6528,14 @@ msgid ""
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
-"# installer debian nøkkelringen sikkert:\n"
-"aptitude install debian-keyring\n"
+"# installer Debian-nøkkelringen sikkert:\n"
+"apt-get install debian-keyring\n"
 "# hent deb-multimedianøkkelen usikret:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# sjekk sikkert om nøkkelen er korrekt, og legg den til nøkkelingen apt benytter hvis den er det:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+"# sjekk sikkert om nøkkelen er korrekt, og legg den til nøkkelringen APT benytter hvis den er:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for speil!\n"
-"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
 "# oppdater listen over tilgjengelige pakker:\n"
 "aptitude update"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git