www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/software/po software.nl.po


From: Tom Uijldert
Subject: www/software/po software.nl.po
Date: Mon, 23 May 2016 18:40:00 +0000 (UTC)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Tom Uijldert <tuijldert>        16/05/23 18:40:00

Modified files:
        software/po    : software.nl.po 

Log message:
        Update with latest changes

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.nl.po?cvsroot=www&r1=1.11&r2=1.12

Patches:
Index: software.nl.po
===================================================================
RCS file: /webcvs/www/www/software/po/software.nl.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- software.nl.po      2 May 2016 21:31:47 -0000       1.11
+++ software.nl.po      23 May 2016 18:40:00 -0000      1.12
@@ -27,6 +27,52 @@
 msgid "GNU Software"
 msgstr "GNU-software"
 
+<<<<<<< software.nl.po
+# | [-Download a <a href=\"/distros/free-distros.html\">wholly-]{+<strong><a
+# | href=\"/distros/free-distros.html\">Wholly+} free GNU/Linux
+# | [-distribution</a>.-] {+Distributions</a></strong>+}
+#. type: Content of: <div><ul><li>
+msgid ""
+"<strong><a href=\"/distros/free-distros.html\">Wholly free GNU/Linux "
+"Distributions</a></strong>"
+msgstr ""
+"<strong><a href=\"/distros/free-distros.html\">Volledig vrije GNU/Linux-"
+"distributies</a></strong>"
+
+# | [-Download a-]<a [-href=\"/distros/free-distros.html\">wholly free
+# | GNU/Linux distribution</a>.-] {+href=\"/distros/distros.html\">GNU/Linux
+# | Distributions</a>+}
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/distros/distros.html\">GNU/Linux Distributions</a>"
+msgstr "<a href=\"/distros/distros.html\">GNU/Linux-distributies</a>"
+
+#. type: Content of: <div><ul><li>
+msgid ""
+"<a href=\"http://directory.fsf.org/wiki/GNU/\";>Free Software Directory</a>"
+msgstr ""
+"<a href=\"http://directory.fsf.org/wiki/GNU/\";>Overzicht van vrije software</"
+"a>"
+
+# type: Content of: <body><div><div><div><ul><li>
+# | <a [-href=\"/education/education.html\">Education</a>-]
+# | {+href=\"/manual/manual.html\">Manuals</a>+}
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/manual/manual.html\">Manuals</a>"
+msgstr "<a href=\"/manual/manual.html\">Handleidingen</a>"
+
+# | <a [-href=\"/software/recent-releases.html\">recent GNU releases</a>.-]
+# | {+href=\"/software/devel.html\">Development resources</a>+}
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/software/devel.html\">Development resources</a>"
+msgstr "<a href=\"/software/devel.html\">Hulpbronnen voor ontwikkeling</a>"
+
+# type: Content of: <body><div><div><div><ul><li>
+# | <a [-href=\"/education/education.html\">Education</a>-]
+# | {+href=\"/software/gethelp.html\">Get help</a>+}
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/software/gethelp.html\">Get help</a>"
+msgstr "<a href=\"/software/gethelp.html\">Hulp verkrijgen</a>"
+=======
 #. type: Content of: <div><ul><li>
 # | [-Download a <a href=\"/distros/free-distros.html\">wholly-]{+<strong><a
 # | href=\"/distros/free-distros.html\">Wholly+} free GNU/Linux
@@ -85,6 +131,7 @@
 #| msgid "<a href=\"/education/education.html\">Education</a>"
 msgid "<a href=\"/software/gethelp.html\">Get help</a>"
 msgstr "<a href=\"/education/education.html\">Onderwijs</a>"
+>>>>>>> 1.11
 
 #. type: Content of: <p>
 msgid ""
@@ -173,6 +220,37 @@
 msgid "How to get GNU software"
 msgstr "Hoe verkrijg ik GNU-software"
 
+<<<<<<< software.nl.po
+#. type: Content of: <blockquote><p>
+msgid "<strong>Download distributions</strong>"
+msgstr "<strong>Distributies downloaden</strong>"
+
+#. type: Content of: <blockquote><p><a>
+msgid "<a href=\"/distros/free-distros.html\">"
+msgstr "<a href=\"/distros/free-distros.html\">"
+
+#. type: Attribute 'alt' of: <blockquote><p><a><img>
+msgid "GNU and Linux"
+msgstr "GNU en Linux"
+
+#. type: Content of: <blockquote><p>
+msgid "</a>"
+msgstr "</a>"
+
+# | [-If-]{+<em>If+} you're looking for a whole system to install, see our <a
+# | href=\"/distros/free-distros.html\">list of GNU/Linux distributions which
+# | are entirely free [-software</a>.-] {+software</a>.</em>+}
+#. type: Content of: <blockquote><p>
+msgid ""
+"<em>If you're looking for a whole system to install, see our <a href=\"/"
+"distros/free-distros.html\">list of GNU/Linux distributions which are "
+"entirely free software</a>.</em>"
+msgstr ""
+"<em>Wanneer je op zoek bent naar een compleet te installeren systeem, zie "
+"dan onze <a href=\"/distros/free-distros.html\">lijst van GNU/Linux-"
+"distributies die geheel uit vrije software bestaan</a>.</em>"
+
+=======
 #. type: Content of: <blockquote><p>
 msgid "<strong>Download distributions</strong>"
 msgstr "<strong>Distributies downloaden</strong>"
@@ -207,6 +285,7 @@
 "onze <a href=\"/distros/free-distros.html\">lijst van GNU/Linux-distributies "
 "die geheel uit vrije software bestaan</a>."
 
+>>>>>>> 1.11
 #. type: Content of: <p>
 msgid "GNU software is available by several different methods:"
 msgstr "GNU-software is op diverse manieren beschikbaar:"
@@ -344,7 +423,21 @@
 msgid "<a id=\"allgnupkgs\">All GNU packages</a>"
 msgstr "<a id=\"allgnupkgs\">Alle GNU-pakketten</a>"
 
+# | [-Here is a list-]{+Links to the home pages+} of all current GNU
+# | [-packages,-] {+packages are given below,+} using their [-package-]
+# | identifiers (rather than long names) for [-brevity, and-] {+brevity.  They
+# | are+} sorted [-alphabetically.-] {+alphabetically from left to right.+}
+# | If you have corrections to {+this list+} or questions about [-this list,-]
+# | {+it,+} please email <a
+# | href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 #. type: Content of: <p>
+<<<<<<< software.nl.po
+msgid ""
+"Links to the home pages of all current GNU packages are given below, using "
+"their identifiers (rather than long names) for brevity.  They are sorted "
+"alphabetically from left to right.  If you have corrections to this list or "
+"questions about it, please email <a href=\"mailto:address@hidden";>&lt;"
+=======
 # | [-Here is a list-]{+Links to the home pages+} of all current GNU
 # | [-packages,-] {+packages are given below,+} using their [-package-]
 # | identifiers (rather than long names) for [-brevity, and-] {+brevity.  They
@@ -370,7 +463,15 @@
 "pakketaanduiding (in plaats van lange namen) voor beknoptheid, en "
 "alfabetisch gesorteerd. Als je opmerkingen of vragen over deze lijst hebt "
 "kan je een e-mail sturen aan <a href=\"mailto:address@hidden";>&lt;"
+>>>>>>> 1.11
 "address@hidden&gt;</a>."
+msgstr ""
+"Hieronder staat een lijst met koppelingen naar thuispagina's van alle "
+"huidige GNU-pakketten, aangegeven met hun pakketaanduiding (in plaats van "
+"lange namen) voor beknoptheid.  Ze zijn alfabetisch gesorteerd van links "
+"naar rechts. Als je opmerkingen of vragen over deze lijst hebt, kan je een e-"
+"mail sturen aan <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
 
 #. type: Content of: <p>
 msgid "Also available are lists of:"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]