Fix broken debian-edu-buster-manual.nl.po file; thanks to 'make status'. (9df99376) · Commits · Debian Edu / debian-edu-doc

debian/changelog

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@ debian-edu-doc (2.10.8) UNRELEASED; urgency=medium
		* Update Rosegarden manual from the wiki.
		* Use the new debhelper-compat(=11) notation and drop d/compat.

		[ Wolfgang Schweer ]
		* Fix broken debian-edu-buster-manual.nl.po file; thanks to 'make status'.

		-- Petter Reinholdtsen <pere@debian.org> Tue, 02 Oct 2018 00:04:13 +0200

		debian-edu-doc (2.10.7) unstable; urgency=medium

documentation/debian-edu-buster/debian-edu-buster-manual.nl.po

+8 −14

Original line number	Diff line number	Diff line
		@@ -6,13 +6,8 @@ msgid ""
		msgstr ""
		"Project-Id-Version: debian-edu-buster-manual\n"
		"Report-Msgid-Bugs-To: debian-edu-doc@packages.debian.org\n"
		<<<<<<< Updated upstream
		"POT-Creation-Date: 2018-10-21 09:58+0000\n"
		"PO-Revision-Date: 2018-10-10 22:08+0200\n"
		=======
		"POT-Creation-Date: 2018-10-19 20:01+0000\n"
		"PO-Revision-Date: 2018-10-21 12:50+0200\n"
		>>>>>>> Stashed changes
		"PO-Revision-Date: 2018-10-21 13:15+0200\n"
		"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
		"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
		"Language: nl\n"
		@@ -1649,7 +1644,6 @@ msgid "and"
		msgstr "en"

		#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
		#, fuzzy
		#\| msgid ""
		#\| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-10+edu0-"
		#\| "CD.iso\">debian-edu-10+edu0-CD.iso</ulink>"
		@@ -1657,11 +1651,10 @@ msgid ""
		"<ulink url=\"http://get.debian.org/cdimage/weekly-builds/i386/iso-cd/debian-"
		"edu-testing-i386-netinst.iso\">debian-edu-testing-i386-netinst.iso</ulink>"
		msgstr ""
		"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-10+edu0-CD."
		"iso\">debian-edu-10+edu0-CD.iso</ulink>"
		"<ulink url=\"http://get.debian.org/cdimage/weekly-builds/i386/iso-cd/debian-"
		"edu-testing-i386-netinst.iso\">debian-edu-testing-i386-netinst.iso</ulink>"

		#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
		#, fuzzy
		#\| msgid ""
		#\| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
		#\| "debian-edu-10+edu0-CD.iso ./debian-edu-10+edu0-CD.iso </computeroutput>"
		@@ -1670,8 +1663,9 @@ msgid ""
		"builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
		"i386-netinst.iso</computeroutput>"
		msgstr ""
		"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
		"edu-10+edu0-CD.iso ./debian-edu-10+edu0-CD.iso </computeroutput>"
		"<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
		"builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
		"i386-netinst.iso</computeroutput>"

		#. type: Content of: <article><section><section><section><title>
		msgid "USB drive ISO image for i386 and amd64"