[debian-edu-commits] debian-edu/ 02/02: merge from master: unfuzzy one string to reach 100%

[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 12879fc85a87e0ef3742c4ab4667ba7a1da06cfa
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Nov 2 12:34:11 2016 +0100

    merge from master: unfuzzy one string to reach 100%
---
 .../debian-edu-wheezy/debian-edu-wheezy-manual.nb.po     | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index c149df4..f3bf5b8 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -6116,18 +6116,6 @@ 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 wheezy main\" >> /etc/apt/sources.list\n"
-#| "# update the list of available packages:\n"
-#| "apt-get update"
 msgid ""
 "# install the debian-keyring securely:\n"
 "apt-get install debian-keyring\n"
@@ -6143,9 +6131,9 @@ msgstr ""
 "# 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"
+"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 det:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\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"
 "# oppdater listen over tilgjengelige pakker:\n"

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