[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Fix broken debian-edu-buster-manual.nl.po file; thanks to 'make status'.

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-doc


Commits:
9df99376 by Wolfgang Schweer at 2018-10-21T11:28:31Z
Fix broken debian-edu-buster-manual.nl.po file; thanks to 'make status'.

- - - - -


2 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -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 at 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
=====================================
@@ -6,13 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-buster-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at 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 at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at 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"
@@ -9812,8 +9806,8 @@ msgstr ""
 "bestand voor uw taal als er zo nog geen bestaat. U vindt er ook informatie "
 "over hoe u vertalingen moet bijwerken."
 
-#.  <remark>
-#. status ignore</remark> 
+#. <remark>
+#. status ignore</remark>
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/9df9937665cd0d6396b2ff4d6d3c735e063ad623

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/9df9937665cd0d6396b2ff4d6d3c735e063ad623
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181021/0ab2223a/attachment-0001.html>