[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] (nl) Translation update of Debian Edu Buster Manual

[Frans Spiesschaert]

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


Commits:
b53739d0 by Frans Spiesschaert at 2018-10-21T10:53:39Z
(nl) Translation update of Debian Edu Buster Manual

- - - - -


1 changed file:

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


Changes:

=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
=====================================
@@ -6,8 +6,13 @@ 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
 "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"
@@ -1584,13 +1589,11 @@ msgstr ""
 "Downloaden van de installatiemedia voor Debian Edu 10+edu0, codenaam Buster"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
 #| msgid "netinstall CD image for i386, amd64"
 msgid "netinstall CD images for amd64 or i386"
-msgstr "netinstall cd-image voor i386, amd64"
+msgstr "netinstall cd-images voor amd64 en i386"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 #| msgid ""
 #| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
 #| "Documentation/Buster\"/> is a wiki and updated frequently."
@@ -1598,12 +1601,10 @@ msgid ""
 "These images are still under development - check <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Status/Buster\"/>"
 msgstr ""
-"De (Engelstalige) wikipagina <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Buster\"/> bevat de originele versie die regelmatig bijgewerkt "
-"wordt."
+"Aan de ontwikkeling van deze images wordt nog gewerkt - kijk op <ulink url="
+"\"https://wiki.debian.org/DebianEdu/Status/Buster\"/>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
 #| msgid ""
 #| "The netinstall CD, which also can be used for installation from USB flash "
 #| "drives, is suitable to install i386 and amd64 machines. As the name "
@@ -1615,12 +1616,11 @@ msgid ""
 "internet access is required for the installation. They are available via"
 msgstr ""
 "Het netinstall cd-image, waarmee u ook een installatie kunt uitvoeren vanaf "
-"een USB-stick, is geschikt om een installatie uit te voeren op i386- en "
-"amd64-computers. Zoals uit de naam af te leiden valt, is toegang tot het "
+"een USB-stick, is geschikt om een installatie uit te voeren op amd64- en "
+"i386-computers. Zoals uit de naam af te leiden valt, is toegang tot het "
 "internet nodig voor de installatie. Het image wordt beschikbaar gesteld via"
 
 #. 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>"
@@ -1628,11 +1628,10 @@ msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/amd64/iso-cd/debian-"
 "edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-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/amd64/iso-cd/debian-"
+"edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-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>"
@@ -1641,12 +1640,13 @@ msgid ""
 "builds/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-testing-"
 "amd64-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/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-testing-"
+"amd64-netinst.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "and"
-msgstr ""
+msgstr "en"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy



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

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/commit/b53739d0c36f3ca1712944fa3c5dbcab8c3d32ce
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/0857f50a/attachment-0001.html>