www-commits
[Top][All Lists]
Advanced

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

www/philosophy/po free-sw.af.po free-sw.ar-diff...


From: GNUN
Subject: www/philosophy/po free-sw.af.po free-sw.ar-diff...
Date: Fri, 16 Jul 2021 06:02:25 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/16 06:02:24

Modified files:
        philosophy/po  : free-sw.af.po free-sw.ar-diff.html 
                         free-sw.ar.po free-sw.bg.po free-sw.ca.po 
                         free-sw.cs.po free-sw.da.po 
                         free-sw.de-diff.html free-sw.de.po 
                         free-sw.el.po free-sw.es.po free-sw.fa.po 
                         free-sw.fr.po free-sw.hr-diff.html 
                         free-sw.hr.po free-sw.id.po free-sw.it.po 
                         free-sw.ja.po free-sw.ko.po 
                         free-sw.lt-diff.html free-sw.lt.po 
                         free-sw.ml.po free-sw.nb.po free-sw.nl.po 
                         free-sw.pl.po free-sw.pot free-sw.pt-br.po 
                         free-sw.ro-diff.html free-sw.ro.po 
                         free-sw.ru.po free-sw.sk.po free-sw.sq.po 
                         free-sw.sr-diff.html free-sw.sr.po 
                         free-sw.sv.po free-sw.ta.po free-sw.tr.po 
                         free-sw.uk-diff.html free-sw.uk.po 
                         free-sw.zh-cn.po free-sw.zh-tw-diff.html 
                         free-sw.zh-tw.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.af.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ar-diff.html?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ar.po?cvsroot=www&r1=1.103&r2=1.104
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.bg.po?cvsroot=www&r1=1.74&r2=1.75
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ca.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.cs.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.da.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.de-diff.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.de.po?cvsroot=www&r1=1.114&r2=1.115
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.el.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.es.po?cvsroot=www&r1=1.144&r2=1.145
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.fa.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.fr.po?cvsroot=www&r1=1.154&r2=1.155
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.hr-diff.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.hr.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.id.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.it.po?cvsroot=www&r1=1.175&r2=1.176
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ja.po?cvsroot=www&r1=1.109&r2=1.110
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ko.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.lt-diff.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.lt.po?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ml.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.nb.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.nl.po?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pl.po?cvsroot=www&r1=1.109&r2=1.110
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pot?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pt-br.po?cvsroot=www&r1=1.74&r2=1.75
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ro-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ro.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ru.po?cvsroot=www&r1=1.121&r2=1.122
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sk.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sq.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sr-diff.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sr.po?cvsroot=www&r1=1.80&r2=1.81
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sv.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ta.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.tr.po?cvsroot=www&r1=1.93&r2=1.94
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.uk-diff.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.uk.po?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-tw-diff.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-tw.po?cvsroot=www&r1=1.67&r2=1.68

Patches:
Index: free-sw.af.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.af.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- free-sw.af.po       3 Feb 2021 13:03:03 -0000       1.71
+++ free-sw.af.po       16 Jul 2021 10:02:23 -0000      1.72
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: 2008-02-19 07:45+0200\n"
 "Last-Translator: Renier Maritz <renier@gigaskills.co.za>\n"
 "Language-Team:\n"
@@ -20,12 +20,12 @@
 "Outdated-Since: 2008-12-09 16:53+0000\n"
 
 #. type: Content of: <title>
-# | [-The Free Software Definition-]{+What is free software?+} - GNU Project -
-# | Free Software Foundation
+# | [-The-]{+What is+} Free [-Software Definition-] {+Software?+} - GNU
+# | Project - Free Software Foundation
 #, fuzzy
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation "
-msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr "Die Vrye Sagteware Definisie - GNU Projek - Free Software Foundation"
 
 #. type: Attribute 'content' of: <meta>
@@ -41,56 +41,14 @@
 "use."
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr ""
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Die Vrye Sagteware Definisie"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-# | [-We maintain this-]{+The+} free software definition [-to show clearly
-# | what must be true about-] {+presents the criteria for whether+} a
-# | particular software program [-for-] {+qualifies as free software.  From
-# | time to time we revise this definition, to clarify+} it {+or+} to [-be
-# | considered-] {+resolve questions about subtle issues.  See the <a
-# | href=\"#History\">History section</a> below for a list of changes that
-# | affect the definition of+} free software.
+#. type: Content of: <div><h2>
+# | [-The-]{+What is+} Free [-Software Definition-] {+Software?+}
 #, fuzzy
-#| msgid ""
-#| "We maintain this free software definition to show clearly what must be "
-#| "true about a particular software program for it to be considered free "
-#| "software."
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"Ons onderhou die definisie van vrye sagteware om te verseker dat daar "
-"duidelik verstaan kan word wat waar moet wees omtrent 'n besondere "
-"sagtewareprogram alvorens dit as vrye sagteware beskou kan word."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
+#| msgid "The Free Software Definition"
+msgid "What is Free Software?"
+msgstr "Die Vrye Sagteware Definisie"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 # | &ldquo;Free software&rdquo; {+means software that respects users' freedom
 # | and community.  Roughly, it means that <b>the users have the freedom to
 # | run, copy, distribute, study, change and improve the software</b>.  Thus,
@@ -119,7 +77,30 @@
 "woord &ldquo;vry&rdquo; en nie gratis nie.  Vrye sagteware kan jou geld kos "
 "terwyl sommige sagteware wat jy verniet kry nie noodwendig vry is nie."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | You may have paid money to get copies of {+a+} free [-software,-]
+# | {+program,+} or you may have obtained copies at no charge.  But regardless
+# | of how you got your copies, you always have the freedom to copy and change
+# | the software, even to <a href=\"/philosophy/selling.html\">sell copies</a>.
+#, fuzzy
+#| msgid ""
+#| "You may have paid money to get copies of free software, or you may have "
+#| "obtained copies at no charge.  But regardless of how you got your copies, "
+#| "you always have the freedom to copy and change the software, even to <a "
+#| "href=\"/philosophy/selling.html\">sell copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"Jy mag dalk geld betaal het om kopie&euml; van vrye sagteware te bekom, of "
+"jy mag kopie&euml; verniet gekry het.&nbsp; Ongeag van hoe jy jou kopie in "
+"die hande gekry het, het jy altyd die vryheid om kopie&euml; te maak en die "
+"sagteware te verander en dit selfs te <a href=\"http://www.gnu.org/";
+"philosophy/selling.html\">verkoop</a>"
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -130,11 +111,145 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "Table of contents"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "Die Vrye Sagteware Definisie"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Die Vrye Sagteware Definisie"
+
+#. type: Content of: <div><div><p>
+# | [-We maintain this-]{+The+} free software definition [-to show clearly
+# | what must be true about-] {+presents the criteria for whether+} a
+# | particular software program [-for-] {+qualifies as free software.  From
+# | time to time we revise this definition, to clarify+} it {+or+} to [-be
+# | considered-] {+resolve questions about subtle issues.  See the <a
+# | href=\"#History\">History section</a> below for a list of changes that
+# | affect the definition of+} free software.
+#, fuzzy
+#| msgid ""
+#| "We maintain this free software definition to show clearly what must be "
+#| "true about a particular software program for it to be considered free "
+#| "software."
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"Ons onderhou die definisie van vrye sagteware om te verseker dat daar "
+"duidelik verstaan kan word wat waar moet wees omtrent 'n besondere "
+"sagtewareprogram alvorens dit as vrye sagteware beskou kan word."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-Free software-]{+A program+} is [-a matter of the users' freedom to run,
 # | copy, distribute, study, change and improve the software.  More precisely,
 # | it refers to four kinds of freedom, for-] {+free software if+} the
@@ -154,7 +269,7 @@
 "verbeter.&nbsp; Meer presies verwys dit na vier soorte vryhede vir die "
 "gebruikers van die sagteware:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to run the [-program,-] {+program as you wish,+} for any
 # | purpose (freedom 0).
 #, fuzzy
@@ -164,7 +279,7 @@
 msgstr ""
 "Die vryheid om die program te hardloop vir enige doeleinde (vryheid 0)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to study how the program works, and [-adapt-] {+change+} it
 # | [-to-] {+so it does+} your [-needs-] {+computing as you wish+} (freedom
 # | 1). Access to the source code is a precondition for this.
@@ -181,7 +296,7 @@
 "te pas na joubehoefte (vryheid 1). Toegang tot die bronkode is 'n&nbsp;"
 "voorvereiste vir hierdie vryheid."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to redistribute copies so you can help [-your neighbor-]
 # | {+others+} (freedom 2).
 #, fuzzy
@@ -193,7 +308,7 @@
 "Die vryheid om kopie&euml; te herversprei sodat jy jou naaste kan help "
 "(vryheid 2)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to [-improve the program, and release-] {+distribute copies
 # | of+} your [-improvements-] {+modified versions+} to [-the public, so
 # | that-] {+others (freedom 3).  By doing this you can give+} the whole
@@ -214,7 +329,7 @@
 "vry te stel sodat die hele gemeenskap voordeel daaruit kan trek (vryheid "
 "3).  Toegang tot die bronkode is 'n voorvereiste hiervoor."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -222,7 +337,7 @@
 "free, we consider them all equally unethical."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -233,7 +348,11 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -242,7 +361,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -255,7 +374,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -263,7 +382,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -274,45 +393,22 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | You may have paid money to get copies of {+a+} free [-software,-]
-# | {+program,+} or you may have obtained copies at no charge.  But regardless
-# | of how you got your copies, you always have the freedom to copy and change
-# | the software, even to <a href=\"/philosophy/selling.html\">sell copies</a>.
-#, fuzzy
-#| msgid ""
-#| "You may have paid money to get copies of free software, or you may have "
-#| "obtained copies at no charge.  But regardless of how you got your copies, "
-#| "you always have the freedom to copy and change the software, even to <a "
-#| "href=\"/philosophy/selling.html\">sell copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"Jy mag dalk geld betaal het om kopie&euml; van vrye sagteware te bekom, of "
-"jy mag kopie&euml; verniet gekry het.&nbsp; Ongeag van hoe jy jou kopie in "
-"die hande gekry het, het jy altyd die vryheid om kopie&euml; te maak en die "
-"sagteware te verander en dit selfs te <a href=\"http://www.gnu.org/";
-"philosophy/selling.html\">verkoop</a>"
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | The freedom to run the program means the freedom for any kind of person or
 # | organization to use it on any kind of computer system, for any kind of
 # | overall job and purpose, without being required to communicate about it
@@ -352,7 +448,7 @@
 "vir sy eie doeleindes te gebruik en is jy nie geregtig om beperkinge op "
 "daardie persoon tel&ecirc; nie."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -361,7 +457,7 @@
 "particular computing activity."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -372,18 +468,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for [-the-] freedoms {+1 and 3 (the freedom+} to make
 # | changes[-,-] and {+the freedom+} to publish [-improved versions,-] {+the
 # | changed versions)+} to be meaningful, you [-must-] {+need to+} have access
@@ -409,7 +505,7 @@
 "program h&ecirc;.  Daarom is toegang tot die bronkode 'n voorvereiste vir "
 "vrye sagteware."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -421,7 +517,7 @@
 "from is free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | One important way to modify a program is by merging in available free
 # | subroutines and modules.  If the program's license says that you cannot
 # | merge in [-an-] {+a suitably licensed+} existing [-module, such as-]
@@ -448,25 +544,25 @@
 "die kopiereg hou op enige kode wat jy byvoeg, dan is die lisensie te "
 "beperkend om te kwalifiseer as vrye sagteware."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
 "else considers an improvement, that program is not free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-A program is free software if users have all of these freedoms. 
 # | Thus,-]{+Freedom to distribute (freedoms 2 and 3) means+} you [-should
 # | be-] {+are+} free to redistribute copies, either with or without
@@ -496,7 +592,7 @@
 "om hierdie dinge te doen beteken (onder andere) dat jy nie vir toestemming "
 "hoef te vra of te betaal nie."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -510,16 +606,16 @@
 "daarvan in kennis te stel nie of op 'n besondere manier daarvan in kennis te "
 "stel nie."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -538,18 +634,19 @@
 "ondersteun nie), maar jy behoort die vryheid te h&ecirc; om sulke vorme te "
 "versprei as jy 'n manier vind of ontwikkel om dit te kan maak."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-However, certain-]{+Certain+} kinds of rules about the manner of
 # | distributing free software are acceptable, when they don't conflict with
 # | the central freedoms.  For example, <a
-# | href=\"/copyleft/copyleft.html\">copyleft</a> (very simply stated) is the
-# | rule that when redistributing the program, you cannot add restrictions to
-# | deny other people the central freedoms.  This rule does not conflict with
-# | the central freedoms; rather it protects them.
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
 #, fuzzy
 #| msgid ""
 #| "However, certain kinds of rules about the manner of distributing free "
@@ -562,7 +659,7 @@
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -574,7 +671,7 @@
 "om ander mense die kernvryhede te onts&ecirc; nie. Hierdie re&euml;l is nie "
 "in stryd met die kernvryhede nie; dit beskerm hulle eerder."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In the GNU project, we use copyleft to protect [-these-] {+the four+}
 # | freedoms legally for everyone.  [-But <a
 # | 
href=\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\">non-copylefted
@@ -620,11 +717,11 @@
 "sagteware, kopielinkse sagteware en ander kategorie&euml; sagteware verband "
 "hou met mekaar."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Rules about how to package a modified version are acceptable, if they
 # | don't substantively [-block-] {+limit+} your freedom to release modified
 # | versions, or your freedom to make and use modified versions privately. 
@@ -679,7 +776,7 @@
 "die vorige ontwikkelaarmoet stuur of dat jy jouself op veranderinge "
 "identifiseer."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -691,7 +788,7 @@
 "use are also acceptable."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -701,20 +798,21 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr ""
 
-#. type: Content of: <div><p>
-# | Sometimes government <a id=\"exportcontrol\">export control
-# | regulations</a> and trade sanctions can constrain your freedom to
-# | distribute copies of programs internationally.  Software developers do not
-# | have the power to eliminate or override these restrictions, but what they
-# | can and must do is refuse to impose them as conditions of use of the
-# | program.  In this way, the restrictions will not affect activities and
-# | people outside the jurisdictions of these governments.  {+Thus, free
-# | software licenses must not require obedience to any nontrivial export
-# | regulations as a condition of exercising any of the essential freedoms.+}
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  {+Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.+}
 #, fuzzy
 #| msgid ""
 #| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
@@ -725,15 +823,15 @@
 #| "way, the restrictions will not affect activities and people outside the "
 #| "jurisdictions of these governments."
 msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "<a id=\"exportcontrol\">Soms stel regerings uitvoerbeheermaatre&euml;ls</a> "
 "en handelsanksies in wat jou vryheid om sagteware internasionaal te versprei "
@@ -743,7 +841,7 @@
 "hierdie manier sal die beperkinge nie mense buite die jurisdiksie van "
 "hierdie regerings beïnvloed nie."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -753,11 +851,11 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for these freedoms to be real, they must be {+permanent and+}
 # | irrevocable as long as you do nothing wrong; if the developer of the
 # | software has the power to revoke the license, {+or retroactively add
@@ -781,7 +879,7 @@
 "sagteware die mag het om die lisensie te herroep, sonder dat jy aanleiding "
 "daartoe gegee het, is die sagteware nie vry nie."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -790,17 +888,17 @@
 "of those nonfree programs; that makes the license nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -821,7 +919,7 @@
 "baie moontlike maniere is waarop so 'n lisensie onaanvaarbaar beperkend en "
 "nie-vry kan wees nie."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -834,66 +932,54 @@
 "as aanvaarbaar gelys word nie, sal dit waarskynlik oorweeg moet word en in "
 "alle waarskynlikheid nie aanvaar word as vrye sagteware nie."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr ""
-
-#. type: Content of: <div><p>
-# | When talking about free software, it is best to avoid using terms like
-# | &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms
-# | imply that the issue is about price, not freedom.  Some common terms such
-# | as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a
-# | href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that
-# | are Worth Avoiding</a> for a discussion of these terms.  We also have a
-# | list of {+proper+} <a
-# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
-# | software&rdquo;</a> into various languages.
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
 #, fuzzy
-#| msgid ""
-#| "When talking about free software, it is best to avoid using terms like "
-#| "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
-#| "imply that the issue is about price, not freedom.  Some common terms such "
-#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
-#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
-#| "that are Worth Avoiding</a> for a discussion of these terms.  We also "
-#| "have a list of <a href=\"/philosophy/fs-translations.html\">translations "
-#| "of &ldquo;free software&rdquo;</a> into various languages."
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Wanneer daar oor vrye sagteware gepraat word is dit beter om begrippe soos "
-"\"weggee\" of \"gratis\" te gebruik omadt daardie begrippe impliseer dat dit "
-"oor prys alleen gaan en nie vryheid nie.&nbsp; Sommige algemene begrippe "
-"soos kopieregskending (piracy) sluit opinies in wat ons hoop u nie "
-"ondersteun nie.&nbsp; <a href=\"/philosophy/words-to-avoid.html\">Sien "
-"verwarrende woorde en frases wat vermy moet word</a> vir 'n bespreking oor "
-"hierdie begrippe.&nbsp; Daar is ook 'n lys van <a href=\"/philosophy/fs-"
-"translations.html\">vertalings van vry sagteware</a> in verskeie tale."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Die Vrye Sagteware Definisie"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Laastens moet u kennis neem dat kriteria soos die wat deur hierdie sagteware "
 "definisie uitgestip word versigtige oorweging verg vir hulle vertolking.  Om "
@@ -909,11 +995,11 @@
 "andere te maak om te sien waarom sekere lisensies as vryesagteware "
 "kwalifiseer aldan nie."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -927,7 +1013,7 @@
 "nie hier gelys is nie, kan u onsdaaroor uitvra deur 'n epos aan ons te stuur "
 "by <a href=\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</a>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | If you are contemplating writing a new license, please contact the [-FSF-]
 # | {+Free Software Foundation first+} by writing to that address. The
 # | proliferation of different free software licenses means increased work for
@@ -953,7 +1039,7 @@
 "hierdie lisensies te verstaan; ons mag kan help om 'n bestaande sagteware "
 "lisensie te vind wat aan u behoeftes voldoen."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | If that isn't possible, if you really need a new license, with our help
 # | you can ensure that the license really is a [-Free Software-] {+free
 # | software+} license and avoid various practical problems.
@@ -971,11 +1057,83 @@
 "help om te verseker dat die lisensie werklik 'n Vrye Sagteware lisensie is "
 "en sodoende verskeie praktiese probleme vermy."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+# | When talking about free software, it is best to avoid using terms like
+# | &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms
+# | imply that the issue is about price, not freedom.  Some common terms such
+# | as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a
+# | href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that
+# | are Worth Avoiding</a> for a discussion of these terms.  We also have a
+# | list of {+proper+} <a
+# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
+# | software&rdquo;</a> into various languages.
+#, fuzzy
+#| msgid ""
+#| "When talking about free software, it is best to avoid using terms like "
+#| "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
+#| "imply that the issue is about price, not freedom.  Some common terms such "
+#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
+#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
+#| "that are Worth Avoiding</a> for a discussion of these terms.  We also "
+#| "have a list of <a href=\"/philosophy/fs-translations.html\">translations "
+#| "of &ldquo;free software&rdquo;</a> into various languages."
+msgid ""
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
+msgstr ""
+"Wanneer daar oor vrye sagteware gepraat word is dit beter om begrippe soos "
+"\"weggee\" of \"gratis\" te gebruik omadt daardie begrippe impliseer dat dit "
+"oor prys alleen gaan en nie vryheid nie.&nbsp; Sommige algemene begrippe "
+"soos kopieregskending (piracy) sluit opinies in wat ons hoop u nie "
+"ondersteun nie.&nbsp; <a href=\"/philosophy/words-to-avoid.html\">Sien "
+"verwarrende woorde en frases wat vermy moet word</a> vir 'n bespreking oor "
+"hierdie begrippe.&nbsp; Daar is ook 'n lys van <a href=\"/philosophy/fs-"
+"translations.html\">vertalings van vry sagteware</a> in verskeie tale."
+
+#. type: Content of: <div><div><p>
+# | Another group [-has started using-] {+uses+} the term &ldquo;open
+# | source&rdquo; to mean something close (but not identical) to &ldquo;free
+# | [-software.&rdquo;-] {+software&rdquo;.+}  We prefer the term &ldquo;free
+# | software&rdquo; because, once you have heard that it refers to freedom
+# | rather than price, it calls to mind freedom.  The word &ldquo;open&rdquo;
+# | [-<a href=\"/philosophy/open-source-misses-the-point.html\">-] never
+# | refers to [-freedom</a>.-] {+freedom.+}
+#, fuzzy
+#| msgid ""
+#| "Another group has started using the term &ldquo;open source&rdquo; to "
+#| "mean something close (but not identical) to &ldquo;free software.&rdquo; "
+#| "We prefer the term &ldquo;free software&rdquo; because, once you have "
+#| "heard that it refers to freedom rather than price, it calls to mind "
+#| "freedom.  The word &ldquo;open&rdquo; <a href=\"/philosophy/open-source-"
+#| "misses-the-point.html\"> never refers to freedom</a>."
+msgid ""
+"Another group uses the term &ldquo;open source&rdquo; to mean something "
+"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+"term &ldquo;free software&rdquo; because, once you have heard that it refers "
+"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
+"open&rdquo; never refers to freedom."
+msgstr ""
+"'n Ander groep het begin om die begrip oopbron te gebruik om iets "
+"soortgelyks (maar nie identies) aan vrye sagteware te beteken.  Die begrip "
+"vrye sagteware word verkies omdat dit vryheid beklemtoon.  Die woord <a href="
+"\"/philosophy/open-source-misses-the-point.html\">oop verwys nooit na "
+"vryheid nie</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Verder as Sagteware"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
 "the same reasons that software must be free, and because the manuals are in "
@@ -986,11 +1144,21 @@
 "sagteware vry moet wees en omdat die handleidings in wese deel is van die "
 "sagteware."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | The same arguments also make sense for other kinds of works of practical
+# | use &mdash; that is to say, works that embody useful knowledge, such as
+# | educational works and reference works.  <a
+# | href=\"http{+s+}://wikipedia.org\">Wikipedia</a> is the best-known example.
+#, fuzzy
+#| msgid ""
+#| "The same arguments also make sense for other kinds of works of practical "
+#| "use &mdash; that is to say, works that embody useful knowledge, such as "
+#| "educational works and reference works.  <a href=\"http://wikipedia.org";
+#| "\">Wikipedia</a> is the best-known example."
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 "Dieselfde argument maak ook sin vir ander soorte werke van praktiese waarde "
@@ -998,7 +1166,7 @@
 "verwysingswerke.  <a href=\"http://af.wikipedia.org\";>Wikipedia</a> is die "
 "bes bekende voorbeeld daarvan."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Any kind of work <em>can</em> be free, and the definition of free software "
 "has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
@@ -1009,50 +1177,16 @@
 "kulturele werke</a> wat toepaslik is op enige soort werk."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Oopbron?"
-
-#. type: Content of: <div><p>
-# | Another group [-has started using-] {+uses+} the term &ldquo;open
-# | source&rdquo; to mean something close (but not identical) to &ldquo;free
-# | [-software.&rdquo;-] {+software&rdquo;.+}  We prefer the term &ldquo;free
-# | software&rdquo; because, once you have heard that it refers to freedom
-# | rather than price, it calls to mind freedom.  The word &ldquo;open&rdquo;
-# | <a href=\"/philosophy/open-source-misses-the-point.html\"> never refers to
-# | freedom</a>.
-#, fuzzy
-#| msgid ""
-#| "Another group has started using the term &ldquo;open source&rdquo; to "
-#| "mean something close (but not identical) to &ldquo;free software.&rdquo; "
-#| "We prefer the term &ldquo;free software&rdquo; because, once you have "
-#| "heard that it refers to freedom rather than price, it calls to mind "
-#| "freedom.  The word &ldquo;open&rdquo; <a href=\"/philosophy/open-source-"
-#| "misses-the-point.html\"> never refers to freedom</a>."
-msgid ""
-"Another group uses the term &ldquo;open source&rdquo; to mean something "
-"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
-"term &ldquo;free software&rdquo; because, once you have heard that it refers "
-"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
-msgstr ""
-"'n Ander groep het begin om die begrip oopbron te gebruik om iets "
-"soortgelyks (maar nie identies) aan vrye sagteware te beteken.  Die begrip "
-"vrye sagteware word verkies omdat dit vryheid beklemtoon.  Die woord <a href="
-"\"/philosophy/open-source-misses-the-point.html\">oop verwys nooit na "
-"vryheid nie</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -1061,7 +1195,7 @@
 "delete it, so there is no need to state those as separate requirements."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -1069,42 +1203,42 @@
 "1 and 3 enable users to remove them."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
 "to run the program means nothing stops you from making it run."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
 "needs to be free."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
 "freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
 "matter of the program's functionality."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
 "not require compliance with a nonfree license of another program."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1112,7 +1246,7 @@
 "was always our policy.)"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1120,7 +1254,7 @@
 "is only a potential problem."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1128,7 +1262,7 @@
 "made.  And modifications are not limited to &ldquo;improvements&rdquo;"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1137,7 +1271,7 @@
 "the work by releasing the work in another way in parallel."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1145,14 +1279,14 @@
 "that it includes really using your modified version for your computing."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
 "code does not qualify as source code."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1160,21 +1294,21 @@
 "version, not a right to participate in someone else's development project."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
 "right to release modified versions as free software."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
 "practical, not just theoretical; i.e., no tivoization."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1182,7 +1316,7 @@
 "described as a complete replacement."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1190,49 +1324,49 @@
 "everywhere:"
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
 "modified versions, not just changes."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
 "Software&quot; section."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
 "is significant in the freedom to run the program for any purpose."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
 "contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1240,7 +1374,7 @@
 "modifications."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1248,7 +1382,7 @@
 "the software you put into public use."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1256,21 +1390,21 @@
 "of modifications.  Other minor clarifications throughout the text."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
 "problems related to contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
 "distribution of binaries is important."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1278,7 +1412,7 @@
 "previous developers on request."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1289,11 +1423,11 @@
 "view=log\">cvsweb interface</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1321,6 +1455,7 @@
 "voorstelle) aan <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
 "org&gt;</a>."
 
+# type: Content of: <div><p>
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1328,14 +1463,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Sien asseblief die <a href=\"/server/standards/README.translations.html"
@@ -1345,8 +1489,8 @@
 #. type: Content of: <div><p>
 #, fuzzy
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr "Copyright &copy; 1996, 2002, 2004-2007 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1368,6 +1512,18 @@
 msgid "Updated:"
 msgstr "Opgedateer:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Oopbron?"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Sien asseblief die <a href=\"/server/standards/README.translations.html"
+#~ "\">Vertalings README</a> vir meer inligting oor koördinering en "
+#~ "voorlegging van vertalings van hierdie artikel."
+
 #~ msgid ""
 #~ "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
 #~ "free program must be available for commercial use, commercial "

Index: free-sw.ar-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ar-diff.html,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- free-sw.ar-diff.html        30 May 2021 18:01:56 -0000      1.60
+++ free-sw.ar-diff.html        16 Jul 2021 10:02:23 -0000      1.61
@@ -11,8 +11,11 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.86 --&gt;
-&lt;title&gt;What is free software?
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="aboutfs" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;What is <span class="removed"><del><strong>free 
software?</strong></del></span> <span class="inserted"><ins><em>Free 
Software?</em></ins></span>
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;style type="text/css" media="print,screen"&gt;&lt;!--
 .note { margin-left: 6%; margin-right: 6%; }
@@ -22,23 +25,25 @@
 --&gt;&lt;/style&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
-
 &lt;!--#include virtual="/philosophy/po/free-sw.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-
-&lt;h2&gt;What is free software?&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;What is <span class="removed"><del><strong>free 
software?&lt;/h2&gt;</strong></del></span> <span class="inserted"><ins><em>Free 
Software?&lt;/h2&gt;
+&lt;div class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;div class="article"&gt;
-&lt;h3&gt;The Free Software Definition&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;The Free Software 
Definition&lt;/h3&gt;
 
 &lt;blockquote class="note" id="fsf-licensing"&gt;&lt;p style="font-size: 
80%"&gt;
 Have a question about free software licensing not answered here?
 See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
 and if necessary contact the FSF Compliance Lab
 at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
-&lt;/blockquote&gt;
-
-&lt;div class="comment"&gt;
+&lt;/blockquote&gt;</strong></del></span>
+&lt;div <span class="removed"><del><strong>class="comment"&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
 particular software program qualifies as free software.  From time to
@@ -56,8 +61,7 @@
 difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
 Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
 &lt;/p&gt;
-&lt;/div&gt;
-
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="important"&gt;</em></ins></span>
 &lt;p&gt;
 &ldquo;Free software&rdquo; means software that respects users'
 freedom and community.  Roughly, it means that &lt;b&gt;the users have the
@@ -72,6 +76,14 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>You may have paid money to get copies of a 
free program, or you may
+have obtained copies at no charge.  But regardless of how you got your
+copies, you always have the freedom to copy and change the software,
+even to &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;p&gt;</em></ins></span>
 We campaign for these freedoms because everyone deserves them.  With
 these freedoms, the users (both individually and collectively) control
 the program and what it does for them.  When users don't control the
@@ -82,8 +94,78 @@
 an instrument of unjust power&lt;/a&gt;.
 &lt;/p&gt;
 
-&lt;h4&gt; The four essential freedoms&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;</strong></del></span>
 
+<span class="inserted"><ins><em>&lt;p&gt;
+&ldquo;Open source&rdquo; is something different: it has a very
+different philosophy based on different values.  Its practical
+definition is different too, but nearly all open source programs are
+in fact free.  We explain the
+difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
+Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of contents&lt;/h3&gt;
+&lt;ul&gt;
+ &lt;li&gt;&lt;a href="#fs-definition"&gt;The Free Software 
Definition&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#four-freedoms"&gt;The four essential 
freedoms&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#selling"&gt;Free software &lt;em&gt;can&lt;/em&gt; 
be commercial&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#clarifying"&gt;Clarifying the Boundary Between Free 
and Nonfree&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#run-the-program"&gt;The freedom to run the program 
as you
+     wish&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#make-changes"&gt;The freedom to study the source 
code and make
+     changes&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#redistribute"&gt;The freedom to redistribute if you 
wish:
+     basic requirements&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#copyleft"&gt;Copyleft&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#packaging"&gt;Rules about packaging and distribution
+     details&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#exportcontrol"&gt;Export 
regulations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#legal-details"&gt;Legal 
considerations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#contracts"&gt;Contract-based 
licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#in-practice"&gt;The Free Software Definition in 
Practice&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#interpretation"&gt;How we interpret these 
criteria&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#get-help"&gt;Get help with free 
licenses&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#terminology"&gt;Use the right words when talking 
about free
+     software&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#beyond-software"&gt;Beyond 
Software&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#History"&gt;History&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/div&gt;
+
+&lt;div class="edu-note" id="fsf-licensing"&gt;
+&lt;p style="font-size:80%"&gt;
+Have a question about free software licensing not answered here?
+See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
+and if necessary contact the FSF Compliance Lab
+at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;
+
+
+&lt;h3 id="fs-definition" class="subheader"&gt;The Free Software 
Definition&lt;/h3&gt;
+
+&lt;p&gt;</em></ins></span>
+The <span class="inserted"><ins><em>free software definition presents the 
criteria for whether a
+particular software program qualifies as free software.  From time to
+time we revise this definition, to clarify it or to resolve questions
+about subtle issues.  See the &lt;a href="#History"&gt;History 
section&lt;/a&gt;
+below for a list of changes that affect the definition of free
+software.
+&lt;/p&gt;
+
+&lt;h4 id="four-freedoms"&gt;The</em></ins></span> four essential 
freedoms&lt;/h4&gt;
 &lt;p&gt;
 A program is free software if the program's users have the
 four essential freedoms: &lt;a href="#f1"&gt;[1]&lt;/a&gt;
@@ -120,6 +202,9 @@
 are free.  However, if we plan to modify A so that it doesn't use B,
 only A needs to be free; B is not pertinent to that plan.&lt;/p&gt;
 
+
+<span class="inserted"><ins><em>&lt;h4 id="selling"&gt;Free software 
&lt;em&gt;can&lt;/em&gt; be commercial&lt;/h4&gt;</em></ins></span>
+
 &lt;p&gt;
 &ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  <span 
class="removed"><del><strong>A</strong></del></span>
 <span class="inserted"><ins><em>On the contrary, a</em></ins></span> free 
program must be available for commercial use,
@@ -136,44 +221,44 @@
 them.  We want commercial products that contain software to include
 the GNU system, and that would constitute commercial distribution for
 a price.</em></ins></span>  Commercial development of free software is no 
longer
-unusual; such free commercial software is very important.  <span 
class="inserted"><ins><em>Paid,
-professional support for free software fills an important need.
+unusual; such free commercial software is very important.
+<span class="removed"><del><strong>You may have paid money to get copies 
of</strong></del></span>  <span class="inserted"><ins><em>Paid,
+professional support for</em></ins></span> free <span 
class="removed"><del><strong>software,</strong></del></span> <span 
class="inserted"><ins><em>software fills an important need.
 &lt;/p&gt;
 
 &lt;p&gt;
-Thus, to exclude commercial use, commercial development or commercial
-distribution would hobble the free software community and obstruct its
+Thus, to exclude commercial use, commercial development</em></ins></span> or 
<span class="removed"><del><strong>you may have
+obtained copies at no charge.  But regardless of how you got your copies,
+you always have</strong></del></span> <span 
class="inserted"><ins><em>commercial
+distribution would hobble</em></ins></span> the <span 
class="removed"><del><strong>freedom</strong></del></span> <span 
class="inserted"><ins><em>free software community and obstruct its
 path to success.  We must conclude that a program licensed with such
 restrictions does not qualify as free software.
 &lt;/p&gt;
 
 &lt;p&gt;
-A free program must offer the four freedoms to any would-be user that
-obtains a copy of the software, who has complied thus far with the
+A free program must offer the four freedoms</em></ins></span> to <span 
class="inserted"><ins><em>any would-be user that
+obtains a</em></ins></span> copy <span class="removed"><del><strong>and 
change</strong></del></span> <span 
class="inserted"><ins><em>of</em></ins></span> the software, <span 
class="removed"><del><strong>even</strong></del></span> <span 
class="inserted"><ins><em>who has complied thus far with the
 conditions of the free license covering the software in any previous
-distribution of it.  Putting some of the freedoms off limits to some
+distribution of it.  Putting some of the freedoms off limits</em></ins></span> 
to 
+<span class="removed"><del><strong>&lt;a 
href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.</strong></del></span> 
<span class="inserted"><ins><em>some
 users, or requiring that users pay, in money or in kind, to exercise
 them, is tantamount to not granting the freedoms in question, and thus
-renders the program nonfree.
-&lt;/p&gt;
-
-&lt;p&gt;</em></ins></span>
-You may have paid money to get copies of <span 
class="inserted"><ins><em>a</em></ins></span> free <span 
class="removed"><del><strong>software,</strong></del></span> <span 
class="inserted"><ins><em>program,</em></ins></span> or you may
-have obtained copies at no charge.  But regardless of how you got your
-copies, you always have the freedom to copy and change the software,
-even to &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+renders the program nonfree.</em></ins></span>
 &lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;The</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;h3&gt;Clarifying the boundary between free 
and nonfree&lt;/h3&gt;
+
+<span class="inserted"><ins><em>&lt;h3 id="clarifying" 
class="subheader"&gt;Clarifying the Boundary Between Free and Nonfree&lt;/h3&gt;
 
 &lt;p&gt;In the</em></ins></span> rest of this <span 
class="removed"><del><strong>page clarifies certain points about what makes
 specific</strong></del></span> <span class="inserted"><ins><em>article we 
explain more precisely how far the
-various</em></ins></span> freedoms <span class="removed"><del><strong>adequate 
or not.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>need to 
extend, on various issues, in order for a
-program to be free.&lt;/p&gt;</em></ins></span>
+various</em></ins></span> freedoms <span class="removed"><del><strong>adequate 
or not.&lt;/p&gt;
+
+&lt;h4&gt;The</strong></del></span> <span class="inserted"><ins><em>need to 
extend, on various issues, in order for a
+program to be free.&lt;/p&gt;
 
-&lt;h4&gt;The freedom to run the program as you wish&lt;/h4&gt;
+&lt;h4 id="run-the-program"&gt;The</em></ins></span> freedom to run the 
program as you wish&lt;/h4&gt;
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -193,6 +278,8 @@
 functioning in any given environment, or whether it is useful for any
 particular computing activity.&lt;/p&gt;
 
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
 <span class="inserted"><ins><em>&lt;p&gt;For example, if the code arbitrarily 
rejects certain meaningful
 inputs&mdash;or even fails unconditionally&mdash;that may make the
 program less useful, perhaps even totally useless, but it does not
@@ -204,9 +291,9 @@
 
 &lt;p&gt;&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at
 all&rdquo; if that is what you wish.  So there is no need for a
-separate &ldquo;freedom not to run a 
program.&rdquo;&lt;/p&gt;</em></ins></span>
+separate &ldquo;freedom not to run a program.&rdquo;&lt;/p&gt;
 
-&lt;h4&gt;The freedom to study the source code and make changes&lt;/h4&gt;
+&lt;h4 id="make-changes"&gt;The</em></ins></span> freedom to study the source 
code and make changes&lt;/h4&gt;
 
 &lt;p&gt;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -242,13 +329,16 @@
 someone else considers an improvement, that program is not free.
 &lt;/p&gt;
 
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
 <span class="inserted"><ins><em>&lt;p&gt;
 One special case of freedom 1 is to delete the program's code so it
 returns after doing nothing, or make it invoke some other program.
 Thus, freedom 1 includes the &ldquo;freedom to delete the program.&rdquo;
-&lt;/p&gt;</em></ins></span>
+&lt;/p&gt;
 
-&lt;h4&gt;The freedom to redistribute if you wish: basic 
requirements&lt;/h4&gt;
+&lt;h4 id="redistribute"&gt;The</em></ins></span> freedom to redistribute if 
you wish: basic
+requirements&lt;/h4&gt;
 
 &lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
 redistribute copies, either with or without modifications, either
@@ -269,7 +359,7 @@
 Freedom 3 includes the freedom to release your modified versions
 as free software.  A free license may also permit other ways of
 releasing them; in other words, it does not have to be
-a &lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt; license.  
However, a
+a &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 license.  However, a
 license that requires modified versions to be nonfree does not qualify
 as a free license.
 &lt;/p&gt;
@@ -285,12 +375,14 @@
 make them.
 &lt;/p&gt;
 
-&lt;h4&gt;Copyleft&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Copyleft&lt;/h4&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="copyleft"&gt;Copyleft&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 Certain kinds of rules about the manner of distributing free
 software are acceptable, when they don't conflict with the central
-freedoms.  For example, &lt;a 
href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
+freedoms.  For example, &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 (very simply stated) is the rule that when redistributing the program,
 you cannot add restrictions to deny other people the central freedoms.
 This rule does not conflict with the central freedoms; rather it
@@ -310,7 +402,9 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;h4&gt;Rules about packaging and distribution details&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Rules</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="packaging"&gt;Rules</em></ins></span> about packaging and distribution 
details&lt;/h4&gt;
 
 &lt;p&gt;
 Rules about how to package a modified version are acceptable,
@@ -345,10 +439,12 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-&lt;h4&gt;Export regulations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Export</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="exportcontrol"&gt;Export</em></ins></span> regulations&lt;/h4&gt;
 
 &lt;p&gt;
-Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
+Sometimes government <span class="removed"><del><strong>&lt;a 
id="exportcontrol"&gt;export</strong></del></span> <span 
class="inserted"><ins><em>export</em></ins></span> control <span 
class="removed"><del><strong>regulations&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>regulations</em></ins></span>
 and trade sanctions can constrain your freedom to distribute copies of
 programs internationally.  Software developers do not have the power to
 eliminate or override these restrictions, but what they can and must do
@@ -369,7 +465,9 @@
 software nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Legal considerations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Legal</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="legal-details"&gt;Legal</em></ins></span> considerations&lt;/h4&gt;
 
 &lt;p&gt;
 In order for these freedoms to be real, they must be permanent and
@@ -393,7 +491,9 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
-&lt;h4&gt;Contract-based licenses&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Contract-based</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="contracts"&gt;Contract-based</em></ins></span> licenses&lt;/h4&gt;
 
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
@@ -414,7 +514,7 @@
 it is nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Use the right words when talking about free software&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Use the right words when talking 
about free software&lt;/h4&gt;
 
 &lt;p&gt;
 When talking about free software, it is best to avoid using terms
@@ -427,10 +527,15 @@
 &ldquo;free software&rdquo;&lt;/a&gt; into various languages.
 &lt;/p&gt;
 
-&lt;h4&gt;How we interpret these criteria&lt;/h4&gt;
+&lt;h4&gt;How</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="in-practice" 
class="subheader"&gt;The Free Software Definition in Practice&lt;/h3&gt;
+
+&lt;h4 id="interpretation"&gt;How</em></ins></span> we interpret these 
criteria&lt;/h4&gt;
 
 &lt;p&gt;
-Finally, note that criteria such as those stated in this free software
+<span class="removed"><del><strong>Finally, note</strong></del></span>
+<span class="inserted"><ins><em>Note</em></ins></span> that criteria such as 
those stated in this free software
 definition require careful thought for their interpretation.  To decide
 whether a specific software license qualifies as a free software license,
 we judge it based on these criteria to determine whether it fits their
@@ -443,7 +548,9 @@
 it easier to see why certain licenses do or don't qualify.
 &lt;/p&gt;
 
-&lt;h4&gt;Get help with free licenses&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Get</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 id="get-help"&gt;Get</em></ins></span> 
help with free licenses&lt;/h4&gt;
 
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
@@ -467,7 +574,28 @@
 and avoid various practical problems.
 &lt;/p&gt;
 
-&lt;h3 id="beyond-software"&gt;Beyond Software&lt;/h3&gt;
+<span class="inserted"><ins><em>&lt;h4 id="terminology"&gt;Use the right words 
when talking about free software&lt;/h4&gt;
+
+&lt;p&gt;
+When talking about free software, it is best to avoid using terms
+like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
+the issue is about price, not freedom.  Some common terms such
+as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
+&lt;a href="/philosophy/words-to-avoid.html"&gt;Confusing Words and Phrases 
that
+are Worth Avoiding&lt;/a&gt; for a discussion of these terms.  We also have
+a list of proper &lt;a href="/philosophy/fs-translations.html"&gt;translations 
of
+&ldquo;free software&rdquo;&lt;/a&gt; into various languages.
+&lt;/p&gt;
+
+&lt;p id="open-source"&gt;
+Another group uses the term &ldquo;open source&rdquo; to mean
+something close (but not identical) to &ldquo;free software&rdquo;.  We
+prefer the term &ldquo;free software&rdquo; because, once you have heard that
+it refers to freedom rather than price, it calls to mind freedom.  The
+word &ldquo;open&rdquo; never refers to freedom.
+&lt;/p&gt;</em></ins></span>
+
+&lt;h3 <span 
class="removed"><del><strong>id="beyond-software"&gt;Beyond</strong></del></span>
 <span class="inserted"><ins><em>id="beyond-software" 
class="subheader"&gt;Beyond</em></ins></span> Software&lt;/h3&gt;
 
 &lt;p&gt;
 &lt;a href="/philosophy/free-doc.html"&gt;Software manuals must be 
free&lt;/a&gt;,
@@ -479,7 +607,7 @@
 The same arguments also make sense for other kinds of works of
 practical use &mdash; that is to say, works that embody useful knowledge,
 such as educational works and reference
-works.  &lt;a href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt; is the 
best-known
+works.  &lt;a <span 
class="removed"><del><strong>href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</em></ins></span>
 is the best-known
 example.
 &lt;/p&gt;
 
@@ -489,7 +617,7 @@
 free cultural works&lt;/a&gt; applicable to any kind of works.
 &lt;/p&gt;
 
-&lt;h3 id="open-source"&gt;Open Source?&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3 id="open-source"&gt;Open 
Source?&lt;/h3&gt;
 
 &lt;p&gt;
 Another group uses the term &ldquo;open source&rdquo; to mean
@@ -498,7 +626,8 @@
 it refers to freedom rather than price, it calls to mind freedom.  The
 word &ldquo;open&rdquo; &lt;a 
href="/philosophy/open-source-misses-the-point.html"&gt;
 never refers to freedom&lt;/a&gt;.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;hr class="column-limit" 
/&gt;</em></ins></span>
 &lt;/div&gt;
 
 &lt;h3 id="History"&gt;History&lt;/h3&gt;
@@ -640,8 +769,9 @@
 You can review the complete list of changes to the page through
 the &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
 interface&lt;/a&gt;.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;hr class="column-limit" 
/&gt;</em></ins></span>
 
-&lt;h3 style="font-size:1em"&gt;Footnote&lt;/h3&gt;
+&lt;h3 <span 
class="removed"><del><strong>style="font-size:1em"&gt;Footnote&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnote&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
 &lt;li id="f1"&gt;The reason they are numbered 0, 1, 2 and 3 is historical. 
Around
 1990 there were three freedoms, numbered 1, 2 and 3. Then we realized that
@@ -649,10 +779,11 @@
 It was clearly more basic than the other three, so it properly should
 precede them. Rather than renumber the others, we made it 
freedom&nbsp;0.&lt;/li&gt;
 &lt;/ol&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -670,13 +801,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -697,7 +828,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 2002, 2004-2007, <span 
class="removed"><del><strong>2009-2018</strong></del></span> <span 
class="inserted"><ins><em>2009-2019, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; 1996, 2002, 2004-2007, <span 
class="removed"><del><strong>2009-2018</strong></del></span> <span 
class="inserted"><ins><em>2009-2021</em></ins></span>
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -708,7 +839,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 18:01:56 $
+$Date: 2021/07/16 10:02:23 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: free-sw.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ar.po,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- free-sw.ar.po       30 May 2021 17:01:50 -0000      1.103
+++ free-sw.ar.po       16 Jul 2021 10:02:23 -0000      1.104
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: 2019-01-06 18:42+0200\n"
 "Last-Translator: Karam Assany <karam.assany.web@gmail.com>\n"
 "Language-Team: Arabic <www-ar-translators@gnu.org>\n"
@@ -24,7 +24,11 @@
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation"
+# | What is [-free software?-] {+Free Software?+} - GNU Project - Free
+# | Software Foundation
+#, fuzzy
+#| msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr "ما هي البرمجيات الحرة؟ - مشروع غنو - م
ؤسسة البرمجيات الحرة"
 
 #. type: Attribute 'content' of: <meta>
@@ -46,55 +50,14 @@
 "مستخدمو الكومبيوتر من امتلاك الحرية في م
شاركة وتحسين البرمجيات التي "
 "يستخدمونها."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+# | What is [-free software?-] {+Free Software?+}
+#, fuzzy
+#| msgid "What is free software?"
+msgid "What is Free Software?"
 msgstr "ما هي البرمجيات الحرة؟"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "تعريف البرمجيات الحرة"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-"هل لديك أي أسئلة عن ترخيص البرمجيات الحرة 
ولم تتوصل لإجابة لها؟ لا تتردد في "
-"الاطلاع على <a href=\"http://www.fsf.org/licensing\";>موارد 
الترخيص اﻷخرى</a> "
-"أو للضرورة يمكنك الاتصال بمختبر الامتثال 
التابع لمؤسسة البرمجيات الحرة على "
-"العنوان <a href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</a>."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"يقدم تعريف البرمجيات الحرة المعايير التي 
يجب أن يحققها برنامج معين حتى يتم "
-"اعتباره برنامجًا حرًا. نحن نراجع هذا 
التعريف من وقت لآخر لنوضّحه أو للإجابة عن "
-"أسئلة متعلقة بمشاكل غامضة. انظر <a 
href=\"#History\">قسم التاريخ</a> أدناه "
-"للحصول على قائمة بالتغييرات التي أثّرت 
على تعريف البرمجيات الحرة."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
-"&ldquo;المصدر المفتوح Open Source&rdquo; هي حركة أخرى 
مختلفة عن البرمجيات "
-"الحرة، ولها فلسفة أخرى مبنية على قيم أخرى. 
التعريف العملي للمصدر المفتوح "
-"مختلف كذلك عن البرامج الحرة، ومع ذلك فأغلب 
البرامج ذات المصدر المفتوح هي -في "
-"الحقيقة- حرة كذلك. لقد وضحنا الفرق في هذه 
المقالة: <a href=\"/philosophy/"
-"open-source-misses-the-point.html\">لم حركة المصدر المفتوح 
قد ابتعدت عن فكرة "
-"البرمجيات الحرة</a>."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; means software that respects users' freedom and "
 "community.  Roughly, it means that <b>the users have the freedom to run, "
@@ -114,7 +77,41 @@
 "libre&ldquo; المأخوذ من الفرنسية أو الإسبانية 
بدلاً من الكلمة &rdquo;"
 "free&ldquo; للدلالة على أننا لا نعني أن البرنام
ج مجاني."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
+# | A free program must be available for commercial use, commercial
+# | development, and commercial distribution.  Commercial development of free
+# | software is no longer unusual; such free commercial software is very
+# | important.-]You may have paid money to get copies of {+a+} free
+# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
+# | But regardless of how you got your copies, you always have the freedom to
+# | copy and change the software, even to <a
+# | href=\"/philosophy/selling.html\">sell copies</a>.
+#, fuzzy
+#| msgid ""
+#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
+#| "free program must be available for commercial use, commercial "
+#| "development, and commercial distribution.  Commercial development of free "
+#| "software is no longer unusual; such free commercial software is very "
+#| "important.  You may have paid money to get copies of free software, or "
+#| "you may have obtained copies at no charge.  But regardless of how you got "
+#| "your copies, you always have the freedom to copy and change the software, "
+#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"&rdquo;البرمجيات الحرة&ldquo; لا تعني &rdquo;البرم
جيات غير التجارية&ldquo;. "
+"يجب أن يكون البرنامج الحر متاحاً للاستخدام
 التجاري والتطوير التجاري والتوزيع "
+"التجاري. لم يعد التطوير التجاري للبرمجيات 
الحرة غريباً؛ بل إن مثل هذه "
+"البرمجيات الحرة التجارية مهمة جداً. ربما 
دفعت مالاً للحصول على نسخ من برمجيات "
+"حرة، أو ربما حصلت على نسخ بدون مقابل. لكن 
بغض النظر عن كيفية حصولك على "
+"النسخ، لديك دائماً حرية نسخ وتعديل البرم
جيات، بل حتى <a href=\"/philosophy/"
+"selling.html\">بيع نسخ منها</a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -131,22 +128,198 @@
 "&rdquo;الاحتكاري &ldquo; <a 
href=\"/philosophy/free-software-even-more-"
 "important.html\">أداة تعطي المطور سلطة غير 
عادلة</a>."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+"&ldquo;المصدر المفتوح Open Source&rdquo; هي حركة أخرى 
مختلفة عن البرمجيات "
+"الحرة، ولها فلسفة أخرى مبنية على قيم أخرى. 
التعريف العملي للمصدر المفتوح "
+"مختلف كذلك عن البرامج الحرة، ومع ذلك فأغلب 
البرامج ذات المصدر المفتوح هي -في "
+"الحقيقة- حرة كذلك. لقد وضحنا الفرق في هذه 
المقالة: <a href=\"/philosophy/"
+"open-source-misses-the-point.html\">لم حركة المصدر المفتوح 
قد ابتعدت عن فكرة "
+"البرمجيات الحرة</a>."
+
+#. type: Content of: <div><div><div><h3>
+# | [-Education Contents-]{+Table of contents+}
+#, fuzzy
+#| msgid "Education Contents"
+msgid "Table of contents"
+msgstr "المحنوى التعليمي"
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "تعريف البرمجيات الحرة"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#four-freedoms\">The+} four essential [-freedoms-]
+# | {+freedoms</a>+}
+#, fuzzy
+#| msgid "The four essential freedoms"
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr "الحريات الأربع الأساسية"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#run-the-program\">The+} freedom to run the program as
+# | you [-wish-] {+wish</a>+}
+#, fuzzy
+#| msgid "The freedom to run the program as you wish"
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr "حرية أن تشغل البرنامج كما تشاء"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#make-changes\">The+} freedom to study the source code
+# | and make [-changes-] {+changes</a>+}
+#, fuzzy
+#| msgid "The freedom to study the source code and make changes"
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr "حرية أن تدرس الشيفرة المصدرية وأن تعدل 
عليها"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#redistribute\">The+} freedom to redistribute if you
+# | wish: basic [-requirements-] {+requirements</a>+}
+#, fuzzy
+#| msgid "The freedom to redistribute if you wish: basic requirements"
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr "حرية توزع كما تشاء: متطلبات أساسية"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Rules-]{+<a href=\"#packaging\">Rules+} about packaging and distribution
+# | [-details-] {+details</a>+}
+#, fuzzy
+#| msgid "Rules about packaging and distribution details"
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr "قواعد حول الحزم وتفاصيل التوزيع"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | <a [-href=\"#patents\">Patents</a>-] {+href=\"#exportcontrol\">Export
+# | regulations</a>+}
+#, fuzzy
+#| msgid "<a href=\"#patents\">Patents</a>"
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr "<a href=\"#patents\">براءات الاختراع</a>"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Contract-based licenses-]{+<a href=\"#contracts\">Contract-based
+# | licenses</a>+}
+#, fuzzy
+#| msgid "Contract-based licenses"
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr "التراخيص المبنية على العقود"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-How-]{+<a href=\"#interpretation\">How+} we interpret these [-criteria-]
+# | {+criteria</a>+}
+#, fuzzy
+#| msgid "How we interpret these criteria"
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr "كيف نترجم هذه المعايير"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Get-]{+<a href=\"#get-help\">Get+} help with free [-licenses-]
+# | {+licenses</a>+}
+#, fuzzy
+#| msgid "Get help with free licenses"
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr "احصل على المساعدة مع الرخص الحرة"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Use-]{+<a href=\"#terminology\">Use+} the right words when talking about
+# | free [-software-] {+software</a>+}
+#, fuzzy
+#| msgid "Use the right words when talking about free software"
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr "استعمل الكلمات الصحيحة عند التحدث عن 
البرمجيات الحرة"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+"هل لديك أي أسئلة عن ترخيص البرمجيات الحرة 
ولم تتوصل لإجابة لها؟ لا تتردد في "
+"الاطلاع على <a href=\"http://www.fsf.org/licensing\";>موارد 
الترخيص اﻷخرى</a> "
+"أو للضرورة يمكنك الاتصال بمختبر الامتثال 
التابع لمؤسسة البرمجيات الحرة على "
+"العنوان <a href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "تعريف البرمجيات الحرة"
+
+#. type: Content of: <div><div><p>
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"يقدم تعريف البرمجيات الحرة المعايير التي 
يجب أن يحققها برنامج معين حتى يتم "
+"اعتباره برنامجًا حرًا. نحن نراجع هذا 
التعريف من وقت لآخر لنوضّحه أو للإجابة عن "
+"أسئلة متعلقة بمشاكل غامضة. انظر <a 
href=\"#History\">قسم التاريخ</a> أدناه "
+"للحصول على قائمة بالتغييرات التي أثّرت 
على تعريف البرمجيات الحرة."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "الحريات الأربع الأساسية"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if the program's users have the four essential "
 "freedoms: <a href=\"#f1\">[1]</a>"
 msgstr "يكون البرنامج حرًا عندما يتمتع مستخدم
وه بالحريات اﻷربع الأساسية:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr "حرية أن تشغل البرنامج كما تشاء، لأي 
غرض كان (الحرية 0)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to study how the program works, and change it so it does your "
 "computing as you wish (freedom 1). Access to the source code is a "
@@ -155,11 +328,11 @@
 "حرية أن تدرس كيفية عمل البرنامج، وتعدله 
ليعمل وفق رغباتك (الحرية 1). الوصول "
 "إلى الشفرة المصدرية شرط لازم لهذا."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "The freedom to redistribute copies so you can help others (freedom 2)."
 msgstr "حرية أن توزع نسخ من البرنامج لتتمكن من 
مساعدة الآخرين (الحرية 2)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to distribute copies of your modified versions to others "
 "(freedom 3).  By doing this you can give the whole community a chance to "
@@ -170,7 +343,7 @@
 "تمنح المجتمع بأسره فرصة الاستفادة من 
تعديلاتك. الوصول إلى الشفرة المصدرية "
 "شرط لازم لهذا."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -182,7 +355,7 @@
 "الأساليب هي على قرب أو بعد من أن تكون حرة، 
إلا أننا نعتبر جميعها غير أخلاقي "
 "على حد سواء."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -200,7 +373,11 @@
 "A حتى لا يستخدم البرنامج B في عمله، في هذه 
الحالة فإن على البرنامج A فقط أن "
 "يكون حراً، بينما البرنامج B لا يتعلق بالأم
ر بتاتاً."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -209,7 +386,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -222,7 +399,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -230,7 +407,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -241,56 +418,22 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
-# | A free program must be available for commercial use, commercial
-# | development, and commercial distribution.  Commercial development of free
-# | software is no longer unusual; such free commercial software is very
-# | important.-]You may have paid money to get copies of {+a+} free
-# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
-# | But regardless of how you got your copies, you always have the freedom to
-# | copy and change the software, even to <a
-# | href=\"/philosophy/selling.html\">sell copies</a>.
-#, fuzzy
-#| msgid ""
-#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
-#| "free program must be available for commercial use, commercial "
-#| "development, and commercial distribution.  Commercial development of free "
-#| "software is no longer unusual; such free commercial software is very "
-#| "important.  You may have paid money to get copies of free software, or "
-#| "you may have obtained copies at no charge.  But regardless of how you got "
-#| "your copies, you always have the freedom to copy and change the software, "
-#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"&rdquo;البرمجيات الحرة&ldquo; لا تعني &rdquo;البرم
جيات غير التجارية&ldquo;. "
-"يجب أن يكون البرنامج الحر متاحاً للاستخدام
 التجاري والتطوير التجاري والتوزيع "
-"التجاري. لم يعد التطوير التجاري للبرمجيات 
الحرة غريباً؛ بل إن مثل هذه "
-"البرمجيات الحرة التجارية مهمة جداً. ربما 
دفعت مالاً للحصول على نسخ من برمجيات "
-"حرة، أو ربما حصلت على نسخ بدون مقابل. لكن 
بغض النظر عن كيفية حصولك على "
-"النسخ، لديك دائماً حرية نسخ وتعديل البرم
جيات، بل حتى <a href=\"/philosophy/"
-"selling.html\">بيع نسخ منها</a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "حرية أن تشغل البرنامج كما تشاء"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program means the freedom for any kind of person or "
 "organization to use it on any kind of computer system, for any kind of "
@@ -308,7 +451,7 @@
 "شخص آخر، يكون عندئذ ذلك الشخص حرًا بتشغيله 
لأغراضه الخاصة، وأنت غير مُخول بفرض "
 "استخدامات البرنامج عليه."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -320,7 +463,7 @@
 "هذا الأمر لا يتعلق بالوظائف التي يقدمها 
البرنامج، إن كان البرنامج قادراً "
 "تقنياً على العمل في بيئة ما، أو إن كان 
البرنامج مفيداً لوظيفة حاسوبية معينة."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -331,18 +474,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "حرية أن تدرس الشيفرة المصدرية وأن تعدل 
عليها"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for freedoms 1 and 3 (the freedom to make changes and the freedom
 # | to publish the changed versions) to be meaningful, you [-must-] {+need
 # | to+} have access to the source code of the program.  Therefore,
@@ -370,7 +513,7 @@
 "المُعتّمة<a href=\"#TransNote1\"><sup>(1)</sup></a> ليست 
شفرة مصدرية حقيقية "
 "ولا تُعتبر كذلك."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -389,7 +532,7 @@
 "حقيقية، وتلك الملفات التنفيذية ليست برم
جيات حرة حتى لو كانت الشفرة المصدرية "
 "الذي تُرجمت منها حرة."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One important way to modify a program is by merging in available free "
 "subroutines and modules.  If the program's license says that you cannot "
@@ -402,7 +545,7 @@
 "&mdash; مثلًا، اشتراط الرخصة أن تكون مالك 
حقوق النشر لأي شفرة برمجية تضيفها "
 "&mdash; فإن الرخصة مقيِّدة جدًا ولا يمكن 
اعتبارها رخصة حرة."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
@@ -412,18 +555,18 @@
 "تعديل البرنامج محدود، عمليًا، بالتعديلات 
التي يعتبرها شخص آخر تحسينات على "
 "البرنامج، فهذا البرنامج ليس حر."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "حرية توزع كما تشاء: متطلبات أساسية"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
 "copies, either with or without modifications, either gratis or charging a "
@@ -436,7 +579,7 @@
 "a>. أن تكون حرًا في فعل هذه الأشياء يعني (من 
ضمن ما يعنيه) أنك غير مضطر لطلب "
 "الإذن أو أن تدفع للحصول على إذن لعمل ذلك."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -447,11 +590,25 @@
 "بدون الإشارة حتى إلى وجودها (وجود تلك 
التعديلات). إذا نشرت تعديلاتك، يجب ألا "
 "تُطالب بإخطار أي شخص محدد، بأي طريقة م
حددة."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Freedom 3 includes the freedom to release your modified versions as free
+# | software.  A free license may also permit other ways of releasing them; in
+# | other words, it does not have to be a <a
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} license.  However, a
+# | license that requires modified versions to be nonfree does not qualify as
+# | a free license.
+#, fuzzy
+#| msgid ""
+#| "Freedom 3 includes the freedom to release your modified versions as free "
+#| "software.  A free license may also permit other ways of releasing them; "
+#| "in other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+#| "\">copyleft</a> license.  However, a license that requires modified "
+#| "versions to be nonfree does not qualify as a free license."
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
@@ -460,7 +617,7 @@
 "\"/copyleft/copyleft.html\">حقوق متروكة Copyleft </a>. لكن 
الرخص التي تطالب "
 "بأن تكون النسخ المعدلة غير حرة لا تعتبر 
رخصًا حرة."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -477,15 +634,30 @@
 "لبرنامج معين (لأن بعض لغات البرمجة لا تدعم 
هذه الميزة)، لكن يجب أن تمتلك "
 "حرية إعادة توزيع هذه الهيئات في حال وجدتها 
أو طورت طريقة للحصول عليها."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "الحقوق المتروكة Copyleft"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Certain kinds of rules about the manner of distributing free software are
+# | acceptable, when they don't conflict with the central freedoms.  For
+# | example, <a [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
+#, fuzzy
+#| msgid ""
+#| "Certain kinds of rules about the manner of distributing free software are "
+#| "acceptable, when they don't conflict with the central freedoms.  For "
+#| "example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+#| "stated) is the rule that when redistributing the program, you cannot add "
+#| "restrictions to deny other people the central freedoms.  This rule does "
+#| "not conflict with the central freedoms; rather it protects them."
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -496,7 +668,7 @@
 "تستطيع إضافة قيود تحرم الآخرين الحرياتَ 
المركزية عند إعادة توزيع البرنامج. "
 "هذه القاعدة لا تتعارض مع الحريات الم
ركزية، بل تحميها."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the GNU project, we use copyleft to protect the four freedoms legally for "
 "everyone.  We believe there are important reasons why <a href=\"/philosophy/"
@@ -516,11 +688,11 @@
 "البرمجيات الحرة</a> حتى تعرف العلاقة بين 
&rdquo;البرمجيات الحرة&ldquo;، "
 "و&rdquo;البرمجيات ذات الحقوق المتروكة&ldquo; 
والأنواع الأخرى من البرمجيات."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "قواعد حول الحزم وتفاصيل التوزيع"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules about how to package a modified version are acceptable, if they don't "
 "substantively limit your freedom to release modified versions, or your "
@@ -539,7 +711,7 @@
 "مقبولة؛ بما أنك تعدل على  البرنامج أصلًا، 
فلن تجد مشكلة في عمل بعض التعديلات "
 "الإضافية."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -557,7 +729,7 @@
 "تترك لك خيار عدم توزيع الإصدار الخاص بك 
على الإطلاق.) القواعد التي تطلب "
 "توفير الشفرة المصدرية لمستخدمي النسخ التي 
توفرها للاستخدام العام مقبولة أيضًا."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -572,21 +744,42 @@
 "فقط في حال وجود وسيلة تسمية متعددة مناسبة 
تسمح لك بتعيين اسم البرنامج الأصلي "
 "كاسم ثان للنسخة المعدلة."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "أحكام التصدير"
 
-#. type: Content of: <div><p>
-msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any nontrivial export regulations as a condition "
+#| "of exercising any of the essential freedoms."
+msgid ""
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "تصدر الحكومة أحيانًا <a id=\"exportcontrol\">قوانين 
تنظيم للتصدير</a> ومراسيم "
 "تجارة قد تقيد حريتك في توزيع نُسَخ من 
البرامج دوليًا. لا يملك مطورو البرمجيات "
@@ -596,7 +789,7 @@
 "تراخيص البرمجيات الحرة الالتزام بأي قانون 
تصدير غير بديهي كشرط للتمتع بأي من "
 "الحريات الرئيسة."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -610,11 +803,11 @@
 "فإن اشتراطها لا يعتبر مشكلة حقيقية، 
ولكنها مشكلة محتملة، بما أن تعديلاً على "
 "قانون التصدير قد يجعل الشرط مؤثر وبدوره قد 
يجعل البرنامج غير حر."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "اعتبارات قانونية"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In order for these freedoms to be real, they must be permanent and "
 "irrevocable as long as you do nothing wrong; if the developer of the "
@@ -627,7 +820,7 @@
 "إضافة قيود إلى شروطها بشكل رجعي بدون أن 
ترتكب أي خطأ يدعو لذلك، يكون "
 "البرنامج غير حر."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -640,7 +833,7 @@
 "تستخدمها&rdquo;، في حالة كان المستخدم يشغل 
برامج غير حرة، فهذا يتطلب "
 "الامتثال لتراخيص تلك البرامج غير الحرة؛ 
وهذا ما يجعل الرخصة غير حرة."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
@@ -648,11 +841,11 @@
 "من المقبول من ناحية الرخصة الحرة تحديد 
قانون الاختصاص القضائي المعمول به، أو "
 "في حالة إجراء التقاضي، أو كليهما."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "التراخيص المبنية على العقود"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -671,7 +864,7 @@
 "المحتملة. هذا يعني وجود الكثير من الطرق يم
كن عبرها أن يكون الترخيص مُقيدًا "
 "بشكل غير مقبول وغير حر."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -682,46 +875,54 @@
 "يقيد المستخدم بشكل غريب لا تستطيع 
التراخيص المبنية على حقوق النشر فعله، وغير "
 "مذكور بين القواعد المشروعة هنا، يجب أن 
ندرسه، والأرجح أننا سنعتبره غير حر."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "استعمل الكلمات الصحيحة عند التحدث عن 
البرمجيات الحرة"
-
-#. type: Content of: <div><p>
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"عند الحديث عن البرمجيات الحرة، يفضل تفادي 
استخدام مصطلحات مثل &rdquo;"
-"منح&ldquo; أو &rdquo;بالمجان&ldquo;، لأن هذه الم
صطلحات تدل على أن القضية حول "
-"السعر، وليست الحرية. بعض المصطلحات 
الشائعة مثل &rdquo;قرصنة&ldquo; تجسد آراءً "
-"نأمل ألا تدعمها. راجع <a 
href=\"/philosophy/words-to-avoid.html\">كلمات "
-"وعبارات مضللة يجب تفاديها</a> لتقرأ مناقشة 
عن هذه المصطلحات. لدينا أيضا "
-"قائمة <a href=\"/philosophy/fs-translations.html\"> بترجمات 
&rdquo;البرمجيات "
-"الحرة&ldquo;</a> الملائمة إلى لغات عديدة."
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "تعريف البرمجيات الحرة"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "كيف نترجم هذه المعايير"
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "أخيرًا، نرجو أن تلاحظ أن معاييرًا مثل هذه 
المبيّنة في تعريف البرمجيات الحرة هذا "
 "تتطلب تفكيرًا حذرًا بمعانيها. حتى نقرر فيم
ا إذا كانت رخصة برمجيات ما مؤهلة "
@@ -732,11 +933,11 @@
 "إذا كان ذاك المطلب مقبولًا. عندما نصل إلى 
نتيجة بخصوص قضية جديدة، عادة ما "
 "نحدّث هذه المعايير لتسهيل فهم سبب مطابقة 
أو عدم مطابقة رخصة معينة للمعايير."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "احصل على المساعدة مع الرخص الحرة"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -750,7 +951,7 @@
 "بمراسلتنا عبر البريد الإلكتروني <a 
href=\"mailto:licensing@gnu.org\";>&lt;"
 "licensing@gnu.org&gt;</a>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are contemplating writing a new license, please contact the Free "
 "Software Foundation first by writing to that address. The proliferation of "
@@ -763,7 +964,7 @@
 "الحرة يعني زيادة الجهد على المستخدمين لفهم
 التراخيص، ربما نستطيع مساعدتك في "
 "إيجاد رخصة برمجيات حرة موجودة تلبي 
احتياجاتك."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
@@ -772,11 +973,63 @@
 "إذا لم يكن هذا ممكنًا، وكنت فعلاً بحاجة 
لترخيص جديد، يمكنك أن تضمن بمساعدتنا "
 "أن الترخيص ترخيص برمجيات حرة بالفعل 
وتتفادى الكثير من المشاكل العملية."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "استعمل الكلمات الصحيحة عند التحدث عن 
البرمجيات الحرة"
+
+#. type: Content of: <div><div><p>
+msgid ""
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
+msgstr ""
+"عند الحديث عن البرمجيات الحرة، يفضل تفادي 
استخدام مصطلحات مثل &rdquo;"
+"منح&ldquo; أو &rdquo;بالمجان&ldquo;، لأن هذه الم
صطلحات تدل على أن القضية حول "
+"السعر، وليست الحرية. بعض المصطلحات 
الشائعة مثل &rdquo;قرصنة&ldquo; تجسد آراءً "
+"نأمل ألا تدعمها. راجع <a 
href=\"/philosophy/words-to-avoid.html\">كلمات "
+"وعبارات مضللة يجب تفاديها</a> لتقرأ مناقشة 
عن هذه المصطلحات. لدينا أيضا "
+"قائمة <a href=\"/philosophy/fs-translations.html\"> بترجمات 
&rdquo;البرمجيات "
+"الحرة&ldquo;</a> الملائمة إلى لغات عديدة."
+
+#. type: Content of: <div><div><p>
+# | Another group uses the term &ldquo;open source&rdquo; to mean something
+# | close (but not identical) to &ldquo;free software&rdquo;.  We prefer the
+# | term &ldquo;free software&rdquo; because, once you have heard that it
+# | refers to freedom rather than price, it calls to mind freedom.  The word
+# | &ldquo;open&rdquo; [-<a
+# | href=\"/philosophy/open-source-misses-the-point.html\">-] never refers to
+# | [-freedom</a>.-] {+freedom.+}
+#, fuzzy
+#| msgid ""
+#| "Another group uses the term &ldquo;open source&rdquo; to mean something "
+#| "close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+#| "term &ldquo;free software&rdquo; because, once you have heard that it "
+#| "refers to freedom rather than price, it calls to mind freedom.  The word "
+#| "&ldquo;open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html"
+#| "\"> never refers to freedom</a>."
+msgid ""
+"Another group uses the term &ldquo;open source&rdquo; to mean something "
+"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+"term &ldquo;free software&rdquo; because, once you have heard that it refers "
+"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
+"open&rdquo; never refers to freedom."
+msgstr ""
+"بدأت مجموعة أخرى في استخدام المصطلح 
&rdquo;المصدر المفتوح Open Source&ldquo; "
+"للتعبير عن شيء مشابه (لكنه غير مطابق) 
&rdquo;للبرمجيات الحرة Free "
+"Software&ldquo;. نحن نفضل مصطلح &rdquo;البرمجيات 
الحرة&ldquo; لأنه يقودك إلى "
+"التفكير بالحرية.  كلمة &rdquo;مفتوح&ldquo; <a 
href=\"/philosophy/open-source-"
+"misses-the-point.html\"> لا تشير إلى الحرية 
إطلاقًا</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "ما وراء البرمجيات"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
 "the same reasons that software must be free, and because the manuals are in "
@@ -786,11 +1039,21 @@
 "البرمجيات، <a href=\"/philosophy/free-doc.html\">يجب أن 
تكون كتيبات "
 "البرمجيات حرة</a> أيضًا."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | The same arguments also make sense for other kinds of works of practical
+# | use &mdash; that is to say, works that embody useful knowledge, such as
+# | educational works and reference works.  <a
+# | href=\"http{+s+}://wikipedia.org\">Wikipedia</a> is the best-known example.
+#, fuzzy
+#| msgid ""
+#| "The same arguments also make sense for other kinds of works of practical "
+#| "use &mdash; that is to say, works that embody useful knowledge, such as "
+#| "educational works and reference works.  <a href=\"http://wikipedia.org";
+#| "\">Wikipedia</a> is the best-known example."
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 "نفس الحجة تنطبق أيضًا على أنواع أخرى من 
الأعمال ذات الاستخدامات العملية "
@@ -798,7 +1061,7 @@
 "والأعمال المرجعية. <a 
href=\"http://ar.wikipedia.org\";>ويكيبيديا</a> هي أفضل "
 "مثال معروف."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Any kind of work <em>can</em> be free, and the definition of free software "
 "has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
@@ -809,29 +1072,10 @@
 "الحرة</a> القابل للتطبيق على أي نوع من الأعم
ال."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "المصدر المفتوح؟"
-
-#. type: Content of: <div><p>
-msgid ""
-"Another group uses the term &ldquo;open source&rdquo; to mean something "
-"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
-"term &ldquo;free software&rdquo; because, once you have heard that it refers "
-"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
-msgstr ""
-"بدأت مجموعة أخرى في استخدام المصطلح 
&rdquo;المصدر المفتوح Open Source&ldquo; "
-"للتعبير عن شيء مشابه (لكنه غير مطابق) 
&rdquo;للبرمجيات الحرة Free "
-"Software&ldquo;. نحن نفضل مصطلح &rdquo;البرمجيات 
الحرة&ldquo; لأنه يقودك إلى "
-"التفكير بالحرية.  كلمة &rdquo;مفتوح&ldquo; <a 
href=\"/philosophy/open-source-"
-"misses-the-point.html\"> لا تشير إلى الحرية 
إطلاقًا</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "التاريخ"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
@@ -839,7 +1083,7 @@
 "نراجع تعريف البرمجيات الحرة هذا من وقت 
لآخر. نقدم هنا قائمة بالتعديلات، مع "
 "روابط لتوضيح ما عُدّل تحديدًا."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -848,7 +1092,7 @@
 "delete it, so there is no need to state those as separate requirements."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -856,7 +1100,7 @@
 "1 and 3 enable users to remove them."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -866,7 +1110,7 @@
 "root=www&amp;r1=1.152&amp;r2=1.153\">الإصدار 1.153</a>: توضيح 
أن حرية تشغيل "
 "البرنامج تعني أن لا شيء سيمنعك من جعله يعم
ل."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
@@ -876,7 +1120,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">الإصدار 1.141</a>: توضيح 
أي الشيفرات هي "
 "شيفرات حرة."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
@@ -886,7 +1130,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">الإصدار 1.135</a>: القول 
كل مرة أن "
 "الحرية 0 هي حرية تشغيل البرنامج كما تشاء."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
@@ -896,7 +1140,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">الإصدار 1.134</a>: الحرية 0 
ليست حول "
 "وظائف البرنامج."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
@@ -906,7 +1150,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">الإصدار 1.131</a>: الرخصة 
الحرية قد لا "
 "تتطلب التوافق مع رخصة غير حرة لبرنامج آخر."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -917,7 +1161,7 @@
 "root=www&amp;r1=1.128&amp;r2=1.129\">الإصدار 1.129</a>: الإقرار 
بوضوح أن "
 "خيار القانون وخيار استلزامات المنتدى مسم
وحة. (هذه هي سياستنا دائماً)"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -929,7 +1173,7 @@
 "التصدير ليس بمشكلة حقيقة إن كان الالتزام 
غير معتبر, وخلاف ذلك يعتبر مشكلة "
 "محتملة."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -941,7 +1185,7 @@
 "محدودية حق التعديل لديك، وليس التعديل 
التي قمت بها. ولا تقتصر التعديلات على "
 "&ldquo;التحسينات&rdquo;"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -955,7 +1199,7 @@
 "النشر دائمًا تقديم <em>صلاحيات</em> إضافية 
ﻻستخدام العمل وذلك بإصداره بطريقة "
 "أخرى على التوازي."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -967,7 +1211,7 @@
 "المختصر، تم عرض فكرة (تم توضيحها مسبقًا في 
الإصدار 1.80) أنها تتضمن استخدام "
 "نسختك المعدلة لتنفيذ حساباتك."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
@@ -977,7 +1221,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">الإصدار 1.92</a>: توضيح أن 
الشفرة المُعتّمة "
 "لا تعتبر شفرة مصدرية."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -989,7 +1233,7 @@
 "حق توزيع نُسخ من إصدار معدل أو محسن خاص بك، 
وليس حق الانضمام إلى مشروع تطوير "
 "شخص آخر."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -999,7 +1243,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">الإصدار 1.89</a>: الحرية 3 
تتضمن حق إصدار "
 "نسخ معدلة بشكل برمجيات حرة."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
@@ -1009,7 +1253,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">الإصدار 1.80</a>: يجب أن 
تكون الحرية 1 "
 "عملية، وليس نظرية فحسب، على سبيل المثال، 
التيفزة ممنوعة."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1020,7 +1264,7 @@
 "root=www&amp;r1=1.76&amp;r2=1.77\">الإصدار 1.77</a>: توضيح أن 
كل التعديلات "
 "الرجعية على الرخصة غير مقبولة، حتى لو لم 
تُقدّم على أنها بديل كامل عن الأصل."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1031,7 +1275,7 @@
 "root=www&amp;r1=1.73&amp;r2=1.74\">الإصدار 1.74</a>: أربع 
توضيحات لنقاط غير "
 "واضحة بما يكفي، أو تم بيانها في بعض الأم
اكن لكن لم يتم عرضها في جميع الأماكن:"
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
@@ -1040,21 +1284,21 @@
 "\"التحسينات\" لا تعني أن الرخصة تستطيع 
تقييد أنواع النسخ المعدلة التي يحق لك "
 "نشرها بشكل كبير. الحرية 3 تتضمن توزيع نسخ م
عدلة، وليس التغييرات فقط."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
 msgstr "حق الدمج مع وحدات موجودة يشير إلى 
الوحدات ذات الترخيص المناسب."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr "تصريح بيّن لخاتمة الفكرة المتعلقة 
بقوانين التحكم بالتصدير."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr "فرض تعديل على رخصة يكافئ إلغاء الرخصة 
القديمة."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
@@ -1064,7 +1308,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">الإصدار 1.57</a>: إضافة قسم 
&quot;ما وراء "
 "البرمجيات&quot;."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
@@ -1074,7 +1318,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">الإصدار 1.46</a>: توضيح من 
هو صاحب الغرض "
 "المهم في حرية تشغيل البرنامج لأي غرض."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
@@ -1084,7 +1328,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">الإصدار 1.41</a>: توضيح 
الكلمات المستخدمة "
 "في الحديث عن التراخيص المبنية على العقود."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1095,7 +1339,7 @@
 "root=www&amp;r1=1.39&amp;r2=1.40\">الإصدار 1.40</a>: شرح أن 
الرخصة الحرة يجب "
 "أن تسمح لك باستخدام برمجيات حرة أخرى م
توفرة لإنشاء تعديلاتك."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1107,7 +1351,7 @@
 "للرخصة أن تطلب منك توفير الشفرة المصدرية 
لنسخ البرمجيات الذي تضعها في "
 "الاستخدام العام."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1118,7 +1362,7 @@
 "root=www&amp;r1=1.30&amp;r2=1.31\">الإصدار 1.31</a>: لاحظ أنه م
ن المسموح "
 "للرخصة أن تطلب تعريف نفسك كمؤلف للتعديلات. 
توضيحات أخرى طفيفة على النص."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1128,7 +1372,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">الإصدار 1.23</a>: توضيح م
شاكل محتملة "
 "متعلقة بالتراخيص المبنية على العقود."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
@@ -1138,7 +1382,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">الإصدار 1.16</a>: توضيح أهم
ية توزيع "
 "الملفات التنفيذية."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1149,7 +1393,7 @@
 "root=www&amp;r1=1.10&amp;r2=1.11\">الإصدار 1.11</a>: لاحظ أن 
الرخصة الحرة قد "
 "تطلب منك إرسال نسخة من الإصدارات التي 
توزعها إلى المؤلف."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1165,11 +1409,11 @@
 "بتعديلات هذه الصفحة من خلال <a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/";
 "www/philosophy/free-sw.html?root=www&amp;view=log\">واجهة cvsweb</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "هوامش"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1211,6 +1455,7 @@
 "يرجى إرسال الوصلات المنقطعة وأي تصحيحات 
أو اقتراحات إلى <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1218,14 +1463,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "رغم بذلنا قصارى جهدنا لتوفير ترجمات دقيقة 
ذات جودة عالية، فإننا لا ندعي كمال "
@@ -1236,15 +1487,15 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2018-] {+2009-2019, 2021+}
-# | Free Software Foundation, Inc.
+# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2018-] {+2009-2021+} Free
+# | Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2018 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "حقوق النشر:</p><p style=\"direction: ltr\">\n"
 "Copyright &copy; 1996, 2002, 2004-2007, 2009-2018 Free Software Foundation, "
@@ -1283,6 +1534,22 @@
 msgid "Updated:"
 msgstr "حُدّثت:"
 
+#~ msgid "Open Source?"
+#~ msgstr "المصدر المفتوح؟"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "رغم بذلنا قصارى جهدنا لتوفير ترجمات 
دقيقة ذات جودة عالية، فإننا لا ندعي "
+#~ "كمال النصوص وخلوها من الأخطاء. يرجي 
إرسال التعليقات والمقترحات المتعلقة "
+#~ "بهذا الشأن إلى عنوان البريد الإلكتروني <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\"> &lt;web-translators@gnu.org&gt;</a>.</p> 
<p>للحصول "
+#~ "على أي معلومات بشأن تنسيق وتقديم ترجمات م
وقعنا الإلكتروني، يرجى الاطلاع "
+#~ "على الرابط التالي <a 
href=\"/server/standards/README.translations.html"
+#~ "\">دليل الترجمة</a>."
+
 #~ msgid ""
 #~ "The rest of this page clarifies certain points about what makes specific "
 #~ "freedoms adequate or not."

Index: free-sw.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.bg.po,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- free-sw.bg.po       29 May 2021 12:59:49 -0000      1.74
+++ free-sw.bg.po       16 Jul 2021 10:02:23 -0000      1.75
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: 2008-03-21 13:34+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -20,12 +20,12 @@
 "Outdated-Since: 2008-12-09 14:49+0000\n"
 
 #. type: Content of: <title>
-# | [-The Free Software Definition-]{+What is free software?+} - GNU Project -
-# | Free Software Foundation
+# | [-The-]{+What is+} Free [-Software Definition-] {+Software?+} - GNU
+# | Project - Free Software Foundation
 #, fuzzy
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation"
-msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Определение на свободен софтуер — 
Проектът GNU — Фондация за свободен софтуер"
 
@@ -49,56 +49,14 @@
 "„Юникс“), така че компютърните 
потребители да имат свободата да споделят 
и "
 "подобряват софтуера, който използват."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr ""
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Определение на свободен софтуер"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-# | [-We maintain this-]{+The+} free software definition [-to show clearly
-# | what must be true about-] {+presents the criteria for whether+} a
-# | particular software program [-for-] {+qualifies as free software.  From
-# | time to time we revise this definition, to clarify+} it {+or+} to [-be
-# | considered-] {+resolve questions about subtle issues.  See the <a
-# | href=\"#History\">History section</a> below for a list of changes that
-# | affect the definition of+} free software.
+#. type: Content of: <div><h2>
+# | [-New-]{+What is+} Free Software{+?+}
 #, fuzzy
-#| msgid ""
-#| "We maintain this free software definition to show clearly what must be "
-#| "true about a particular software program for it to be considered free "
-#| "software."
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"Ние поддържаме следната дефиниция на 
понятието „свободен софтуер“, та ясно "
-"да покажем какви характеристики трябва да 
притежава една софтуерна програма, "
-"за да се счита за свободен софтуер."
+#| msgid "New Free Software"
+msgid "What is Free Software?"
+msgstr "Нов свободен софтуер"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 # | &ldquo;Free software&rdquo; {+means software that respects users' freedom
 # | and community.  Roughly, it means that <b>the users have the freedom to
 # | run, copy, distribute, study, change and improve the software</b>.  Thus,
@@ -127,7 +85,29 @@
 "концепцията, мислете си за „свобода на 
словото“, а не „безплатен "
 "обяд“<sup><a href=\"#TransNote1\">1</a></sup>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | You may have paid money to get copies of {+a+} free [-software,-]
+# | {+program,+} or you may have obtained copies at no charge.  But regardless
+# | of how you got your copies, you always have the freedom to copy and change
+# | the software, even to <a href=\"/philosophy/selling.html\">sell copies</a>.
+#, fuzzy
+#| msgid ""
+#| "You may have paid money to get copies of free software, or you may have "
+#| "obtained copies at no charge.  But regardless of how you got your copies, "
+#| "you always have the freedom to copy and change the software, even to <a "
+#| "href=\"/philosophy/selling.html\">sell copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"Може да сте платили пари, за да се сдобиете 
с копие на свободен софтуер, "
+"може да сте го получили безплатно.  
Независимо от начина, по който сте "
+"придобили копията си, вие винаги сте 
свободни да копирате и променяте "
+"софтуера, дори да <a 
href=\"/philosophy/selling.html\">продавате копия</a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -138,11 +118,149 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+msgid "Table of contents"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "Определение на свободен софтуер"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | <a [-href=\"#patents\">Patents</a>-] {+href=\"#exportcontrol\">Export
+# | regulations</a>+}
+#, fuzzy
+#| msgid "<a href=\"#patents\">Patents</a>"
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr "<a href=\"#patents\">Патенти</a>"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Определение на свободен софтуер"
+
+#. type: Content of: <div><div><p>
+# | [-We maintain this-]{+The+} free software definition [-to show clearly
+# | what must be true about-] {+presents the criteria for whether+} a
+# | particular software program [-for-] {+qualifies as free software.  From
+# | time to time we revise this definition, to clarify+} it {+or+} to [-be
+# | considered-] {+resolve questions about subtle issues.  See the <a
+# | href=\"#History\">History section</a> below for a list of changes that
+# | affect the definition of+} free software.
+#, fuzzy
+#| msgid ""
+#| "We maintain this free software definition to show clearly what must be "
+#| "true about a particular software program for it to be considered free "
+#| "software."
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"Ние поддържаме следната дефиниция на 
понятието „свободен софтуер“, та ясно "
+"да покажем какви характеристики трябва да 
притежава една софтуерна програма, "
+"за да се счита за свободен софтуер."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-Free software-]{+A program+} is [-a matter of the users' freedom to run,
 # | copy, distribute, study, change and improve the software.  More precisely,
 # | it refers to four kinds of freedom, for-] {+free software if+} the
@@ -161,14 +279,14 @@
 "копират, изучават и подобряват.  По-точно, 
свободният софтуер гарантира "
 "четири вида свободи на потребителите си:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr ""
 "Свободата да изпълняваш програмата както 
желаете — за всякакви цели (свобода "
 "№0)<sup><a href=\"#TransNote2\">2</a></sup>."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to study how the program works, and change it [-to make-]
 # | {+so+} it [-do what-] {+does your computing as+} you wish (freedom 1).
 # | Access to the source code is a precondition for this.
@@ -186,7 +304,7 @@
 "на нуждите ти (свобода №1).  Достъпът до изх
одния код е необходимо условие "
 "за това."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to redistribute copies so you can help [-your neighbor-]
 # | {+others+} (freedom 2).
 #, fuzzy
@@ -197,7 +315,7 @@
 msgstr ""
 "Свободата да разпространяваш копия, за да 
помагаш на ближния си (свобода №2)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to [-improve the program, and release-] {+distribute copies
 # | of+} your [-improvements-] {+modified versions+} to [-the public, so
 # | that-] {+others (freedom 3).  By doing this you can give+} the whole
@@ -218,7 +336,7 @@
 "за да може цялата общност да се възползва 
(свобода №3). Достъпът до изходния "
 "код е необходимо условие за това."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -226,7 +344,7 @@
 "free, we consider them all equally unethical."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -237,7 +355,11 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -246,7 +368,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -259,7 +381,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -267,7 +389,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -278,44 +400,22 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | You may have paid money to get copies of {+a+} free [-software,-]
-# | {+program,+} or you may have obtained copies at no charge.  But regardless
-# | of how you got your copies, you always have the freedom to copy and change
-# | the software, even to <a href=\"/philosophy/selling.html\">sell copies</a>.
-#, fuzzy
-#| msgid ""
-#| "You may have paid money to get copies of free software, or you may have "
-#| "obtained copies at no charge.  But regardless of how you got your copies, "
-#| "you always have the freedom to copy and change the software, even to <a "
-#| "href=\"/philosophy/selling.html\">sell copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"Може да сте платили пари, за да се сдобиете 
с копие на свободен софтуер, "
-"може да сте го получили безплатно.  
Независимо от начина, по който сте "
-"придобили копията си, вие винаги сте 
свободни да копирате и променяте "
-"софтуера, дори да <a 
href=\"/philosophy/selling.html\">продавате копия</a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program means the freedom for any kind of person or "
 "organization to use it on any kind of computer system, for any kind of "
@@ -335,7 +435,7 @@
 "програмата към другиго, той ще е свободен 
да използва програмата за своите "
 "си цели, но вие нямате право да налагате 
своите цели на другия."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -344,7 +444,7 @@
 "particular computing activity."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -355,18 +455,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for [-the-] freedoms {+1 and 3 (the freedom+} to make
 # | changes[-,-] and {+the freedom+} to publish [-improved versions,-] {+the
 # | changed versions)+} to be meaningful, you [-must-] {+need to+} have access
@@ -392,7 +492,7 @@
 "програмата.  Затова достъпът до изходния 
код е необходимо условие, за да "
 "бъде една програма свободен софтуер."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -404,7 +504,7 @@
 "from is free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | One important way to modify a program is by merging in available free
 # | subroutines and modules.  If the program's license says that you cannot
 # | merge in [-an-] {+a suitably licensed+} existing [-module, such as-]
@@ -431,25 +531,25 @@
 "вие да сте носителят на авторските права 
на всеки код, който добавяте, то "
 "лицензът е прекалено ограничаващ, за да 
бъде наречен свободен."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
 "else considers an improvement, that program is not free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-A program is free software if users have all of these freedoms. 
 # | Thus,-]{+Freedom to distribute (freedoms 2 and 3) means+} you [-should
 # | be-] {+are+} free to redistribute copies, either with or without
@@ -479,7 +579,7 @@
 "че програмата е свободна, означава, че не 
трябва да се молите или да "
 "плащате, за да упражните тези свободи."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -492,16 +592,16 @@
 "вас не трябва да се изисква да уведомявате 
някого за това по какъвто и да е "
 "начин."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -521,18 +621,19 @@
 "разпространявате такива форми, ако 
намерите или изобретите начин да ги "
 "създавате."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-However, certain-]{+Certain+} kinds of rules about the manner of
 # | distributing free software are acceptable, when they don't conflict with
 # | the central freedoms.  For example, <a
-# | href=\"/copyleft/copyleft.html\">copyleft</a> (very simply stated) is the
-# | rule that when redistributing the program, you cannot add restrictions to
-# | deny other people the central freedoms.  This rule does not conflict with
-# | the central freedoms; rather it protects them.
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
 #, fuzzy
 #| msgid ""
 #| "However, certain kinds of rules about the manner of distributing free "
@@ -545,7 +646,7 @@
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -557,7 +658,7 @@
 "ограничения, за да откажете на другите х
ора основните свободи.  Това правило "
 "не противоречи на основните свободи — то 
ги защитава."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In the GNU project, we use copyleft to protect [-these-] {+the four+}
 # | freedoms legally for everyone.  [-But <a
 # | 
href=\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\">non-copylefted
@@ -603,11 +704,11 @@
 "софтуер“, „софтуер със защита copyleft“ и 
другите видове се съотнасят един с "
 "друг."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-However, rules-]{+Rules+} about how to package a modified version are
 # | acceptable, if they don't substantively limit your freedom to release
 # | modified versions, or your freedom to make and use modified versions
@@ -661,7 +762,7 @@
 "версия и някой от предишните разработчици 
ви поиска нейно копие, да трябва "
 "да му го пратите, както и изискването да 
обозначите промените си."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -673,7 +774,7 @@
 "use are also acceptable."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -683,20 +784,21 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr ""
 
-#. type: Content of: <div><p>
-# | Sometimes government <a id=\"exportcontrol\">export control
-# | regulations</a> and trade sanctions can constrain your freedom to
-# | distribute copies of programs internationally.  Software developers do not
-# | have the power to eliminate or override these restrictions, but what they
-# | can and must do is refuse to impose them as conditions of use of the
-# | program.  In this way, the restrictions will not affect activities and
-# | people outside the jurisdictions of these governments.  {+Thus, free
-# | software licenses must not require obedience to any nontrivial export
-# | regulations as a condition of exercising any of the essential freedoms.+}
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  {+Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.+}
 #, fuzzy
 #| msgid ""
 #| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
@@ -707,15 +809,15 @@
 #| "way, the restrictions will not affect activities and people outside the "
 #| "jurisdictions of these governments."
 msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "Понякога наложените от правителства <a 
id=\"exportcontrol\">външнотърговски "
 "режими</a> и търговски санкции могат да 
ограничат свободата ви да "
@@ -725,7 +827,7 @@
 "ползване на програмата.  По този начин 
ограниченията няма да засегнат "
 "дейностите и хората извън юридическата 
власт на тези правителства."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -735,11 +837,11 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for these freedoms to be real, they must be {+permanent and+}
 # | irrevocable as long as you do nothing wrong; if the developer of the
 # | software has the power to revoke the license, {+or retroactively add
@@ -763,7 +865,7 @@
 "отмени лиценза, без вие да сте направили 
нищо, за да предизвикате това, то "
 "софтуерът не е свободен."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -772,17 +874,17 @@
 "of those nonfree programs; that makes the license nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -804,7 +906,7 @@
 "окажат неприемливо ограничаващи и 
следователно — да не са лицензи на "
 "свободен софтуер."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -818,47 +920,54 @@
 "трябва да помислим върху него и е вероятно 
да заключим, че лицензът не е "
 "свободен."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Когато говорите за свободен софтуер, 
най-добре е да избягвате изрази като "
-"„без пари“ или „безплатен“, защото тези 
термини подсказват, че проблемът е "
-"цената, а не свободата.  Някои често 
употребявани термини като „пиратство“ "
-"въплъщават в себе си тези, които се 
надяваме, че не споделяте.  Погледнете "
-"статията <a 
href=\"/philosophy/words-to-avoid.html\">Объркващи думи и 
фрази, "
-"които е добре да се избягват</a> за 
обяснение на тези термини. Направен е и "
-"списък с <a 
href=\"/philosophy/fs-translations.html\">преводите на 
„свободен "
-"софтуер“</a> на различни езици."
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Определение на свободен софтуер"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Най-накрая, забележете, че критериите, 
които са изброени в тази дефиниция за "
 "понятието „свободен софтуер“, изискват 
внимателно размишление при "
@@ -873,11 +982,11 @@
 "често обновяваме горните критерии, за да 
бъде по-ясно защо определени "
 "лицензи се определят или не като свободни."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -891,7 +1000,7 @@
 "можете да ни питате за него чрез е-поща на 
адрес <a href=\"mailto:";
 "licensing@gnu.org\">&lt;licensing@gnu.org&gt;</a>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | If you are contemplating writing a new license, please contact the [-FSF-]
 # | {+Free Software Foundation first+} by writing to that address. The
 # | proliferation of different free software licenses means increased work for
@@ -917,7 +1026,7 @@
 "разберат.  Възможно е да сме в състояние да 
ви помогнем, като намерим "
 "съществуващ лиценз на свободен софтуер, 
който отговаря на нуждите ви."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
@@ -927,11 +1036,65 @@
 "ще сте сигурни, че лицензът наистина е 
лиценз на свободен софтуер и ще "
 "можете да прескочите някои практически 
проблеми."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
+msgstr ""
+"Когато говорите за свободен софтуер, 
най-добре е да избягвате изрази като "
+"„без пари“ или „безплатен“, защото тези 
термини подсказват, че проблемът е "
+"цената, а не свободата.  Някои често 
употребявани термини като „пиратство“ "
+"въплъщават в себе си тези, които се 
надяваме, че не споделяте.  Погледнете "
+"статията <a 
href=\"/philosophy/words-to-avoid.html\">Объркващи думи и 
фрази, "
+"които е добре да се избягват</a> за 
обяснение на тези термини. Направен е и "
+"списък с <a 
href=\"/philosophy/fs-translations.html\">преводите на 
„свободен "
+"софтуер“</a> на различни езици."
+
+#. type: Content of: <div><div><p>
+# | Another group [-has started using-] {+uses+} the term &ldquo;open
+# | source&rdquo; to mean something close (but not identical) to &ldquo;free
+# | software&rdquo;.  We prefer the term &ldquo;free software&rdquo; because,
+# | once you have heard that it refers to freedom rather than price, it calls
+# | to mind freedom.  The word &ldquo;open&rdquo; [-<a
+# | href=\"/philosophy/open-source-misses-the-point.html\">-] never refers to
+# | [-freedom</a>.-] {+freedom.+}
+#, fuzzy
+#| msgid ""
+#| "Another group has started using the term &ldquo;open source&rdquo; to "
+#| "mean something close (but not identical) to &ldquo;free software&rdquo;.  "
+#| "We prefer the term &ldquo;free software&rdquo; because, once you have "
+#| "heard that it refers to freedom rather than price, it calls to mind "
+#| "freedom.  The word &ldquo;open&rdquo; <a href=\"/philosophy/open-source-"
+#| "misses-the-point.html\"> never refers to freedom</a>."
+msgid ""
+"Another group uses the term &ldquo;open source&rdquo; to mean something "
+"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+"term &ldquo;free software&rdquo; because, once you have heard that it refers "
+"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
+"open&rdquo; never refers to freedom."
+msgstr ""
+"Една друга група започна да използва 
термина „отворен код“, за да обозначи "
+"нещо близко (но не идентично) със 
„свободния софтуер“.  Ние предпочитаме "
+"понятието „свободен софтуер“, защото 
веднъж като чуете, че се отнася за "
+"свободата, а не за цената, то извиква в 
съзнанието — „свобода“.  Думата "
+"„отворен“ <a 
href=\"/philosophy/open-source-misses-the-point.html\">просто "
+"не прави това</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Отвъд софтуера"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
 "the same reasons that software must be free, and because the manuals are in "
@@ -941,11 +1104,21 @@
 "свободни</a> поради същите причини, поради 
които и софтуерът трябва да е "
 "свободен, и понеже ръководствата в 
известна степен са част от софтуера."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | The same arguments also make sense for other kinds of works of practical
+# | use &mdash; that is to say, works that embody useful knowledge, such as
+# | educational works and reference works.  <a
+# | href=\"http{+s+}://wikipedia.org\">Wikipedia</a> is the best-known example.
+#, fuzzy
+#| msgid ""
+#| "The same arguments also make sense for other kinds of works of practical "
+#| "use &mdash; that is to say, works that embody useful knowledge, such as "
+#| "educational works and reference works.  <a href=\"http://wikipedia.org";
+#| "\">Wikipedia</a> is the best-known example."
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 "Същите аргументи имат смисъл и за други 
видове произведения от практическо "
@@ -953,7 +1126,7 @@
 "знания, като образователни и справочни 
материали.  <a href=\"http://bg.";
 "wikipedia.org\">Уикипедия</a> е най-известният 
пример."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Any kind of work <em>can</em> be free, and the definition of free software "
 "has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
@@ -965,51 +1138,16 @@
 "всякакъв вид творби."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Отворен код?"
-
-#. type: Content of: <div><p>
-# | Another group [-has started using-] {+uses+} the term &ldquo;open
-# | source&rdquo; to mean something close (but not identical) to &ldquo;free
-# | software&rdquo;.  We prefer the term &ldquo;free software&rdquo; because,
-# | once you have heard that it refers to freedom rather than price, it calls
-# | to mind freedom.  The word &ldquo;open&rdquo; <a
-# | href=\"/philosophy/open-source-misses-the-point.html\"> never refers to
-# | freedom</a>.
-#, fuzzy
-#| msgid ""
-#| "Another group has started using the term &ldquo;open source&rdquo; to "
-#| "mean something close (but not identical) to &ldquo;free software&rdquo;.  "
-#| "We prefer the term &ldquo;free software&rdquo; because, once you have "
-#| "heard that it refers to freedom rather than price, it calls to mind "
-#| "freedom.  The word &ldquo;open&rdquo; <a href=\"/philosophy/open-source-"
-#| "misses-the-point.html\"> never refers to freedom</a>."
-msgid ""
-"Another group uses the term &ldquo;open source&rdquo; to mean something "
-"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
-"term &ldquo;free software&rdquo; because, once you have heard that it refers "
-"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
-msgstr ""
-"Една друга група започна да използва 
термина „отворен код“, за да обозначи "
-"нещо близко (но не идентично) със 
„свободния софтуер“.  Ние предпочитаме "
-"понятието „свободен софтуер“, защото 
веднъж като чуете, че се отнася за "
-"свободата, а не за цената, то извиква в 
съзнанието — „свобода“.  Думата "
-"„отворен“ <a 
href=\"/philosophy/open-source-misses-the-point.html\">просто "
-"не прави това</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -1018,7 +1156,7 @@
 "delete it, so there is no need to state those as separate requirements."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -1026,42 +1164,42 @@
 "1 and 3 enable users to remove them."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
 "to run the program means nothing stops you from making it run."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
 "needs to be free."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
 "freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
 "matter of the program's functionality."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
 "not require compliance with a nonfree license of another program."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1069,7 +1207,7 @@
 "was always our policy.)"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1077,7 +1215,7 @@
 "is only a potential problem."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1085,7 +1223,7 @@
 "made.  And modifications are not limited to &ldquo;improvements&rdquo;"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1094,7 +1232,7 @@
 "the work by releasing the work in another way in parallel."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1102,14 +1240,14 @@
 "that it includes really using your modified version for your computing."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
 "code does not qualify as source code."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1117,21 +1255,21 @@
 "version, not a right to participate in someone else's development project."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
 "right to release modified versions as free software."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
 "practical, not just theoretical; i.e., no tivoization."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1139,7 +1277,7 @@
 "described as a complete replacement."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1147,49 +1285,49 @@
 "everywhere:"
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
 "modified versions, not just changes."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
 "Software&quot; section."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
 "is significant in the freedom to run the program for any purpose."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
 "contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1197,7 +1335,7 @@
 "modifications."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1205,7 +1343,7 @@
 "the software you put into public use."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1213,21 +1351,21 @@
 "of modifications.  Other minor clarifications throughout the text."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
 "problems related to contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
 "distribution of binaries is important."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1235,7 +1373,7 @@
 "previous developers on request."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1247,14 +1385,14 @@
 msgstr ""
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | Footnote[-s-]
 #, fuzzy
 #| msgid "Footnotes"
 msgid "Footnote"
 msgstr "Бележки"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1307,14 +1445,23 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# | Please see the <a
+# | href=\"/server/standards/README.translations.html\">Translations
+# | README</a> for information on coordinating and [-submitting-]
+# | {+contributing+} translations of this article.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Моля, докладвайте грешки и предложения 
относно българския превод чрез <a "
@@ -1325,14 +1472,14 @@
 
 #. type: Content of: <div><p>
 # | Copyright &copy; [-2004, 2005, 2006, 2007, 2008, 2009-] {+1996, 2002,
-# | 2004-2007, 2009-2019, 2021+} Free Software Foundation, Inc.
+# | 2004-2007, 2009-2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009 Free Software Foundation, Inc. "
 "(Фондация за свободен софтуер)"
@@ -1359,6 +1506,20 @@
 msgid "Updated:"
 msgstr "Последно обновяване:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Отворен код?"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Моля, докладвайте грешки и предложения 
относно българския превод чрез <a "
+#~ "href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
+#~ "a>.</p> <p>Вижте <a href=\"/server/standards/README.translations.html"
+#~ "\">Документацията за преводачи</a> за 
информация за координирането и "
+#~ "подаването на преводи на тази статия."
+
 #~ msgid ""
 #~ "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
 #~ "free program must be available for commercial use, commercial "
@@ -1391,9 +1552,6 @@
 #~ msgid "What's New"
 #~ msgstr "Какво ново"
 
-#~ msgid "New Free Software"
-#~ msgstr "Нов свободен софтуер"
-
 #~ msgid ""
 #~ "Rules about how to package a modified version are acceptable, if they "
 #~ "don't substantively block your freedom to release modified versions, or "

Index: free-sw.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ca.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- free-sw.ca.po       30 May 2021 19:03:20 -0000      1.8
+++ free-sw.ca.po       16 Jul 2021 10:02:23 -0000      1.9
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,12 +19,12 @@
 "Outdated-Since: 2004-08-04 21:16+0000\n"
 
 #. type: Content of: <title>
-# | [-The Free Software Definition-]{+What is free software?+} - GNU Project -
-# | Free Software Foundation
+# | [-The-]{+What is+} Free [-Software Definition-] {+Software?+} - GNU
+# | Project - Free Software Foundation
 #, fuzzy
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation"
-msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr ""
 "La definició de Programari Lliure - Projecte GNU - Free Software Foundation"
 
@@ -46,56 +46,14 @@
 "usuaris tinguin la llibertat de compartir i millorar el programari que "
 "utilitzen."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr ""
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "La definició de Programari Lliure"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-# | [-We maintain this-]{+The+} free software definition [-to show clearly
-# | what must be true about-] {+presents the criteria for whether+} a
-# | particular software program [-for-] {+qualifies as free software.  From
-# | time to time we revise this definition, to clarify+} it {+or+} to [-be
-# | considered-] {+resolve questions about subtle issues.  See the <a
-# | href=\"#History\">History section</a> below for a list of changes that
-# | affect the definition of+} free software.
+#. type: Content of: <div><h2>
+# | [-The-]{+What is+} Free [-Software Definition-] {+Software?+}
 #, fuzzy
-#| msgid ""
-#| "We maintain this free software definition to show clearly what must be "
-#| "true about a particular software program for it to be considered free "
-#| "software."
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"Mantenim aquesta definició del programari lliure per a mostrar clarament com 
"
-"ha de ser un determinat programa per a poder ser considerat programari "
-"lliure."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
+#| msgid "The Free Software Definition"
+msgid "What is Free Software?"
+msgstr "La definició de Programari Lliure"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 # | &ldquo;Free software&rdquo; {+means software that respects users' freedom
 # | and community.  Roughly, it means that <b>the users have the freedom to
 # | run, copy, distribute, study, change and improve the software</b>.  Thus,
@@ -125,7 +83,42 @@
 "com a lliure, «discurs lliure» <cite>(free speech)</cite> i no com a 
gratuït "
 "<cite>(free beer)</cite>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
+# | A free program must be available for commercial use, commercial
+# | development, and commercial distribution.  Commercial development of free
+# | software is no longer unusual; such free commercial software is very
+# | important.-]You may have paid money to get copies of {+a+} free
+# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
+# | But regardless of how you got your copies, you always have the freedom to
+# | copy and change the software, even to <a
+# | href=\"/philosophy/selling.html\">sell copies</a>.
+#, fuzzy
+#| msgid ""
+#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
+#| "free program must be available for commercial use, commercial "
+#| "development, and commercial distribution.  Commercial development of free "
+#| "software is no longer unusual; such free commercial software is very "
+#| "important.  You may have paid money to get copies of free software, or "
+#| "you may have obtained copies at no charge.  But regardless of how you got "
+#| "your copies, you always have the freedom to copy and change the software, "
+#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"«Programari Lliure» no significa «no-comercial». Un programa lliure ha "
+"d'estar disponible per a ús comercial, desenvolupament comercial, i "
+"distribució comercial. El desenvolupament comercial de programari lliure ja "
+"no és inusual; aquest programari lliure comercial és molt important.  Podeu 
"
+"haver pagat diners per a aconseguir còpies de programari lliure, o podeu "
+"haver-les obtingut sense cap càrrec. Però indiferentment de com s'hagin "
+"obtingut, sempre tindreu la llibertat de copiar i canviar el programari, "
+"fins i tot de <a href=\"/philosophy/selling.html\">vendre'n còpies</a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -136,11 +129,148 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Índex de continguts"
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "La definició de Programari Lliure"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "La definició de Programari Lliure"
+
+#. type: Content of: <div><div><p>
+# | [-We maintain this-]{+The+} free software definition [-to show clearly
+# | what must be true about-] {+presents the criteria for whether+} a
+# | particular software program [-for-] {+qualifies as free software.  From
+# | time to time we revise this definition, to clarify+} it {+or+} to [-be
+# | considered-] {+resolve questions about subtle issues.  See the <a
+# | href=\"#History\">History section</a> below for a list of changes that
+# | affect the definition of+} free software.
+#, fuzzy
+#| msgid ""
+#| "We maintain this free software definition to show clearly what must be "
+#| "true about a particular software program for it to be considered free "
+#| "software."
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"Mantenim aquesta definició del programari lliure per a mostrar clarament com 
"
+"ha de ser un determinat programa per a poder ser considerat programari "
+"lliure."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-Free software-]{+A program+} is [-a matter of the users' freedom to run,
 # | copy, distribute, study, change and improve the software.  More precisely,
 # | it refers to four kinds of freedom, for-] {+free software if+} the
@@ -160,7 +290,7 @@
 "precisament, es refereix a quatre tipus de llibertat, per a usuaris de "
 "programari:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to run the [-program,-] {+program as you wish,+} for any
 # | purpose (freedom 0).
 #, fuzzy
@@ -171,7 +301,7 @@
 "La llibertat per a executar el programa, per a qualsevol propòsit (llibertat 
"
 "0)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to study how the program works, and [-adapt-] {+change+} it
 # | [-to-] {+so it does+} your [-needs-] {+computing as you wish+} (freedom
 # | 1). Access to the source code is a precondition for this.
@@ -188,7 +318,7 @@
 "necessitats pròpies (llibertat 1). L'accés al codi font es una condició "
 "prèvia per a això."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to redistribute copies so you can help [-your neighbor-]
 # | {+others+} (freedom 2).
 #, fuzzy
@@ -200,7 +330,7 @@
 "La llibertat de redistribuir còpies per a poder ajudar als vostres veïns "
 "(llibertat 2)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to [-improve the program, and release-] {+distribute copies
 # | of+} your [-improvements-] {+modified versions+} to [-the public, so
 # | that-] {+others (freedom 3).  By doing this you can give+} the whole
@@ -221,7 +351,7 @@
 "públic, per a què tota la comunitat pugui beneficiar-se (llibertat 3). "
 "L'accés al codi font és una condició prèvia per a això."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -229,7 +359,7 @@
 "free, we consider them all equally unethical."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -240,7 +370,11 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -249,7 +383,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -262,7 +396,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -270,7 +404,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -281,57 +415,22 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
-# | A free program must be available for commercial use, commercial
-# | development, and commercial distribution.  Commercial development of free
-# | software is no longer unusual; such free commercial software is very
-# | important.-]You may have paid money to get copies of {+a+} free
-# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
-# | But regardless of how you got your copies, you always have the freedom to
-# | copy and change the software, even to <a
-# | href=\"/philosophy/selling.html\">sell copies</a>.
-#, fuzzy
-#| msgid ""
-#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
-#| "free program must be available for commercial use, commercial "
-#| "development, and commercial distribution.  Commercial development of free "
-#| "software is no longer unusual; such free commercial software is very "
-#| "important.  You may have paid money to get copies of free software, or "
-#| "you may have obtained copies at no charge.  But regardless of how you got "
-#| "your copies, you always have the freedom to copy and change the software, "
-#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"«Programari Lliure» no significa «no-comercial». Un programa lliure ha "
-"d'estar disponible per a ús comercial, desenvolupament comercial, i "
-"distribució comercial. El desenvolupament comercial de programari lliure ja "
-"no és inusual; aquest programari lliure comercial és molt important.  Podeu 
"
-"haver pagat diners per a aconseguir còpies de programari lliure, o podeu "
-"haver-les obtingut sense cap càrrec. Però indiferentment de com s'hagin "
-"obtingut, sempre tindreu la llibertat de copiar i canviar el programari, "
-"fins i tot de <a href=\"/philosophy/selling.html\">vendre'n còpies</a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | The freedom to [-use a-] {+run the+} program means the freedom for any
 # | kind of person or organization to use it on any kind of computer system,
 # | for any kind of overall job[-,-] and {+purpose,+} without being required
@@ -362,7 +461,7 @@
 "qualsevol mena de treball, i sense haver-se de comunicar amb el "
 "desenvolupador ni amb cap entitat específica."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -371,7 +470,7 @@
 "particular computing activity."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -382,18 +481,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for [-the-] freedoms {+1 and 3 (the freedom+} to make
 # | changes[-,-] and {+the freedom+} to publish [-improved versions,-] {+the
 # | changed versions)+} to be meaningful, you [-must-] {+need to+} have access
@@ -419,7 +518,7 @@
 "programa. Per tant, l'accesibilitat del codi font és una condició necessà
ria "
 "per al programari lliure."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -431,7 +530,7 @@
 "from is free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One important way to modify a program is by merging in available free "
 "subroutines and modules.  If the program's license says that you cannot "
@@ -440,25 +539,25 @@
 "license is too restrictive to qualify as free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
 "else considers an improvement, that program is not free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-A program is free software if users have all of these freedoms.
 # | Thus,-]{+Freedom to distribute (freedoms 2 and 3) means+} you [-should
 # | be-] {+are+} free to redistribute copies, either with or without
@@ -488,7 +587,7 @@
 "per a fer aquestes coses significa (entre d'altres) que no has de preguntar "
 "o pagar pel permís."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -500,16 +599,16 @@
 "publiquéssiu els canvis, no hauríeu de notificar-ho a ningú en particular, 
"
 "ni de cap forma en particular."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -528,12 +627,18 @@
 "tinguis la llibertat de redistribuir aquestes formes en cas que trobis o "
 "desenvolupis una manera de produir-ne."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr ""
 
-#. type: Content of: <div><p>
-# || No change detected.  The change might only be in amounts of spaces.
+#. type: Content of: <div><div><p>
+# | Certain kinds of rules about the manner of distributing free software are
+# | acceptable, when they don't conflict with the central freedoms.  For
+# | example, <a [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
 #, fuzzy
 #| msgid ""
 #| "Certain kinds of rules about the manner of distributing free software are "
@@ -545,7 +650,7 @@
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -558,7 +663,7 @@
 "Aquesta norma no crea cap conflicte amb les llibertats centrals; més aviat "
 "les protegeix."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In the GNU project, we use copyleft to protect [-these-] {+the four+}
 # | freedoms legally for everyone.  [-But <a
 # | href=\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\">
@@ -604,11 +709,11 @@
 "«programari lliure», el «programari amb copyleft» i d'altres categories 
de "
 "programari."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Rules about how to package a modified version are acceptable, if they
 # | don't [-effectively block-] {+substantively limit+} your freedom to
 # | release modified [-versions. Rules that &ldquo;if you make the program
@@ -654,7 +759,7 @@
 "que, si heu distribuït una versió modificada i el desenvolupador previ us "
 "demana una còpia, li heu d'enviar."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -666,7 +771,7 @@
 "use are also acceptable."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -676,20 +781,21 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr ""
 
-#. type: Content of: <div><p>
-# | Sometimes government <a id=\"exportcontrol\">export control
-# | regulations</a> and trade sanctions can constrain your freedom to
-# | distribute copies of programs internationally.  Software developers do not
-# | have the power to eliminate or override these restrictions, but what they
-# | can and must do is refuse to impose them as conditions of use of the
-# | program.  In this way, the restrictions will not affect activities and
-# | people outside the jurisdictions of these governments.  {+Thus, free
-# | software licenses must not require obedience to any nontrivial export
-# | regulations as a condition of exercising any of the essential freedoms.+}
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  {+Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.+}
 #, fuzzy
 #| msgid ""
 #| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
@@ -700,15 +806,15 @@
 #| "way, the restrictions will not affect activities and people outside the "
 #| "jurisdictions of these governments."
 msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "Alguns cops <a id=\"exportcontrol\">les regulacions de control 
d'exportació</"
 "a> del govern i les sancions comercials podrien restringir la vostra "
@@ -719,7 +825,7 @@
 "restriccions no afectaran les activitats ni la gent fora de les "
 "jurisdiccions d'aquests governs."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -729,11 +835,11 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for these freedoms to be real, they must be {+permanent and+}
 # | irrevocable as long as you do nothing wrong; if the developer of the
 # | software has the power to revoke the license, {+or retroactively add
@@ -757,7 +863,7 @@
 "revocar la llicència, sense que s'hagi donat cap motiu, el programari no és 
"
 "lliure."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -766,17 +872,17 @@
 "of those nonfree programs; that makes the license nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -797,7 +903,7 @@
 "restriccions. Això vol dir que hi ha moltes maneres per les que una "
 "llicència com aquesta sigui inacceptable i no-lliure."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | We can't possibly list all the [-possible contract restrictions-] {+ways+}
 # | that [-would be unacceptable.-] {+might happen.+}  If a contract-based
 # | license restricts the user in an unusual way that copyright-based licenses
@@ -822,65 +928,54 @@
 "copyright no poden, i que no es menciona aquí com a legítima, hauríem de "
 "pensar sobre el tema, i probablement decidiríem que és no-lliure."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr ""
-
-#. type: Content of: <div><p>
-# | When talking about free software, it is best to avoid using terms like
-# | &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms
-# | imply that the issue is about price, not freedom.  Some common terms such
-# | as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a
-# | href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that
-# | are Worth Avoiding</a> for a discussion of these terms.  We also have a
-# | list of {+proper+} <a
-# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
-# | software&rdquo;</a> into various languages.
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
 #, fuzzy
-#| msgid ""
-#| "When talking about free software, it is best to avoid using terms like "
-#| "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
-#| "imply that the issue is about price, not freedom.  Some common terms such "
-#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
-#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
-#| "that are Worth Avoiding</a> for a discussion of these terms. We also have "
-#| "a list of <a href=\"/philosophy/fs-translations.html\">translations of "
-#| "&ldquo;free software&rdquo;</a> into various languages."
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Quan parlem de programari lliure, és millor evitar termes com «donar» o "
-"«gratuït», perquè aquests termes impliquen que parlem de preus, no de "
-"llibertat. Alguns termes comuns com «pirateria» engloben opinions que "
-"esperem que no aprovaríeu. Vegeu a <a href=\"/philosophy/words-to-avoid.html"
-"\">Frases i Paraules Confuses que cal Evitar</a>  una discussió d'aquests "
-"termes. També disposem d'una llista de <a 
href=\"/philosophy/fs-translations."
-"html\">traduccions de «free software»</a> a d'altres idiomes."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "La definició de Programari Lliure"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Finalment, fixeu-vos que els criteris com aquests explicats en aquesta "
 "definició de programari lliure requereixen una anàlisi acurada per a la 
seva "
@@ -895,11 +990,11 @@
 "sovint actualitzem aquests criteris per a fer més fàcil el veure per què "
 "certes llicències poden ser qualificades de programari lliure i d'altres no."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -913,7 +1008,7 @@
 "nos enviant un correu electrònic a <a href=\"mailto:licensing@gnu.org\";>&lt;"
 "licensing@gnu.org&gt;</a>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are contemplating writing a new license, please contact the Free "
 "Software Foundation first by writing to that address. The proliferation of "
@@ -922,51 +1017,63 @@
 "software license that meets your needs."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
 "various practical problems."
 msgstr ""
 
-#. type: Content of: <div><h3>
-msgid "Beyond Software"
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
-"the same reasons that software must be free, and because the manuals are in "
-"effect part of the software."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"The same arguments also make sense for other kinds of works of practical use "
-"&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
-"\">Wikipedia</a> is the best-known example."
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When talking about free software, it is best to avoid using terms like
+# | &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms
+# | imply that the issue is about price, not freedom.  Some common terms such
+# | as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a
+# | href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that
+# | are Worth Avoiding</a> for a discussion of these terms.  We also have a
+# | list of {+proper+} <a
+# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
+# | software&rdquo;</a> into various languages.
+#, fuzzy
+#| msgid ""
+#| "When talking about free software, it is best to avoid using terms like "
+#| "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
+#| "imply that the issue is about price, not freedom.  Some common terms such "
+#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
+#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
+#| "that are Worth Avoiding</a> for a discussion of these terms. We also have "
+#| "a list of <a href=\"/philosophy/fs-translations.html\">translations of "
+#| "&ldquo;free software&rdquo;</a> into various languages."
 msgid ""
-"Any kind of work <em>can</em> be free, and the definition of free software "
-"has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
-"free cultural works</a> applicable to any kind of works."
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
 msgstr ""
+"Quan parlem de programari lliure, és millor evitar termes com «donar» o "
+"«gratuït», perquè aquests termes impliquen que parlem de preus, no de "
+"llibertat. Alguns termes comuns com «pirateria» engloben opinions que "
+"esperem que no aprovaríeu. Vegeu a <a href=\"/philosophy/words-to-avoid.html"
+"\">Frases i Paraules Confuses que cal Evitar</a>  una discussió d'aquests "
+"termes. També disposem d'una llista de <a 
href=\"/philosophy/fs-translations."
+"html\">traduccions de «free software»</a> a d'altres idiomes."
 
-#. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Codi obert?"
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Another group [-has started using-] {+uses+} the term &ldquo;open
 # | source&rdquo; to mean something close (but not identical) to &ldquo;free
 # | software&rdquo;.  We prefer the term &ldquo;free software&rdquo; because,
 # | once you have heard {+that+} it refers to freedom rather than price, it
-# | calls to mind freedom.  The word &ldquo;open&rdquo; <a
-# | href=\"/philosophy/open-source-misses-the-point.html\"> never refers to
-# | freedom</a>.
+# | calls to mind freedom.  The word &ldquo;open&rdquo; [-<a
+# | href=\"/philosophy/open-source-misses-the-point.html\">-] never refers to
+# | [-freedom</a>.-] {+freedom.+}
 #, fuzzy
 #| msgid ""
 #| "Another group has started using the term &ldquo;open source&rdquo; to "
@@ -980,8 +1087,7 @@
 "close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
 "term &ldquo;free software&rdquo; because, once you have heard that it refers "
 "to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
+"open&rdquo; never refers to freedom."
 msgstr ""
 "Un altre grup ha comen&ccedil;at a fer servir el terme <cite>open source</"
 "cite> (codi obert) per a voler dir quelcom semblant (però no idèntic) a "
@@ -991,17 +1097,43 @@
 "\"/philosophy/open-source-misses-the-point.html\">mai fa  referència a la "
 "llibertat</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
+msgid "Beyond Software"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
+"the same reasons that software must be free, and because the manuals are in "
+"effect part of the software."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"The same arguments also make sense for other kinds of works of practical use "
+"&mdash; that is to say, works that embody useful knowledge, such as "
+"educational works and reference works.  <a href=\"https://wikipedia.org";
+"\">Wikipedia</a> is the best-known example."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"Any kind of work <em>can</em> be free, and the definition of free software "
+"has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
+"free cultural works</a> applicable to any kind of works."
+msgstr ""
+
+#. type: Content of: <div><h3>
 msgid "History"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -1010,7 +1142,7 @@
 "delete it, so there is no need to state those as separate requirements."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -1018,42 +1150,42 @@
 "1 and 3 enable users to remove them."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
 "to run the program means nothing stops you from making it run."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
 "needs to be free."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
 "freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
 "matter of the program's functionality."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
 "not require compliance with a nonfree license of another program."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1061,7 +1193,7 @@
 "was always our policy.)"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1069,7 +1201,7 @@
 "is only a potential problem."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1077,7 +1209,7 @@
 "made.  And modifications are not limited to &ldquo;improvements&rdquo;"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1086,7 +1218,7 @@
 "the work by releasing the work in another way in parallel."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1094,14 +1226,14 @@
 "that it includes really using your modified version for your computing."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
 "code does not qualify as source code."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1109,21 +1241,21 @@
 "version, not a right to participate in someone else's development project."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
 "right to release modified versions as free software."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
 "practical, not just theoretical; i.e., no tivoization."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1131,7 +1263,7 @@
 "described as a complete replacement."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1139,49 +1271,49 @@
 "everywhere:"
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
 "modified versions, not just changes."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
 "Software&quot; section."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
 "is significant in the freedom to run the program for any purpose."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
 "contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1189,7 +1321,7 @@
 "modifications."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1197,7 +1329,7 @@
 "the software you put into public use."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1205,21 +1337,21 @@
 "of modifications.  Other minor clarifications throughout the text."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
 "problems related to contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
 "distribution of binaries is important."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1227,7 +1359,7 @@
 "previous developers on request."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1239,14 +1371,14 @@
 msgstr ""
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | Footnote[-s-]
 #, fuzzy
 #| msgid "Footnotes"
 msgid "Footnote"
 msgstr "Notes"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1281,14 +1413,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
@@ -1298,13 +1436,13 @@
 "traducció al català del web de GNU."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 2002, [-2004-] {+2004-2007, 2009-2019, 2021+} Free
+# | Copyright &copy; 1996, 2002, [-2004-] {+2004-2007, 2009-2021+} Free
 # | Software Foundation, Inc.
 #, fuzzy
 #| msgid "Copyright &copy; 1996, 2002, 2004 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr "Copyright &copy; 1996, 2002, 2004 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1330,6 +1468,20 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Codi obert?"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
+#~ "traducció</a> per informar-vos sobre la coordinació i publicació de les 
"
+#~ "traduccions d'aquest article. <br />Contacteu amb l'<a href=\"/server/"
+#~ "standards/translations/ca/\">Equip de traducció</a> per col·laborar en 
la "
+#~ "traducció al català del web de GNU."
+
 #~ msgid ""
 #~ "We maintain this free software definition to show clearly what must be "
 #~ "true about a particular software program for it to be considered free "

Index: free-sw.cs.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.cs.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- free-sw.cs.po       30 May 2021 19:03:20 -0000      1.26
+++ free-sw.cs.po       16 Jul 2021 10:02:23 -0000      1.27
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: 2020-07-04 17:44+0100\n"
 "Last-Translator: František Kučera <franta-gnu AT frantovo.cz>\n"
 "Language-Team: Czech <www-cs-general@gnu.org>\n"
@@ -22,7 +22,11 @@
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation"
+# | What is [-free software?-] {+Free Software?+} - GNU Project - Free
+# | Software Foundation
+#, fuzzy
+#| msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Co je to svobodný software? – Projekt GNU – Nadace pro svobodný 
software"
 
@@ -43,61 +47,14 @@
 "Od roku 1983 vyvíjíme svobodný operační systém unixového typu, aby 
uživatelé "
 "počítačů měli svobodu sdílet a vylepšovat software, který 
používají."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr "Co je to svobodný software?"
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definice svobodného software"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-"Máte otázky ohledně licencování svobodného softwaru, na které jste zde 
"
-"nenašli odpověď? Podívejte se na naše další <a 
href=\"http://www.fsf.org/";
-"licensing\">informace o licencování</a>, a pokud je to nutné, kontaktujte "
-"tým FSF Compliance Lab na <a 
href=\"mailto:licensing@fsf.org\";>licensing@fsf."
-"org</a>."
-
-#. type: Content of: <div><div><p>
-# | [-We maintain this-]{+The+} free software definition [-to show clearly
-# | what must be true about-] {+presents the criteria for whether+} a
-# | particular software program [-for-] {+qualifies as free software.  From
-# | time to time we revise this definition, to clarify+} it {+or+} to [-be
-# | considered-] {+resolve questions about subtle issues.  See the <a
-# | href=\"#History\">History section</a> below for a list of changes that
-# | affect the definition of+} free software.
+#. type: Content of: <div><h2>
+# | What is [-free software?-] {+Free Software?+}
 #, fuzzy
-#| msgid ""
-#| "We maintain this free software definition to show clearly what must be "
-#| "true about a particular software program for it to be considered free "
-#| "software."
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"Používáme tuto definici svobodného software, abychom jasně ukázali, co 
musí "
-"splňovat konkrétní softwarový program, aby byl považován za svobodný "
-"software."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
+#| msgid "What is free software?"
+msgid "What is Free Software?"
+msgstr "Co je to svobodný software?"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 # | &ldquo;Free software&rdquo; {+means software that respects users' freedom
 # | and community.  Roughly, it means that <b>the users have the freedom to
 # | run, copy, distribute, study, change and improve the software</b>.  Thus,
@@ -127,7 +84,40 @@
 "ve spojení <cite>free speech</cite>  (svobodný projev), nikoliv jako "
 "<cite>free beer</cite> (pivo zadarmo)."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
+# | A free program must be available for commercial use.  Commercial
+# | development of free software is no longer unusual; such programs are free
+# | commercial software. Thus, you-]{+You+} may have paid money to get copies
+# | of [-GNU software,-] {+a free program,+} or you may have obtained copies
+# | at no charge.  But regardless of how you got your copies, you always have
+# | the freedom to copy and change the software, even to <a
+# | href=\"/philosophy/selling.html\">sell copies</a>.
+#, fuzzy
+#| msgid ""
+#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
+#| "free program must be available for commercial use.  Commercial "
+#| "development of free software is no longer unusual; such programs are free "
+#| "commercial software. Thus, you may have paid money to get copies of GNU "
+#| "software, or you may have obtained copies at no charge.  But regardless "
+#| "of how you got your copies, you always have the freedom to copy and "
+#| "change the software, even to <a href=\"/philosophy/selling.html\">sell "
+#| "copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"„Svobodný software“ neznamená „nekomerční“. Svobodný program 
musí být "
+"dostupný pro komerční využití.  Komerční vývoj svobodného software 
není "
+"ničím neobvyklým; takové programy jsou komerčním svobodným software. 
Za "
+"získání kopií GNU software můžete platit, nebo je obdržet zdarma, 
ovšem bez "
+"ohledu na způsob, jak jste je získali, máte vždy svobodu kopírovat a 
měnit "
+"software, dokonce <a href=\"/philosophy/selling.html\">prodávat jeho kopie</"
+"a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -138,11 +128,165 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Obsah"
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "Definice svobodného software"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#run-the-program\">The+} freedom to run the program
+# | [-for any purpose-] {+as you wish</a>+}
+#, fuzzy
+#| msgid "The freedom to run the program for any purpose"
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr "Svoboda spustit program za jakýmkoliv účelem"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#redistribute\">The+} freedom to redistribute [-copies
+# | so-] {+if+} you [-can help your neighbor (freedom 2).-] {+wish: basic
+# | requirements</a>+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr ""
+"Svoboda redistribuovat kopie, abyste pomohli vašemu kolegovi (svoboda 2)."
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+"Máte otázky ohledně licencování svobodného softwaru, na které jste zde 
"
+"nenašli odpověď? Podívejte se na naše další <a 
href=\"http://www.fsf.org/";
+"licensing\">informace o licencování</a>, a pokud je to nutné, kontaktujte "
+"tým FSF Compliance Lab na <a 
href=\"mailto:licensing@fsf.org\";>licensing@fsf."
+"org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Definice svobodného software"
+
+#. type: Content of: <div><div><p>
+# | [-We maintain this-]{+The+} free software definition [-to show clearly
+# | what must be true about-] {+presents the criteria for whether+} a
+# | particular software program [-for-] {+qualifies as free software.  From
+# | time to time we revise this definition, to clarify+} it {+or+} to [-be
+# | considered-] {+resolve questions about subtle issues.  See the <a
+# | href=\"#History\">History section</a> below for a list of changes that
+# | affect the definition of+} free software.
+#, fuzzy
+#| msgid ""
+#| "We maintain this free software definition to show clearly what must be "
+#| "true about a particular software program for it to be considered free "
+#| "software."
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"Používáme tuto definici svobodného software, abychom jasně ukázali, co 
musí "
+"splňovat konkrétní softwarový program, aby byl považován za svobodný "
+"software."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-Free software-]{+A program+} is [-a matter of the users' freedom to run,
 # | copy, distribute, study, change and improve the software.  More precisely,
 # | it refers to four kinds of freedom, for-] {+free software if+} the
@@ -161,7 +305,7 @@
 "studovat, měnit a zlepšovat jej.  Přesněji řečeno, vztahuje se ke 
čtyřem "
 "svobodám pro všechny uživatele software:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to run the program {+as you wish,+} for any purpose (freedom
 # | 0).
 #, fuzzy
@@ -170,7 +314,7 @@
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr "Svoboda spustit program za jakýmkoliv účelem (svoboda 0)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to study how the program works, and [-adapt-] {+change+} it
 # | [-to-] {+so it does+} your [-needs-] {+computing as you wish+} (freedom
 # | 1). Access to the source code is a precondition for this.
@@ -186,7 +330,7 @@
 "Svoboda studovat, jak program pracuje a přizpůsobit ho svým potřebám "
 "(svoboda 1). Předpokladem k výše uvedenému je přístup ke zdrojovému 
kódu."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to redistribute copies so you can help [-your neighbor-]
 # | {+others+} (freedom 2).
 #, fuzzy
@@ -197,7 +341,7 @@
 msgstr ""
 "Svoboda redistribuovat kopie, abyste pomohli vašemu kolegovi (svoboda 2)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to [-improve the program, and release-] {+distribute copies
 # | of+} your [-improvements-] {+modified versions+} to [-the public, so
 # | that-] {+others (freedom 3).  By doing this you can give+} the whole
@@ -218,7 +362,7 @@
 "prospěch celá komunita. (svoboda 3). Předpokladem k výše uvedenému je "
 "přístup ke zdrojovému kódu."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -226,7 +370,7 @@
 "free, we consider them all equally unethical."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -237,7 +381,11 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -246,7 +394,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -259,7 +407,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -267,7 +415,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -278,58 +426,25 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
-# | A free program must be available for commercial use.  Commercial
-# | development of free software is no longer unusual; such programs are free
-# | commercial software. Thus, you-]{+You+} may have paid money to get copies
-# | of [-GNU software,-] {+a free program,+} or you may have obtained copies
-# | at no charge.  But regardless of how you got your copies, you always have
-# | the freedom to copy and change the software, even to <a
-# | href=\"/philosophy/selling.html\">sell copies</a>.
-#, fuzzy
-#| msgid ""
-#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
-#| "free program must be available for commercial use.  Commercial "
-#| "development of free software is no longer unusual; such programs are free "
-#| "commercial software. Thus, you may have paid money to get copies of GNU "
-#| "software, or you may have obtained copies at no charge.  But regardless "
-#| "of how you got your copies, you always have the freedom to copy and "
-#| "change the software, even to <a href=\"/philosophy/selling.html\">sell "
-#| "copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"„Svobodný software“ neznamená „nekomerční“. Svobodný program 
musí být "
-"dostupný pro komerční využití.  Komerční vývoj svobodného software 
není "
-"ničím neobvyklým; takové programy jsou komerčním svobodným software. 
Za "
-"získání kopií GNU software můžete platit, nebo je obdržet zdarma, 
ovšem bez "
-"ohledu na způsob, jak jste je získali, máte vždy svobodu kopírovat a 
měnit "
-"software, dokonce <a href=\"/philosophy/selling.html\">prodávat jeho kopie</"
-"a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 # | The freedom to run the program [-for any purpose-] {+as you wish+}
 #, fuzzy
 #| msgid "The freedom to run the program for any purpose"
 msgid "The freedom to run the program as you wish"
 msgstr "Svoboda spustit program za jakýmkoliv účelem"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | The freedom to [-use a-] {+run the+} program means the freedom for any
 # | kind of person or organization to use it on any kind of computer system,
 # | for any kind of overall job[-,-] and {+purpose,+} without being required
@@ -360,7 +475,7 @@
 "práci a bez toho, aniž byste následně museli kontaktovat vývojáře či 
jinou "
 "skupinu."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -369,7 +484,7 @@
 "particular computing activity."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -380,18 +495,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for [-the-] freedoms {+1 and 3 (the freedom+} to make
 # | changes[-,-] and {+the freedom+} to publish [-improved versions,-] {+the
 # | changed versions)+} to be meaningful, you [-must-] {+need to+} have access
@@ -416,7 +531,7 @@
 "přístup ke zdrojovému kódu programu. Dostupnost zdrojového kódu je 
proto "
 "nezbytnou podmínkou pro svobodný software."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -428,7 +543,7 @@
 "from is free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One important way to modify a program is by merging in available free "
 "subroutines and modules.  If the program's license says that you cannot "
@@ -437,21 +552,21 @@
 "license is too restrictive to qualify as free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
 "else considers an improvement, that program is not free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 # | The freedom to redistribute [-copies so-] {+if+} you [-can help your
 # | neighbor (freedom 2).-] {+wish: basic requirements+}
 #, fuzzy
@@ -462,7 +577,7 @@
 msgstr ""
 "Svoboda redistribuovat kopie, abyste pomohli vašemu kolegovi (svoboda 2)."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-A program is free software if users have all of these freedoms.
 # | Thus,-]{+Freedom to distribute (freedoms 2 and 3) means+} you [-should
 # | be-] {+are+} free to redistribute copies, either with or without
@@ -491,7 +606,7 @@
 "kdekoliv</a>. Mít svobodu dělat tyto věci znamená (mimo jiné), že 
nemusíte "
 "nikoho žádat o povolení, nebo za něj platit."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -503,16 +618,16 @@
 "aniž byste se museli zmiňovat o jejich existenci.  Pokud zveřejníte vaše 
"
 "změny, neměli byste být nuceni je někomu zvláště oznamovat."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | The freedom to redistribute copies must include binary or executable forms
 # | of the program, as well as source code, for both modified and unmodified
 # | versions.  {+(Distributing programs in runnable form is necessary for
@@ -543,18 +658,19 @@
 "lidé ale musí mít svobodu redistribuuovat takové podoby programu, aby 
měli "
 "způsob, jak je vytvořit."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-However, certain-]{+Certain+} kinds of rules about the manner of
 # | distributing free software are acceptable, when they don't conflict with
 # | the central freedoms.  For example, <a
-# | href=\"/copyleft/copyleft.html\">copyleft</a> (very simply stated) is the
-# | rule that when redistributing the program, you cannot add restrictions to
-# | deny other people the central freedoms.  This rule does not conflict with
-# | the central freedoms; rather it protects them.
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
 #, fuzzy
 #| msgid ""
 #| "However, certain kinds of rules about the manner of distributing free "
@@ -567,7 +683,7 @@
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -579,7 +695,7 @@
 "přidat žádná omezení, abyste tak odepřeli základní svobody ostatním. 
Toto "
 "pravidlo nijak neomezuje základní svobody; spíše je chrání."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In the GNU project, we use copyleft to protect [-these-] {+the four+}
 # | freedoms legally for everyone.  [-But <a
 # | href=\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\">
@@ -625,11 +741,11 @@
 "„svobodný software“, „copyleftovaný software“ a jiné kategorie 
software "
 "vztahují."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Rules about how to package a modified version are acceptable, if they
 # | don't [-effectively block-] {+substantively limit+} your freedom to
 # | release modified [-versions. Rules that ``if you make the program
@@ -668,7 +784,7 @@
 "takové pravidlo vám stále poskytuje možnost výběru, jestli program 
zveřejnit "
 "či nikoliv.)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -680,7 +796,7 @@
 "use are also acceptable."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -690,20 +806,21 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr ""
 
-#. type: Content of: <div><p>
-# | Sometimes government <a id=\"exportcontrol\">export control
-# | regulations</a> and trade sanctions can constrain your freedom to
-# | distribute copies of programs internationally.  Software developers do not
-# | have the power to eliminate or override these restrictions, but what they
-# | can and must do is refuse to impose them as conditions of use of the
-# | program.  In this way, the restrictions will not affect activities and
-# | people outside the jurisdictions of these governments.  {+Thus, free
-# | software licenses must not require obedience to any nontrivial export
-# | regulations as a condition of exercising any of the essential freedoms.+}
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  {+Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.+}
 #, fuzzy
 #| msgid ""
 #| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
@@ -714,15 +831,15 @@
 #| "way, the restrictions will not affect activities and people outside the "
 #| "jurisdictions of these governments."
 msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "Někdy může vláda <a id=\"exportcontrol\">exportovat kontrolní 
nařízení</a> a "
 "tržní sankce omezující vaši svobodu mezinárodně šířit kopie 
programu.  "
@@ -731,7 +848,7 @@
 "programu. Díky tomu tato omezení nebudou zasahovat činnosti a osoby vně "
 "jurisdikce těchto vlád."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -741,11 +858,11 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for these freedoms to be real, they must be {+permanent and+}
 # | irrevocable as long as you do nothing wrong; if the developer of the
 # | software has the power to revoke the license, {+or retroactively add
@@ -769,7 +886,7 @@
 "byste mu svým jednáním k tomu zavdali příčinu, nejedná se o svobodný "
 "software."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -778,17 +895,17 @@
 "of those nonfree programs; that makes the license nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -800,7 +917,7 @@
 "be unacceptably restrictive and nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -808,67 +925,31 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr ""
-
-#. type: Content of: <div><p>
-# | When talking about free software, it is best to avoid using terms like
-# | &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms
-# | imply that the issue is about price, not freedom.  Some common terms such
-# | as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a
-# | href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that
-# | are Worth Avoiding</a> for a discussion of these terms.  We also have a
-# | list of {+proper+} <a
-# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
-# | software&rdquo;</a> into various languages.
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
 #, fuzzy
-#| msgid ""
-#| "When talking about free software, it is best to avoid using terms like "
-#| "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
-#| "imply that the issue is about price, not freedom.  Some common terms such "
-#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
-#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
-#| "that are Worth Avoiding</a> for a discussion of these terms. We also have "
-#| "a list of <a href=\"/philosophy/fs-translations.html\">translations of "
-#| "&ldquo;free software&rdquo;</a> into various languages."
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Pokud mluvíme o svobodném software, uděláme nejlépe, vyhneme-li se 
termínům "
-"jako „darovat“ nebo  „zdarma“, protože tyto výrazy se vztahují k 
ceně, "
-"nikoli ke svobodě. Některé běžné termíny jako „pirátství“ 
vyjadřují mínění, "
-"s nímž, jak doufáme, nebudete souhlasit.  Podívejte se na <a href=\"/"
-"philosophy/words-to-avoid.html\">Matoucí slova  a fráze, jichž je lepší 
se "
-"vyvarovat</a> na debatu o těchto výrazech. Máme rovněž seznam <a 
href=\"/"
-"philosophy/fs-translations.html\">překladů termínu „svobodný 
software“ <cite>"
-"[free software]</cite> </a> do různých jazyků."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Definice svobodného software"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr ""
 
-#. type: Content of: <div><p>
-# | Finally, note that criteria such as those stated in this free software
-# | definition require careful thought for their interpretation.  To decide
-# | whether a specific software license qualifies as a free software license,
-# | we judge it based on these criteria to determine whether it fits their
-# | spirit as well as the precise words.  If a license includes unconscionable
-# | restrictions, we reject it, even if we did not anticipate the issue in
-# | these criteria.  Sometimes a license requirement raises an issue that
-# | calls for extensive [-thought-] {+thought, including discussions with a
-# | lawyer,+} before we can decide if the requirement is [-acceptable,
-# | including discussions with a lawyer.-] {+acceptable.+}  When we reach a
-# | [-conclusion,-] {+conclusion about a new issue,+} we [-sometimes-]
-# | {+often+} update these criteria to make it easier to see why certain
-# | licenses do or don't qualify.
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive [-thought-] {+thought, including
+# | discussions with a lawyer,+} before we can decide if the requirement is
+# | [-acceptable, including discussions with a lawyer.-] {+acceptable.+}  When
+# | we reach a [-conclusion,-] {+conclusion about a new issue,+} we
+# | [-sometimes-] {+often+} update these criteria to make it easier to see why
+# | certain licenses do or don't qualify.
 #, fuzzy
 #| msgid ""
 #| "Finally, note that criteria such as those stated in this free software "
@@ -883,17 +964,17 @@
 #| "reach a conclusion, we sometimes update these criteria to make it easier "
 #| "to see why certain licenses do or don't qualify."
 msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Na závěr si povšimněte, že kritéria výše zmiňovaná v definici 
svobodného "
 "software vyžadují pro svou interpretaci opatrnost. Rozhodujeme-li se, zda 
je "
@@ -906,11 +987,11 @@
 "kritéria obnovíme, aby bylo jednodušší porozumět tomu, proč některé 
licence "
 "byly/nebyly schváleny."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -924,7 +1005,7 @@
 "nevyskytuje, můžete se přes email zeptat přímo nás &lt;<a 
href=\"mailto:";
 "licensing@gnu.org\">licensing@gnu.org</a>&gt;."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are contemplating writing a new license, please contact the Free "
 "Software Foundation first by writing to that address. The proliferation of "
@@ -933,52 +1014,64 @@
 "software license that meets your needs."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
 "various practical problems."
 msgstr ""
 
-#. type: Content of: <div><h3>
-msgid "Beyond Software"
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
-"the same reasons that software must be free, and because the manuals are in "
-"effect part of the software."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"The same arguments also make sense for other kinds of works of practical use "
-"&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
-"\">Wikipedia</a> is the best-known example."
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When talking about free software, it is best to avoid using terms like
+# | &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms
+# | imply that the issue is about price, not freedom.  Some common terms such
+# | as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a
+# | href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that
+# | are Worth Avoiding</a> for a discussion of these terms.  We also have a
+# | list of {+proper+} <a
+# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
+# | software&rdquo;</a> into various languages.
+#, fuzzy
+#| msgid ""
+#| "When talking about free software, it is best to avoid using terms like "
+#| "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
+#| "imply that the issue is about price, not freedom.  Some common terms such "
+#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
+#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
+#| "that are Worth Avoiding</a> for a discussion of these terms. We also have "
+#| "a list of <a href=\"/philosophy/fs-translations.html\">translations of "
+#| "&ldquo;free software&rdquo;</a> into various languages."
 msgid ""
-"Any kind of work <em>can</em> be free, and the definition of free software "
-"has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
-"free cultural works</a> applicable to any kind of works."
-msgstr ""
-
-#. type: Content of: <div><h3>
-msgid "Open Source?"
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
 msgstr ""
+"Pokud mluvíme o svobodném software, uděláme nejlépe, vyhneme-li se 
termínům "
+"jako „darovat“ nebo  „zdarma“, protože tyto výrazy se vztahují k 
ceně, "
+"nikoli ke svobodě. Některé běžné termíny jako „pirátství“ 
vyjadřují mínění, "
+"s nímž, jak doufáme, nebudete souhlasit.  Podívejte se na <a href=\"/"
+"philosophy/words-to-avoid.html\">Matoucí slova  a fráze, jichž je lepší 
se "
+"vyvarovat</a> na debatu o těchto výrazech. Máme rovněž seznam <a 
href=\"/"
+"philosophy/fs-translations.html\">překladů termínu „svobodný 
software“ <cite>"
+"[free software]</cite> </a> do různých jazyků."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Another group [-has started using-] {+uses+} the term [-<a
 # | href=\"free-software-for-freedom.html\"> open source</a>-] {+&ldquo;open
 # | source&rdquo;+} to mean something close (but not identical) to &ldquo;free
 # | software&rdquo;.  {+We prefer the term &ldquo;free software&rdquo;
 # | because, once you have heard that it refers to freedom rather than price,
-# | it calls to mind freedom.  The word &ldquo;open&rdquo; <a
-# | href=\"/philosophy/open-source-misses-the-point.html\"> never refers to
-# | freedom</a>.+}
+# | it calls to mind freedom.  The word &ldquo;open&rdquo; never refers to
+# | freedom.+}
 #, fuzzy
 #| msgid ""
 #| "Another group has started using the term <a href=\"free-software-for-"
@@ -989,24 +1082,49 @@
 "close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
 "term &ldquo;free software&rdquo; because, once you have heard that it refers "
 "to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
+"open&rdquo; never refers to freedom."
 msgstr ""
 "Jiná skupina začala používat výraz <a 
href=\"/philosophy/open-source-misses-"
 "the-point\"> open source</a> pro něco blízkého „svobodnému software“ 
(ne "
 "však identického)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
+msgid "Beyond Software"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
+"the same reasons that software must be free, and because the manuals are in "
+"effect part of the software."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"The same arguments also make sense for other kinds of works of practical use "
+"&mdash; that is to say, works that embody useful knowledge, such as "
+"educational works and reference works.  <a href=\"https://wikipedia.org";
+"\">Wikipedia</a> is the best-known example."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"Any kind of work <em>can</em> be free, and the definition of free software "
+"has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
+"free cultural works</a> applicable to any kind of works."
+msgstr ""
+
+#. type: Content of: <div><h3>
 msgid "History"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a
 # | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46\";>Version
 # | 1.46</a>: Clarify whose purpose is significant in-]
@@ -1031,7 +1149,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Verze 1.46</a>: Upřesnění o čí účel 
jde u "
 "svobody spouštět program za libovolným účelem."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -1039,42 +1157,42 @@
 "1 and 3 enable users to remove them."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
 "to run the program means nothing stops you from making it run."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
 "needs to be free."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
 "freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
 "matter of the program's functionality."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
 "not require compliance with a nonfree license of another program."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1082,7 +1200,7 @@
 "was always our policy.)"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1090,7 +1208,7 @@
 "is only a potential problem."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1101,7 +1219,7 @@
 "root=www&amp;r1=1.117&amp;r2=1.118\">Verze 1.118</a>: A úpravami nejsou "
 "myšlena jen „vylepšení“."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1115,7 +1233,7 @@
 "autorských práv ale mohou dodatečně udělit <em>oprávnění</em> k 
užití díla "
 "jeho jiným souběžným vydáním."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1127,7 +1245,7 @@
 "svobody č. 1, že smyslem (již vyjádřeno ve verzi 1.80) je skutečně 
používat "
 "upravenou verzi na počítači."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
@@ -1137,7 +1255,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Verze 1.92</a>: Upřesnění, že tzv. "
 "obfuskovaný kód není považován za zdrojový kód."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1149,7 +1267,7 @@
 "3 znamená právo distribuovat vaše vlastní upravené nebo vylepšení 
verze, "
 "nikoli právo účastnit se vývojového projektu někoho jiného."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -1159,7 +1277,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Verze 1.89</a>: Svoboda č. 3 v sobě "
 "zahrnuje právo vydávat upravené verze jako svobodný software."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
@@ -1169,7 +1287,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Verze 1.80</a>: Svoboda č. 1 musí být "
 "skutečná, ne pouze teoretická jako např. v případě tzv. tivoizace."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1181,7 +1299,7 @@
 "změny licence, které by měly mít zpětnou platnost, jsou nepřijatelné. 
A to i "
 "kdyby nešlo o kompletní nahrazení."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1192,7 +1310,7 @@
 "root=www&amp;r1=1.73&amp;r2=1.74\">Verze 1.74</a>: Upřesnění čtyř bodů, 
"
 "které nebyly dostatečně explicitní nebo zohledněné všude:"
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
@@ -1202,7 +1320,7 @@
 "úprav můžete vydávat. Svoboda č. 3 zahrnuje distribuci upravených 
verzí "
 "obecně, ne jen vylepšení (zda jde o vylepšení či ne, je subjektivní)."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
@@ -1210,15 +1328,15 @@
 "Možnost začlenění stávajících modulů se týká těch, které mají 
přijatelnou "
 "licenci."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr "Explicitní závěr týkající se vývozních omezení."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr "Vynucení změny licence by znamenalo zneplatnění té původní."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 #, fuzzy
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
@@ -1229,7 +1347,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Verze 1.57</a>: Přidána sekce &quot;"
 "Beyond Software&quot;."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
@@ -1239,7 +1357,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Verze 1.46</a>: Upřesnění o čí účel 
jde u "
 "svobody spouštět program za libovolným účelem."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
@@ -1249,7 +1367,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Verze 1.41</a>: Upřesnění týkající 
se "
 "licencí se smluvním základem."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1261,7 +1379,7 @@
 "licence musí umožnit začlenění jiného svobodného softwaru v rámci 
vašich "
 "úprav."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1273,7 +1391,7 @@
 "přijatelné, aby licence vyžadovala poskytnutí zdrojových kódů verze, 
kterou "
 "jste dali k veřejnému užívání."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1285,7 +1403,7 @@
 "vyžadovat, abyste se označili jako autor úprav. Další upřesnění jinde 
v "
 "textu."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1296,7 +1414,7 @@
 "potenciálních problémů licencí, které mají smluvní základ (na 
rozdíl od "
 "běžných licencí založených na autorském právu)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
@@ -1306,7 +1424,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Verze 1.16</a>: Vysvětlení, proč je "
 "důležitá možnost šířit přeložené (binární) tvary programů."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1318,7 +1436,7 @@
 "licence může požadovat, abyste na vyžádání poslali kopii verzí, 
které "
 "šíříte, předchozím vývojářům."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1335,11 +1453,11 @@
 "href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;view=log\">rozhraní cvsweb</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Poznámky pod čarou"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1379,14 +1497,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné a 
kvalitní "
@@ -1397,15 +1521,15 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2019-] {+2009-2019, 2021+}
-# | Free Software Foundation, Inc.
+# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2019-] {+2009-2021+} Free
+# | Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019 Free Software Foundation, "
 "Inc."
@@ -1429,3 +1553,16 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Aktualizováno:"
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné 
a "
+#~ "kvalitní překlady. Nicméně i my můžeme udělat chybu. Vaše 
komentáře a "
+#~ "návrhy na vylepšení vítáme na adrese <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\"> &lt;web-translators@gnu.org&gt;</a>.</p> <p>Přečtěte si prosím  
<a "
+#~ "href=\"/server/standards/README.translations.html\">Příručku "
+#~ "překladatele</a>, kde se dozvíte, jak koordinovat svoji práci a 
posílat "
+#~ "překlady tohoto článku."

Index: free-sw.da.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.da.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- free-sw.da.po       3 Feb 2021 13:03:03 -0000       1.20
+++ free-sw.da.po       16 Jul 2021 10:02:23 -0000      1.21
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -18,7 +18,11 @@
 "Outdated-Since: 2004-07-17 12:12+0000\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation"
+# | What is [-free software?-] {+Free Software?+} - GNU Project - Free
+# | Software Foundation
+#, fuzzy
+#| msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr "Hvad er fri software? - GNU Project - Free Software Foundation"
 
 #. type: Attribute 'content' of: <meta>
@@ -34,56 +38,14 @@
 "use."
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr "Hvad er fri software?"
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definitionen på fri software"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-# | [-We maintain this-]{+The+} free software definition [-to show clearly
-# | what must be true about-] {+presents the criteria for whether+} a
-# | particular software program [-for-] {+qualifies as free software.  From
-# | time to time we revise this definition, to clarify+} it {+or+} to [-be
-# | considered-] {+resolve questions about subtle issues.  See the <a
-# | href=\"#History\">History section</a> below for a list of changes that
-# | affect the definition of+} free software.
+#. type: Content of: <div><h2>
+# | What is [-free software?-] {+Free Software?+}
 #, fuzzy
-#| msgid ""
-#| "We maintain this free software definition to show clearly what must be "
-#| "true about a particular software program for it to be considered free "
-#| "software."
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"Vi vedligeholder denne definition på fri software for klart at vise, hvad "
-"der skal være sandt om et bestemt software-program for, at det kan betragtes 
"
-"som fri software."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
+#| msgid "What is free software?"
+msgid "What is Free Software?"
+msgstr "Hvad er fri software?"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 # | &ldquo;Free software&rdquo; {+means software that respects users' freedom
 # | and community.  Roughly, it means that <b>the users have the freedom to
 # | run, copy, distribute, study, change and improve the software</b>.  Thus,
@@ -112,7 +74,31 @@
 "begrebet kan du tænke på &ldquo;fri&rdquo; som i &ldquo;ytrings-fri&rdquo; "
 "og ikke som i &ldquo;fri/gratis øl&rdquo;."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | [-Thus, you-]{+You+} may have paid money to get copies of {+a+} free
+# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
+# | But regardless of how you got your copies, you always have the freedom to
+# | copy and change the software, even to <a
+# | href=\"/philosophy/selling.html\">sell copies</a>.
+#, fuzzy
+#| msgid ""
+#| "Thus, you may have paid money to get copies of free software, or you may "
+#| "have obtained copies at no charge.  But regardless of how you got your "
+#| "copies, you always have the freedom to copy and change the software, even "
+#| "to <a href=\"/philosophy/selling.html\">sell copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"Derfor har du måske betalt for kopier af fri software eller måske har du "
+"tilegnet dig kopier uden at betale gebyr. Men uanset, hvordan du har fået "
+"fat i dine kopier, så har du altid friheden til at kopiere og ændre "
+"programmet - endog til at <a href=\"/philosophy/selling.html\">sælge 
kopier</"
+"a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -123,11 +109,160 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Indhold"
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "Definitionen på fri software"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#run-the-program\">The+} freedom to run the [-program,
+# | for any purpose (freedom 0).-] {+program as you wish</a>+}
+#, fuzzy
+#| msgid "The freedom to run the program, for any purpose (freedom 0)."
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr "Friheden til at køre programmet til ethvert formål (frihed 0)."
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#redistribute\">The+} freedom to redistribute [-copies
+# | so-] {+if+} you [-can help your neighbor (freedom 2).-] {+wish: basic
+# | requirements</a>+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr ""
+"Friheden til at redistribuere kopier, så du kan hjælpe din nabo (frihed 2)."
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Definitionen på fri software"
+
+#. type: Content of: <div><div><p>
+# | [-We maintain this-]{+The+} free software definition [-to show clearly
+# | what must be true about-] {+presents the criteria for whether+} a
+# | particular software program [-for-] {+qualifies as free software.  From
+# | time to time we revise this definition, to clarify+} it {+or+} to [-be
+# | considered-] {+resolve questions about subtle issues.  See the <a
+# | href=\"#History\">History section</a> below for a list of changes that
+# | affect the definition of+} free software.
+#, fuzzy
+#| msgid ""
+#| "We maintain this free software definition to show clearly what must be "
+#| "true about a particular software program for it to be considered free "
+#| "software."
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"Vi vedligeholder denne definition på fri software for klart at vise, hvad "
+"der skal være sandt om et bestemt software-program for, at det kan betragtes 
"
+"som fri software."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-Free software-]{+A program+} is [-a matter of the users' freedom to run,
 # | copy, distribute, study, change and improve the software.  More precisely,
 # | it refers to four kinds of freedom, for-] {+free software if+} the
@@ -146,7 +281,7 @@
 "distribuere, studere, ændre og forbedre software. Mere præcist refererer 
det "
 "til fire former for frihed for software-brugerne:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to run the [-program,-] {+program as you wish,+} for any
 # | purpose (freedom 0).
 #, fuzzy
@@ -155,7 +290,7 @@
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr "Friheden til at køre programmet til ethvert formål (frihed 0)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to study how the program works, and [-adapt-] {+change+} it
 # | [-to-] {+so it does+} your [-needs-] {+computing as you wish+} (freedom
 # | 1). Access to the source code is a precondition for this.
@@ -171,7 +306,7 @@
 "Friheden til at studere, hvordan programmet virker og forandre det til dine "
 "behov (frihed 1). Adgang til program-koden er en betingelse for dette."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to redistribute copies so you can help [-your neighbor-]
 # | {+others+} (freedom 2).
 #, fuzzy
@@ -182,7 +317,7 @@
 msgstr ""
 "Friheden til at redistribuere kopier, så du kan hjælpe din nabo (frihed 2)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to [-improve the program, and release-] {+distribute copies
 # | of+} your [-improvements-] {+modified versions+} to [-the public, so
 # | that-] {+others (freedom 3).  By doing this you can give+} the whole
@@ -203,7 +338,7 @@
 "offentligheden, så hele samfundet har gavn af det (frihed 3). Adgang til "
 "program-koden er en betingelse for dette."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -211,7 +346,7 @@
 "free, we consider them all equally unethical."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -222,7 +357,11 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -231,7 +370,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -244,7 +383,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -252,7 +391,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -263,42 +402,18 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | [-Thus, you-]{+You+} may have paid money to get copies of {+a+} free
-# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
-# | But regardless of how you got your copies, you always have the freedom to
-# | copy and change the software, even to <a
-# | href=\"/philosophy/selling.html\">sell copies</a>.
-#, fuzzy
-#| msgid ""
-#| "Thus, you may have paid money to get copies of free software, or you may "
-#| "have obtained copies at no charge.  But regardless of how you got your "
-#| "copies, you always have the freedom to copy and change the software, even "
-#| "to <a href=\"/philosophy/selling.html\">sell copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"Derfor har du måske betalt for kopier af fri software eller måske har du "
-"tilegnet dig kopier uden at betale gebyr. Men uanset, hvordan du har fået "
-"fat i dine kopier, så har du altid friheden til at kopiere og ændre "
-"programmet - endog til at <a href=\"/philosophy/selling.html\">sælge 
kopier</"
-"a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 # | The freedom to run the [-program, for any purpose (freedom 0).-] {+program
 # | as you wish+}
 #, fuzzy
@@ -306,7 +421,7 @@
 msgid "The freedom to run the program as you wish"
 msgstr "Friheden til at køre programmet til ethvert formål (frihed 0)."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | The freedom to [-use a-] {+run the+} program means the freedom for any
 # | kind of person or organization to use it on any kind of computer system,
 # | for any kind of overall job[-,-] and {+purpose,+} without being required
@@ -337,7 +452,7 @@
 "ethvert formål, og uden at være påkrævet videre kontakt til udviklere 
eller "
 "enhver anden bestemt eksistens."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -346,7 +461,7 @@
 "particular computing activity."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -357,18 +472,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for [-the-] freedoms {+1 and 3 (the freedom+} to make
 # | changes[-,-] and {+the freedom+} to publish [-improved versions,-] {+the
 # | changed versions)+} to be meaningful, you [-must-] {+need to+} have access
@@ -393,7 +508,7 @@
 "meningsfyldt, bør du have adgang til program-koden. Derfor er adgangen til "
 "program-koden en nødvendig betingelse for fri software."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -405,7 +520,7 @@
 "from is free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One important way to modify a program is by merging in available free "
 "subroutines and modules.  If the program's license says that you cannot "
@@ -414,21 +529,21 @@
 "license is too restrictive to qualify as free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
 "else considers an improvement, that program is not free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 # | The freedom to redistribute [-copies so-] {+if+} you [-can help your
 # | neighbor (freedom 2).-] {+wish: basic requirements+}
 #, fuzzy
@@ -439,7 +554,7 @@
 msgstr ""
 "Friheden til at redistribuere kopier, så du kan hjælpe din nabo (frihed 2)."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-A program is free software if users have all of these freedoms.
 # | Thus,-]{+Freedom to distribute (freedoms 2 and 3) means+} you [-should
 # | be-] {+are+} free to redistribute copies, either with or without
@@ -468,7 +583,7 @@
 "\">enhver overalt</a>. At have friheden til at gøre disse ting betyder "
 "(blandt andet), at du ikke behøver at spørge om eller betale for 
tilladelse."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -480,16 +595,16 @@
 "nogen. Hvis du udgiver dine ændringer, bør det ikke være krævet, at du 
skal "
 "orientere nogen bestemt eller gøre det på en bestemt måde."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -508,18 +623,19 @@
 "til at redistribuere sådanne udgaver, hvis du kan udvikle en måde at "
 "producere dem."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-However, certain-]{+Certain+} kinds of rules about the manner of
 # | distributing free software are acceptable, when they don't conflict with
 # | the central freedoms.  For example, <a
-# | href=\"/copyleft/copyleft.html\">copyleft</a> (very simply stated) is the
-# | rule that when redistributing the program, you cannot add restrictions to
-# | deny other people the central freedoms.  This rule does not conflict with
-# | the central freedoms; rather it protects them.
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
 #, fuzzy
 #| msgid ""
 #| "However, certain kinds of rules about the manner of distributing free "
@@ -532,7 +648,7 @@
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -545,7 +661,7 @@
 "andre. Denne regel er ikke i konflikt med de centrale friheder, men "
 "beskytter dem faktisk."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In the GNU project, we use copyleft to protect [-these-] {+the four+}
 # | freedoms legally for everyone.  [-But <a
 # | href=\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\">
@@ -590,11 +706,11 @@
 "software&rdquo;, &ldquo;copyleft software&rdquo; og andre kategorier af "
 "software relaterer til hinanden."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Rules about how to package a modified version are acceptable, if they
 # | don't [-effectively block-] {+substantively limit+} your freedom to
 # | release modified [-versions. Rules that &ldquo;if you make the program
@@ -641,7 +757,7 @@
 "version og en tidligere udvikler spørger efter en kopi, at du så skal sende 
"
 "en."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -653,7 +769,7 @@
 "use are also acceptable."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -663,20 +779,21 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr ""
 
-#. type: Content of: <div><p>
-# | Sometimes government <a id=\"exportcontrol\">export control
-# | regulations</a> and trade sanctions can constrain your freedom to
-# | distribute copies of programs internationally.  Software developers do not
-# | have the power to eliminate or override these restrictions, but what they
-# | can and must do is refuse to impose them as conditions of use of the
-# | program.  In this way, the restrictions will not affect activities and
-# | people outside the jurisdictions of these governments.  {+Thus, free
-# | software licenses must not require obedience to any nontrivial export
-# | regulations as a condition of exercising any of the essential freedoms.+}
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  {+Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.+}
 #, fuzzy
 #| msgid ""
 #| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
@@ -687,15 +804,15 @@
 #| "way, the restrictions will not affect activities and people outside the "
 #| "jurisdictions of these governments."
 msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "Nogen gange begrænser regeringers <a id=\"exportcontrol\">eksport kontrol "
 "reguleringer</a> og salgssanktioner din frihed til at distribuere kopier af "
@@ -705,7 +822,7 @@
 "vil restriktionerne ikke berøre aktiviteter og folk uden for domsmyndigheden 
"
 "af disse regeringer."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -715,11 +832,11 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for these freedoms to be real, they must be {+permanent and+}
 # | irrevocable as long as you do nothing wrong; if the developer of the
 # | software has the power to revoke the license, {+or retroactively add
@@ -743,7 +860,7 @@
 "ophæve licensen uden, at du har gjort noget til at foranledige det, så er "
 "programmet ikke fri software."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -752,17 +869,17 @@
 "of those nonfree programs; that makes the license nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -774,7 +891,7 @@
 "be unacceptably restrictive and nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -782,66 +899,54 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr ""
-
-#. type: Content of: <div><p>
-# | When talking about free software, it is best to avoid using terms like
-# | &ldquo;give away&rdquo; or &ldquo;for [-free&rdquo;,-] {+free,&rdquo;+}
-# | because those terms imply that the issue is about price, not freedom. 
-# | Some common terms such as &ldquo;piracy&rdquo; embody opinions we hope you
-# | won't endorse.  See <a href=\"/philosophy/words-to-avoid.html\">Confusing
-# | Words and Phrases that are Worth Avoiding</a> for a discussion of these
-# | terms.  We also have a list of {+proper+} <a
-# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
-# | software&rdquo;</a> into various languages.
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
 #, fuzzy
-#| msgid ""
-#| "When talking about free software, it is best to avoid using terms like "
-#| "&ldquo;give away&rdquo; or &ldquo;for free&rdquo;, because those terms "
-#| "imply that the issue is about price, not freedom.  Some common terms such "
-#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
-#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
-#| "that are Worth Avoiding</a> for a discussion of these terms. We also have "
-#| "a list of <a href=\"/philosophy/fs-translations.html\">translations of "
-#| "&ldquo;free software&rdquo;</a> into various languages."
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Når man taler om fri software er det bedst at undgå ord såsom: &ldquo;"
-"gratis&rdquo;, fordi det antyder, at det vigtige er prisen og ikke friheden. "
-"Nogle almindelige brugte ord såsom &ldquo;pirateri&rdquo; indebærer "
-"meninger, som vi ikke tilslutter os.  Se <a  href=\"/philosophy/words-to-"
-"avoid.html\">Forvirrende ord og vendinger, som er værd at undgå</a> for en "
-"diskussion af disse vendinger. Vi har også en liste af <a 
href=\"/philosophy/"
-"fs-translations.html\">oversættelser af &ldquo;fri software&rdquo;</a> til "
-"forskellige sprog."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Definitionen på fri software"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Tilsidst bemærk da, at kriterier som de, der er forklarede i denne fri "
 "software definition kræver omhyggelig omtanke ved fortolkning. For at 
afgøre "
@@ -855,11 +960,11 @@
 "opdaterer vi som regel kriterierne, for at gøre det nemmere at se, hvorfor "
 "en bestemt licens kvalificerer sig eller ej."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -873,7 +978,7 @@
 "være nævnt i listen, kan du spørge os ved at sende en email til <a href="
 "\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</a>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are contemplating writing a new license, please contact the Free "
 "Software Foundation first by writing to that address. The proliferation of "
@@ -882,53 +987,65 @@
 "software license that meets your needs."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
 "various practical problems."
 msgstr ""
 
-#. type: Content of: <div><h3>
-msgid "Beyond Software"
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
-"the same reasons that software must be free, and because the manuals are in "
-"effect part of the software."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"The same arguments also make sense for other kinds of works of practical use "
-"&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
-"\">Wikipedia</a> is the best-known example."
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | When talking about free software, it is best to avoid using terms like
+# | &ldquo;give away&rdquo; or &ldquo;for [-free&rdquo;,-] {+free,&rdquo;+}
+# | because those terms imply that the issue is about price, not freedom. 
+# | Some common terms such as &ldquo;piracy&rdquo; embody opinions we hope you
+# | won't endorse.  See <a href=\"/philosophy/words-to-avoid.html\">Confusing
+# | Words and Phrases that are Worth Avoiding</a> for a discussion of these
+# | terms.  We also have a list of {+proper+} <a
+# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
+# | software&rdquo;</a> into various languages.
+#, fuzzy
+#| msgid ""
+#| "When talking about free software, it is best to avoid using terms like "
+#| "&ldquo;give away&rdquo; or &ldquo;for free&rdquo;, because those terms "
+#| "imply that the issue is about price, not freedom.  Some common terms such "
+#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
+#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
+#| "that are Worth Avoiding</a> for a discussion of these terms. We also have "
+#| "a list of <a href=\"/philosophy/fs-translations.html\">translations of "
+#| "&ldquo;free software&rdquo;</a> into various languages."
 msgid ""
-"Any kind of work <em>can</em> be free, and the definition of free software "
-"has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
-"free cultural works</a> applicable to any kind of works."
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
 msgstr ""
+"Når man taler om fri software er det bedst at undgå ord såsom: &ldquo;"
+"gratis&rdquo;, fordi det antyder, at det vigtige er prisen og ikke friheden. "
+"Nogle almindelige brugte ord såsom &ldquo;pirateri&rdquo; indebærer "
+"meninger, som vi ikke tilslutter os.  Se <a  href=\"/philosophy/words-to-"
+"avoid.html\">Forvirrende ord og vendinger, som er værd at undgå</a> for en "
+"diskussion af disse vendinger. Vi har også en liste af <a 
href=\"/philosophy/"
+"fs-translations.html\">oversættelser af &ldquo;fri software&rdquo;</a> til "
+"forskellige sprog."
 
-#. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Åben kode?"
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Another group [-has started using-] {+uses+} the term &ldquo;open
 # | source&rdquo; to mean something close (but not identical) to &ldquo;free
 # | software&rdquo;.  We prefer the term [-\"free software\"-] {+&ldquo;free
 # | software&rdquo;+} because, once you have heard {+that+} it refers to
 # | freedom rather than price, [-<a
 # | href=\"free-software-for-freedom.html\">it-] {+it+} calls to mind
-# | {+freedom.  The word &ldquo;open&rdquo; <a
-# | href=\"/philosophy/open-source-misses-the-point.html\"> never refers to+}
-# | freedom</a>.
+# | [-freedom</a>.-] {+freedom.  The word &ldquo;open&rdquo; never refers to
+# | freedom.+}
 #, fuzzy
 #| msgid ""
 #| "Another group has started using the term &ldquo;open source&rdquo; to "
@@ -941,8 +1058,7 @@
 "close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
 "term &ldquo;free software&rdquo; because, once you have heard that it refers "
 "to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
+"open&rdquo; never refers to freedom."
 msgstr ""
 "En anden gruppe er begyndt at bruge vendingen &ldquo;Ã¥ben kode&rdquo; til at 
"
 "betyde noget der ligner (men ikke er identisk med) &ldquo;fri "
@@ -951,17 +1067,43 @@
 "href=\"/philosophy/open-source-misses-the-point.html\">fremkalder det ordet "
 "frihed</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
+msgid "Beyond Software"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
+"the same reasons that software must be free, and because the manuals are in "
+"effect part of the software."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"The same arguments also make sense for other kinds of works of practical use "
+"&mdash; that is to say, works that embody useful knowledge, such as "
+"educational works and reference works.  <a href=\"https://wikipedia.org";
+"\">Wikipedia</a> is the best-known example."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid ""
+"Any kind of work <em>can</em> be free, and the definition of free software "
+"has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
+"free cultural works</a> applicable to any kind of works."
+msgstr ""
+
+#. type: Content of: <div><h3>
 msgid "History"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -970,7 +1112,7 @@
 "delete it, so there is no need to state those as separate requirements."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -978,42 +1120,42 @@
 "1 and 3 enable users to remove them."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
 "to run the program means nothing stops you from making it run."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
 "needs to be free."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
 "freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
 "matter of the program's functionality."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
 "not require compliance with a nonfree license of another program."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1021,7 +1163,7 @@
 "was always our policy.)"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1029,7 +1171,7 @@
 "is only a potential problem."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1037,7 +1179,7 @@
 "made.  And modifications are not limited to &ldquo;improvements&rdquo;"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1046,7 +1188,7 @@
 "the work by releasing the work in another way in parallel."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1054,14 +1196,14 @@
 "that it includes really using your modified version for your computing."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
 "code does not qualify as source code."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1069,21 +1211,21 @@
 "version, not a right to participate in someone else's development project."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
 "right to release modified versions as free software."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
 "practical, not just theoretical; i.e., no tivoization."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1091,7 +1233,7 @@
 "described as a complete replacement."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1099,49 +1241,49 @@
 "everywhere:"
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
 "modified versions, not just changes."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
 "Software&quot; section."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
 "is significant in the freedom to run the program for any purpose."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
 "contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1149,7 +1291,7 @@
 "modifications."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1157,7 +1299,7 @@
 "the software you put into public use."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1165,21 +1307,21 @@
 "of modifications.  Other minor clarifications throughout the text."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
 "problems related to contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
 "distribution of binaries is important."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1187,7 +1329,7 @@
 "previous developers on request."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1198,11 +1340,11 @@
 "view=log\">cvsweb interface</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1230,6 +1372,9 @@
 "kan sendes til <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
 "org&gt;</a>."
 
+#
+#
+#
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1237,22 +1382,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 
 #. type: Content of: <div><p>
 #, fuzzy
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr "Copyright &copy; 1996-2002 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1274,6 +1419,9 @@
 msgid "Updated:"
 msgstr "Sidst opdateret:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Åben kode?"
+
 #~ msgid ""
 #~ "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
 #~ "free program must be available for commercial use, commercial "

Index: free-sw.de-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.de-diff.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- free-sw.de-diff.html        8 Jun 2021 08:44:42 -0000       1.13
+++ free-sw.de-diff.html        16 Jul 2021 10:02:23 -0000      1.14
@@ -11,8 +11,11 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.86 --&gt;
-&lt;title&gt;What is free software?
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="aboutfs" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;What is <span class="removed"><del><strong>free 
software?</strong></del></span> <span class="inserted"><ins><em>Free 
Software?</em></ins></span>
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;style type="text/css" media="print,screen"&gt;&lt;!--
 .note { margin-left: 6%; margin-right: 6%; }
@@ -22,23 +25,25 @@
 --&gt;&lt;/style&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
-
 &lt;!--#include virtual="/philosophy/po/free-sw.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-
-&lt;h2&gt;What is free software?&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;What is <span class="removed"><del><strong>free 
software?&lt;/h2&gt;</strong></del></span> <span class="inserted"><ins><em>Free 
Software?&lt;/h2&gt;
+&lt;div class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;div class="article"&gt;
-&lt;h3&gt;The Free Software Definition&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;The Free Software 
Definition&lt;/h3&gt;
 
 &lt;blockquote class="note" id="fsf-licensing"&gt;&lt;p style="font-size: 
80%"&gt;
 Have a question about free software licensing not answered here?
 See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
 and if necessary contact the FSF Compliance Lab
 at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
-&lt;/blockquote&gt;
-
-&lt;div class="comment"&gt;
+&lt;/blockquote&gt;</strong></del></span>
+&lt;div <span class="removed"><del><strong>class="comment"&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
 particular software program qualifies as free software.  From time to
@@ -56,8 +61,7 @@
 difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
 Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
 &lt;/p&gt;
-&lt;/div&gt;
-
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="important"&gt;</em></ins></span>
 &lt;p&gt;
 &ldquo;Free software&rdquo; means software that respects users'
 freedom and community.  Roughly, it means that &lt;b&gt;the users have the
@@ -72,6 +76,14 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>You may have paid money to get copies of a 
free program, or you may
+have obtained copies at no charge.  But regardless of how you got your
+copies, you always have the freedom to copy and change the software,
+even to &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;p&gt;</em></ins></span>
 We campaign for these freedoms because everyone deserves them.  With
 these freedoms, the users (both individually and collectively) control
 the program and what it does for them.  When users don't control the
@@ -82,8 +94,78 @@
 an instrument of unjust power&lt;/a&gt;.
 &lt;/p&gt;
 
-&lt;h4&gt; The four essential freedoms&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;</strong></del></span>
 
+<span class="inserted"><ins><em>&lt;p&gt;
+&ldquo;Open source&rdquo; is something different: it has a very
+different philosophy based on different values.  Its practical
+definition is different too, but nearly all open source programs are
+in fact free.  We explain the
+difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
+Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of contents&lt;/h3&gt;
+&lt;ul&gt;
+ &lt;li&gt;&lt;a href="#fs-definition"&gt;The Free Software 
Definition&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#four-freedoms"&gt;The four essential 
freedoms&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#selling"&gt;Free software &lt;em&gt;can&lt;/em&gt; 
be commercial&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#clarifying"&gt;Clarifying the Boundary Between Free 
and Nonfree&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#run-the-program"&gt;The freedom to run the program 
as you
+     wish&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#make-changes"&gt;The freedom to study the source 
code and make
+     changes&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#redistribute"&gt;The freedom to redistribute if you 
wish:
+     basic requirements&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#copyleft"&gt;Copyleft&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#packaging"&gt;Rules about packaging and distribution
+     details&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#exportcontrol"&gt;Export 
regulations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#legal-details"&gt;Legal 
considerations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#contracts"&gt;Contract-based 
licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#in-practice"&gt;The Free Software Definition in 
Practice&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#interpretation"&gt;How we interpret these 
criteria&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#get-help"&gt;Get help with free 
licenses&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#terminology"&gt;Use the right words when talking 
about free
+     software&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#beyond-software"&gt;Beyond 
Software&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#History"&gt;History&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/div&gt;
+
+&lt;div class="edu-note" id="fsf-licensing"&gt;
+&lt;p style="font-size:80%"&gt;
+Have a question about free software licensing not answered here?
+See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
+and if necessary contact the FSF Compliance Lab
+at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;
+
+
+&lt;h3 id="fs-definition" class="subheader"&gt;The Free Software 
Definition&lt;/h3&gt;
+
+&lt;p&gt;</em></ins></span>
+The <span class="inserted"><ins><em>free software definition presents the 
criteria for whether a
+particular software program qualifies as free software.  From time to
+time we revise this definition, to clarify it or to resolve questions
+about subtle issues.  See the &lt;a href="#History"&gt;History 
section&lt;/a&gt;
+below for a list of changes that affect the definition of free
+software.
+&lt;/p&gt;
+
+&lt;h4 id="four-freedoms"&gt;The</em></ins></span> four essential 
freedoms&lt;/h4&gt;
 &lt;p&gt;
 A program is free software if the program's users have the
 four essential freedoms: &lt;a href="#f1"&gt;[1]&lt;/a&gt;
@@ -120,6 +202,9 @@
 are free.  However, if we plan to modify A so that it doesn't use B,
 only A needs to be free; B is not pertinent to that plan.&lt;/p&gt;
 
+
+<span class="inserted"><ins><em>&lt;h4 id="selling"&gt;Free software 
&lt;em&gt;can&lt;/em&gt; be commercial&lt;/h4&gt;</em></ins></span>
+
 &lt;p&gt;
 &ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  <span 
class="removed"><del><strong>A</strong></del></span>
 <span class="inserted"><ins><em>On the contrary, a</em></ins></span> free 
program must be available for commercial use,
@@ -136,44 +221,44 @@
 them.  We want commercial products that contain software to include
 the GNU system, and that would constitute commercial distribution for
 a price.</em></ins></span>  Commercial development of free software is no 
longer
-unusual; such free commercial software is very important.  <span 
class="inserted"><ins><em>Paid,
-professional support for free software fills an important need.
+unusual; such free commercial software is very important.
+<span class="removed"><del><strong>You may have paid money to get copies 
of</strong></del></span>  <span class="inserted"><ins><em>Paid,
+professional support for</em></ins></span> free <span 
class="removed"><del><strong>software,</strong></del></span> <span 
class="inserted"><ins><em>software fills an important need.
 &lt;/p&gt;
 
 &lt;p&gt;
-Thus, to exclude commercial use, commercial development or commercial
-distribution would hobble the free software community and obstruct its
+Thus, to exclude commercial use, commercial development</em></ins></span> or 
<span class="removed"><del><strong>you may have
+obtained copies at no charge.  But regardless of how you got your copies,
+you always have</strong></del></span> <span 
class="inserted"><ins><em>commercial
+distribution would hobble</em></ins></span> the <span 
class="removed"><del><strong>freedom</strong></del></span> <span 
class="inserted"><ins><em>free software community and obstruct its
 path to success.  We must conclude that a program licensed with such
 restrictions does not qualify as free software.
 &lt;/p&gt;
 
 &lt;p&gt;
-A free program must offer the four freedoms to any would-be user that
-obtains a copy of the software, who has complied thus far with the
+A free program must offer the four freedoms</em></ins></span> to <span 
class="inserted"><ins><em>any would-be user that
+obtains a</em></ins></span> copy <span class="removed"><del><strong>and 
change</strong></del></span> <span 
class="inserted"><ins><em>of</em></ins></span> the software, <span 
class="removed"><del><strong>even</strong></del></span> <span 
class="inserted"><ins><em>who has complied thus far with the
 conditions of the free license covering the software in any previous
-distribution of it.  Putting some of the freedoms off limits to some
+distribution of it.  Putting some of the freedoms off limits</em></ins></span> 
to 
+<span class="removed"><del><strong>&lt;a 
href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.</strong></del></span> 
<span class="inserted"><ins><em>some
 users, or requiring that users pay, in money or in kind, to exercise
 them, is tantamount to not granting the freedoms in question, and thus
-renders the program nonfree.
-&lt;/p&gt;
-
-&lt;p&gt;</em></ins></span>
-You may have paid money to get copies of <span 
class="inserted"><ins><em>a</em></ins></span> free <span 
class="removed"><del><strong>software,</strong></del></span> <span 
class="inserted"><ins><em>program,</em></ins></span> or you may
-have obtained copies at no charge.  But regardless of how you got your
-copies, you always have the freedom to copy and change the software,
-even to &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+renders the program nonfree.</em></ins></span>
 &lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;The</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;h3&gt;Clarifying the boundary between free 
and nonfree&lt;/h3&gt;
+
+<span class="inserted"><ins><em>&lt;h3 id="clarifying" 
class="subheader"&gt;Clarifying the Boundary Between Free and Nonfree&lt;/h3&gt;
 
 &lt;p&gt;In the</em></ins></span> rest of this <span 
class="removed"><del><strong>page clarifies certain points about what makes
 specific</strong></del></span> <span class="inserted"><ins><em>article we 
explain more precisely how far the
-various</em></ins></span> freedoms <span class="removed"><del><strong>adequate 
or not.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>need to 
extend, on various issues, in order for a
-program to be free.&lt;/p&gt;</em></ins></span>
+various</em></ins></span> freedoms <span class="removed"><del><strong>adequate 
or not.&lt;/p&gt;
+
+&lt;h4&gt;The</strong></del></span> <span class="inserted"><ins><em>need to 
extend, on various issues, in order for a
+program to be free.&lt;/p&gt;
 
-&lt;h4&gt;The freedom to run the program as you wish&lt;/h4&gt;
+&lt;h4 id="run-the-program"&gt;The</em></ins></span> freedom to run the 
program as you wish&lt;/h4&gt;
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -193,6 +278,8 @@
 functioning in any given environment, or whether it is useful for any
 particular computing activity.&lt;/p&gt;
 
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
 <span class="inserted"><ins><em>&lt;p&gt;For example, if the code arbitrarily 
rejects certain meaningful
 inputs&mdash;or even fails unconditionally&mdash;that may make the
 program less useful, perhaps even totally useless, but it does not
@@ -204,9 +291,9 @@
 
 &lt;p&gt;&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at
 all&rdquo; if that is what you wish.  So there is no need for a
-separate &ldquo;freedom not to run a 
program.&rdquo;&lt;/p&gt;</em></ins></span>
+separate &ldquo;freedom not to run a program.&rdquo;&lt;/p&gt;
 
-&lt;h4&gt;The freedom to study the source code and make changes&lt;/h4&gt;
+&lt;h4 id="make-changes"&gt;The</em></ins></span> freedom to study the source 
code and make changes&lt;/h4&gt;
 
 &lt;p&gt;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -242,13 +329,16 @@
 someone else considers an improvement, that program is not free.
 &lt;/p&gt;
 
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
 <span class="inserted"><ins><em>&lt;p&gt;
 One special case of freedom 1 is to delete the program's code so it
 returns after doing nothing, or make it invoke some other program.
 Thus, freedom 1 includes the &ldquo;freedom to delete the program.&rdquo;
-&lt;/p&gt;</em></ins></span>
+&lt;/p&gt;
 
-&lt;h4&gt;The freedom to redistribute if you wish: basic 
requirements&lt;/h4&gt;
+&lt;h4 id="redistribute"&gt;The</em></ins></span> freedom to redistribute if 
you wish: basic
+requirements&lt;/h4&gt;
 
 &lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
 redistribute copies, either with or without modifications, either
@@ -269,7 +359,7 @@
 Freedom 3 includes the freedom to release your modified versions
 as free software.  A free license may also permit other ways of
 releasing them; in other words, it does not have to be
-a &lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt; license.  
However, a
+a &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 license.  However, a
 license that requires modified versions to be nonfree does not qualify
 as a free license.
 &lt;/p&gt;
@@ -285,12 +375,14 @@
 make them.
 &lt;/p&gt;
 
-&lt;h4&gt;Copyleft&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Copyleft&lt;/h4&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="copyleft"&gt;Copyleft&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 Certain kinds of rules about the manner of distributing free
 software are acceptable, when they don't conflict with the central
-freedoms.  For example, &lt;a 
href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
+freedoms.  For example, &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 (very simply stated) is the rule that when redistributing the program,
 you cannot add restrictions to deny other people the central freedoms.
 This rule does not conflict with the central freedoms; rather it
@@ -310,7 +402,9 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;h4&gt;Rules about packaging and distribution details&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Rules</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="packaging"&gt;Rules</em></ins></span> about packaging and distribution 
details&lt;/h4&gt;
 
 &lt;p&gt;
 Rules about how to package a modified version are acceptable,
@@ -345,10 +439,12 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-&lt;h4&gt;Export regulations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Export</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="exportcontrol"&gt;Export</em></ins></span> regulations&lt;/h4&gt;
 
 &lt;p&gt;
-Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
+Sometimes government <span class="removed"><del><strong>&lt;a 
id="exportcontrol"&gt;export</strong></del></span> <span 
class="inserted"><ins><em>export</em></ins></span> control <span 
class="removed"><del><strong>regulations&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>regulations</em></ins></span>
 and trade sanctions can constrain your freedom to distribute copies of
 programs internationally.  Software developers do not have the power to
 eliminate or override these restrictions, but what they can and must do
@@ -369,7 +465,9 @@
 software nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Legal considerations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Legal</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="legal-details"&gt;Legal</em></ins></span> considerations&lt;/h4&gt;
 
 &lt;p&gt;
 In order for these freedoms to be real, they must be permanent and
@@ -393,7 +491,9 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
-&lt;h4&gt;Contract-based licenses&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Contract-based</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="contracts"&gt;Contract-based</em></ins></span> licenses&lt;/h4&gt;
 
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
@@ -414,7 +514,7 @@
 it is nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Use the right words when talking about free software&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Use the right words when talking 
about free software&lt;/h4&gt;
 
 &lt;p&gt;
 When talking about free software, it is best to avoid using terms
@@ -427,10 +527,15 @@
 &ldquo;free software&rdquo;&lt;/a&gt; into various languages.
 &lt;/p&gt;
 
-&lt;h4&gt;How we interpret these criteria&lt;/h4&gt;
+&lt;h4&gt;How</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="in-practice" 
class="subheader"&gt;The Free Software Definition in Practice&lt;/h3&gt;
+
+&lt;h4 id="interpretation"&gt;How</em></ins></span> we interpret these 
criteria&lt;/h4&gt;
 
 &lt;p&gt;
-Finally, note that criteria such as those stated in this free software
+<span class="removed"><del><strong>Finally, note</strong></del></span>
+<span class="inserted"><ins><em>Note</em></ins></span> that criteria such as 
those stated in this free software
 definition require careful thought for their interpretation.  To decide
 whether a specific software license qualifies as a free software license,
 we judge it based on these criteria to determine whether it fits their
@@ -443,7 +548,9 @@
 it easier to see why certain licenses do or don't qualify.
 &lt;/p&gt;
 
-&lt;h4&gt;Get help with free licenses&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Get</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 id="get-help"&gt;Get</em></ins></span> 
help with free licenses&lt;/h4&gt;
 
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
@@ -467,7 +574,28 @@
 and avoid various practical problems.
 &lt;/p&gt;
 
-&lt;h3 id="beyond-software"&gt;Beyond Software&lt;/h3&gt;
+<span class="inserted"><ins><em>&lt;h4 id="terminology"&gt;Use the right words 
when talking about free software&lt;/h4&gt;
+
+&lt;p&gt;
+When talking about free software, it is best to avoid using terms
+like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
+the issue is about price, not freedom.  Some common terms such
+as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
+&lt;a href="/philosophy/words-to-avoid.html"&gt;Confusing Words and Phrases 
that
+are Worth Avoiding&lt;/a&gt; for a discussion of these terms.  We also have
+a list of proper &lt;a href="/philosophy/fs-translations.html"&gt;translations 
of
+&ldquo;free software&rdquo;&lt;/a&gt; into various languages.
+&lt;/p&gt;
+
+&lt;p id="open-source"&gt;
+Another group uses the term &ldquo;open source&rdquo; to mean
+something close (but not identical) to &ldquo;free software&rdquo;.  We
+prefer the term &ldquo;free software&rdquo; because, once you have heard that
+it refers to freedom rather than price, it calls to mind freedom.  The
+word &ldquo;open&rdquo; never refers to freedom.
+&lt;/p&gt;</em></ins></span>
+
+&lt;h3 <span 
class="removed"><del><strong>id="beyond-software"&gt;Beyond</strong></del></span>
 <span class="inserted"><ins><em>id="beyond-software" 
class="subheader"&gt;Beyond</em></ins></span> Software&lt;/h3&gt;
 
 &lt;p&gt;
 &lt;a href="/philosophy/free-doc.html"&gt;Software manuals must be 
free&lt;/a&gt;,
@@ -479,7 +607,7 @@
 The same arguments also make sense for other kinds of works of
 practical use &mdash; that is to say, works that embody useful knowledge,
 such as educational works and reference
-works.  &lt;a href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt; is the 
best-known
+works.  &lt;a <span 
class="removed"><del><strong>href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</em></ins></span>
 is the best-known
 example.
 &lt;/p&gt;
 
@@ -489,7 +617,7 @@
 free cultural works&lt;/a&gt; applicable to any kind of works.
 &lt;/p&gt;
 
-&lt;h3 id="open-source"&gt;Open Source?&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3 id="open-source"&gt;Open 
Source?&lt;/h3&gt;
 
 &lt;p&gt;
 Another group uses the term &ldquo;open source&rdquo; to mean
@@ -498,7 +626,8 @@
 it refers to freedom rather than price, it calls to mind freedom.  The
 word &ldquo;open&rdquo; &lt;a 
href="/philosophy/open-source-misses-the-point.html"&gt;
 never refers to freedom&lt;/a&gt;.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;hr class="column-limit" 
/&gt;</em></ins></span>
 &lt;/div&gt;
 
 &lt;h3 id="History"&gt;History&lt;/h3&gt;
@@ -640,8 +769,9 @@
 You can review the complete list of changes to the page through
 the &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
 interface&lt;/a&gt;.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;hr class="column-limit" 
/&gt;</em></ins></span>
 
-&lt;h3 style="font-size:1em"&gt;Footnote&lt;/h3&gt;
+&lt;h3 <span 
class="removed"><del><strong>style="font-size:1em"&gt;Footnote&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnote&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
 &lt;li id="f1"&gt;The reason they are numbered 0, 1, 2 and 3 is historical. 
Around
 1990 there were three freedoms, numbered 1, 2 and 3. Then we realized that
@@ -649,10 +779,11 @@
 It was clearly more basic than the other three, so it properly should
 precede them. Rather than renumber the others, we made it 
freedom&nbsp;0.&lt;/li&gt;
 &lt;/ol&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -670,13 +801,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -697,7 +828,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 2002, 2004-2007, <span 
class="removed"><del><strong>2009-2018</strong></del></span> <span 
class="inserted"><ins><em>2009-2019, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; 1996, 2002, 2004-2007, <span 
class="removed"><del><strong>2009-2018</strong></del></span> <span 
class="inserted"><ins><em>2009-2021</em></ins></span>
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -708,7 +839,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:42 $
+$Date: 2021/07/16 10:02:23 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: free-sw.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.de.po,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- free-sw.de.po       31 May 2021 13:39:53 -0000      1.114
+++ free-sw.de.po       16 Jul 2021 10:02:23 -0000      1.115
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: 2018-05-07 22:00 +0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -19,7 +19,11 @@
 "X-Outdated-Since: 2019-03-20 10:56+0000\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation"
+# | What is [-free software?-] {+Free Software?+} - GNU Project - Free
+# | Software Foundation
+#, fuzzy
+#| msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr "Freie Software. Was ist das? - GNU-Projekt - Free Software Foundation"
 
 #. type: Attribute 'content' of: <meta>
@@ -35,60 +39,14 @@
 "use."
 msgstr " "
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+# | What is [-free software?-] {+Free Software?+}
+#, fuzzy
+#| msgid "What is free software?"
+msgid "What is Free Software?"
 msgstr "Freie Software. Was ist das?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Freie-Software-Definition"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-"Haben Sie eine hier nicht beantwortete Frage bezüglich Freie-Software-"
-"Lizenzierung? Siehe auch unsere weiteren <a href=\"https://www.fsf.org/";
-"licensing\">Ressourcen zur Lizenzierung</a>, bei unbeantworteten Anliegen "
-"wenden Sie sich bitte unter <a href=\"mailto:licensing@fsf.org";
-"\">licensing@fsf.org</a> an das <span xml:lang=\"en\" lang=\"en\">FSF "
-"Compliance Lab</span>."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"Die <em>Freie-Software-Definition</em> soll verdeutlichen, welche Kriterien "
-"ein einzelnes Softwareprogramm erfüllen muss um als Freie Software "
-"betrachtet zu werden. Von Zeit zu Zeit wird diese Definition überarbeitet, "
-"um dies zu verdeutlichen oder Fragen zu subtilen Problemen zu lösen. Weitere 
"
-"Informationen zu gemachten Änderungen sind unter <a href=\"#History"
-"\">Historie</a> zu finden."
-
-# (translation) Open-Source“ -> Open-Source“-Definition
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
-"Die <em>„Open-Source“-<ins>Definition</ins></em> ist etwas anderes: eine "
-"ganz andere Philosophie, die auf anderen Werten beruht. Auch die praktische "
-"Definition ist anders, jedoch sind alle quelloffenen Programme in der Tat "
-"beinahe frei. Den Unterschied erklären wir in <cite><a href=\"/philosophy/"
-"open-source-misses-the-point.html\">Warum „Open Source“ das Ziel Freie "
-"Software verfehlt</a></cite>."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; means software that respects users' freedom and "
 "community.  Roughly, it means that <b>the users have the freedom to run, "
@@ -111,7 +69,43 @@
 "deutlich zu machen, dass wir uns keinesfalls auf Software beziehen die "
 "<em>gratis</em> sei."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
+# | A free program must be available for commercial use, commercial
+# | development, and commercial distribution.  Commercial development of free
+# | software is no longer unusual; such free commercial software is very
+# | important.-]You may have paid money to get copies of {+a+} free
+# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
+# | But regardless of how you got your copies, you always have the freedom to
+# | copy and change the software, even to <a
+# | href=\"/philosophy/selling.html\">sell copies</a>.
+#, fuzzy
+#| msgid ""
+#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
+#| "free program must be available for commercial use, commercial "
+#| "development, and commercial distribution.  Commercial development of free "
+#| "software is no longer unusual; such free commercial software is very "
+#| "important.  You may have paid money to get copies of free software, or "
+#| "you may have obtained copies at no charge.  But regardless of how you got "
+#| "your copies, you always have the freedom to copy and change the software, "
+#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"<em>Freie Software</em> ist nicht gleichbedeutend mit <em>unkommerziell</"
+"em>. Ein freies Programm muss für die kommerzielle Nutzung, die kommerzielle 
"
+"Entwicklung und den kommerziellen Vertrieb verfügbar sein. Die kommerzielle "
+"Entwicklung von freier Software ist nicht mehr unüblich. Solche freie "
+"kommerzielle Software ist sehr wichtig. Möglicherweise hat man Geld für "
+"Kopien freier Software ausgegeben oder Kopien unentgeltlich erhalten. Aber "
+"egal wie man die Kopien erhalten hat, man hat immer die Freiheit die "
+"Software zu kopieren und zu ändern, sogar <a href=\"/philosophy/selling"
+"\">Kopien zu verkaufen</a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -130,12 +124,191 @@
 "href=\"/philosophy/free-software-even-more-important\">Instrument "
 "ungerechter Macht</a>."
 
+# (translation) Open-Source“ -> Open-Source“-Definition
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+"Die <em>„Open-Source“-<ins>Definition</ins></em> ist etwas anderes: eine "
+"ganz andere Philosophie, die auf anderen Werten beruht. Auch die praktische "
+"Definition ist anders, jedoch sind alle quelloffenen Programme in der Tat "
+"beinahe frei. Den Unterschied erklären wir in <cite><a href=\"/philosophy/"
+"open-source-misses-the-point.html\">Warum „Open Source“ das Ziel Freie "
+"Software verfehlt</a></cite>."
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Inhaltsverzeichnis"
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "Freie-Software-Definition"
+
 # ~ Vier <!--wesentliche --> Freiheiten 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#four-freedoms\">The+} four essential [-freedoms-]
+# | {+freedoms</a>+}
+#, fuzzy
+#| msgid "The four essential freedoms"
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr "Vier wesentliche Freiheiten"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#run-the-program\">The+} freedom to run the program as
+# | you [-wish-] {+wish</a>+}
+#, fuzzy
+#| msgid "The freedom to run the program as you wish"
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr "Die Freiheit, das Programm auszuführen wie man möchte"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#make-changes\">The+} freedom to study the source code
+# | and make [-changes-] {+changes</a>+}
+#, fuzzy
+#| msgid "The freedom to study the source code and make changes"
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr "Die Freiheit, den Quellcode zu untersuchen und Änderungen vorzunehmen"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#redistribute\">The+} freedom to redistribute if you
+# | wish: basic [-requirements-] {+requirements</a>+}
+#, fuzzy
+#| msgid "The freedom to redistribute if you wish: basic requirements"
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr ""
+"Die Freiheit zu redistribuieren, wenn man möchte: grundlegende Anforderungen"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Rules-]{+<a href=\"#packaging\">Rules+} about packaging and distribution
+# | [-details-] {+details</a>+}
+#, fuzzy
+#| msgid "Rules about packaging and distribution details"
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr "Richtlinien über Verpackungs- und Distributionsinformationen"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Contract-based licenses-]{+<a href=\"#contracts\">Contract-based
+# | licenses</a>+}
+#, fuzzy
+#| msgid "Contract-based licenses"
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr "Auftragsbezogene Lizenzen"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-How-]{+<a href=\"#interpretation\">How+} we interpret these [-criteria-]
+# | {+criteria</a>+}
+#, fuzzy
+#| msgid "How we interpret these criteria"
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr "Interpretation diese Kriterien"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Get-]{+<a href=\"#get-help\">Get+} help with free [-licenses-]
+# | {+licenses</a>+}
+#, fuzzy
+#| msgid "Get help with free licenses"
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr "Hilfe zu freien Lizenzen"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Use-]{+<a href=\"#terminology\">Use+} the right words when talking about
+# | free [-software-] {+software</a>+}
+#, fuzzy
+#| msgid "Use the right words when talking about free software"
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr "Die richtigen Wörter, wenn es um Freie Software geht"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+"Haben Sie eine hier nicht beantwortete Frage bezüglich Freie-Software-"
+"Lizenzierung? Siehe auch unsere weiteren <a href=\"https://www.fsf.org/";
+"licensing\">Ressourcen zur Lizenzierung</a>, bei unbeantworteten Anliegen "
+"wenden Sie sich bitte unter <a href=\"mailto:licensing@fsf.org";
+"\">licensing@fsf.org</a> an das <span xml:lang=\"en\" lang=\"en\">FSF "
+"Compliance Lab</span>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Freie-Software-Definition"
+
+#. type: Content of: <div><div><p>
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"Die <em>Freie-Software-Definition</em> soll verdeutlichen, welche Kriterien "
+"ein einzelnes Softwareprogramm erfüllen muss um als Freie Software "
+"betrachtet zu werden. Von Zeit zu Zeit wird diese Definition überarbeitet, "
+"um dies zu verdeutlichen oder Fragen zu subtilen Problemen zu lösen. Weitere 
"
+"Informationen zu gemachten Änderungen sind unter <a href=\"#History"
+"\">Historie</a> zu finden."
+
+# ~ Vier <!--wesentliche --> Freiheiten 
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "Vier wesentliche Freiheiten"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if the program's users have the four essential "
 "freedoms: <a href=\"#f1\">[1]</a>"
@@ -144,14 +317,14 @@
 "wesentliche Freiheiten<a href=\"#n1\" id=\"n1-ref\" class=\"fnote\">[1]</a> "
 "verfügen:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr ""
 "Die Freiheit, das Programm auszuführen wie man möchte, für jeden Zweck 
<em>"
 "(Freiheit 0)</em>."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to study how the program works, and change it so it does your "
 "computing as you wish (freedom 1). Access to the source code is a "
@@ -162,13 +335,13 @@
 "zum Quellcode ist dafür Voraussetzung."
 
 # {others) 'neighbor' sounds much better; see aöso default homepage etc.
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "The freedom to redistribute copies so you can help others (freedom 2)."
 msgstr ""
 "Die Freiheit, das Programm zu redistribuieren und damit Mitmenschen zu "
 "helfen <em>(Freiheit 2)</em>."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to distribute copies of your modified versions to others "
 "(freedom 3).  By doing this you can give the whole community a chance to "
@@ -179,7 +352,7 @@
 "Öffentlichkeit freizugeben, damit die gesamte Gesellschaft davon profitiert "
 "<em>(Freiheit 3)</em>. Der Zugang zum Quellcode ist dafür Voraussetzung."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -192,7 +365,7 @@
 "sie dahinter zurückbleiben frei zu sein, betrachten wir sie alle "
 "gleichermaßen als unethisch."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -213,7 +386,11 @@
 "modifizieren, damit es <em>B</em> nicht mehr benötigt, muss nur <em>A</em> "
 "frei sein, <em>B</em> ist für dieses Vorhaben nicht relevant."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -222,7 +399,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -235,7 +412,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -243,7 +420,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -254,60 +431,24 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
-# | A free program must be available for commercial use, commercial
-# | development, and commercial distribution.  Commercial development of free
-# | software is no longer unusual; such free commercial software is very
-# | important.-]You may have paid money to get copies of {+a+} free
-# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
-# | But regardless of how you got your copies, you always have the freedom to
-# | copy and change the software, even to <a
-# | href=\"/philosophy/selling.html\">sell copies</a>.
-#, fuzzy
-#| msgid ""
-#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
-#| "free program must be available for commercial use, commercial "
-#| "development, and commercial distribution.  Commercial development of free "
-#| "software is no longer unusual; such free commercial software is very "
-#| "important.  You may have paid money to get copies of free software, or "
-#| "you may have obtained copies at no charge.  But regardless of how you got "
-#| "your copies, you always have the freedom to copy and change the software, "
-#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
-"<em>Freie Software</em> ist nicht gleichbedeutend mit <em>unkommerziell</"
-"em>. Ein freies Programm muss für die kommerzielle Nutzung, die kommerzielle 
"
-"Entwicklung und den kommerziellen Vertrieb verfügbar sein. Die kommerzielle "
-"Entwicklung von freier Software ist nicht mehr unüblich. Solche freie "
-"kommerzielle Software ist sehr wichtig. Möglicherweise hat man Geld für "
-"Kopien freier Software ausgegeben oder Kopien unentgeltlich erhalten. Aber "
-"egal wie man die Kopien erhalten hat, man hat immer die Freiheit die "
-"Software zu kopieren und zu ändern, sogar <a href=\"/philosophy/selling"
-"\">Kopien zu verkaufen</a>."
 
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "Die Freiheit, das Programm auszuführen wie man möchte"
 
 # (+) steht _es_ dieser Person
 # (RT#927799)
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program means the freedom for any kind of person or "
 "organization to use it on any kind of computer system, for any kind of "
@@ -328,7 +469,7 @@
 "steht es dieser Person dann frei es für eigene Zwecke auszuführen, aber man 
"
 "ist nicht berechtigt, ihr eigene Absichten aufzuerlegen."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -343,7 +484,7 @@
 "funktionieren oder ob es für einen bestimmten Bereich der Datenverarbeitung "
 "sinnvoll ist."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -354,18 +495,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "Die Freiheit, den Quellcode zu untersuchen und Änderungen vorzunehmen"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for freedoms 1 and 3 (the freedom to make changes and the freedom
 # | to publish the changed versions) to be meaningful, you [-must-] {+need
 # | to+} have access to the source code of the program.  Therefore,
@@ -394,7 +535,7 @@
 "Verschleierter „Quellcode“ ist nicht wirklich Quellcode und zählt nicht 
als "
 "solcher."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -417,7 +558,7 @@
 "Binärdateien sind nicht <em>freie</em> Software, selbst wenn der Quellcode, "
 "von dem sie kompiliert werden, frei ist."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One important way to modify a program is by merging in available free "
 "subroutines and modules.  If the program's license says that you cannot "
@@ -433,7 +574,7 @@
 "dann ist die Lizenz zu restriktiv, um sich als <em>frei</em> zu "
 "qualifizieren."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
@@ -444,19 +585,19 @@
 "auf Änderungen beschränkt wird, die jemand anderes als Verbesserung "
 "betrachtet, ist das Programm unfrei."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr ""
 "Die Freiheit zu redistribuieren, wenn man möchte: grundlegende Anforderungen"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
 "copies, either with or without modifications, either gratis or charging a "
@@ -473,7 +614,7 @@
 "oder für die Berechtigung zahlen zu müssen."
 
 # (+) sollte _es_ nicht (RT#927799)
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -486,11 +627,25 @@
 "sein, irgendjemand im Besonderen oder auf irgendeine bestimmte Weise zu "
 "benachrichtigen."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Freedom 3 includes the freedom to release your modified versions as free
+# | software.  A free license may also permit other ways of releasing them; in
+# | other words, it does not have to be a <a
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} license.  However, a
+# | license that requires modified versions to be nonfree does not qualify as
+# | a free license.
+#, fuzzy
+#| msgid ""
+#| "Freedom 3 includes the freedom to release your modified versions as free "
+#| "software.  A free license may also permit other ways of releasing them; "
+#| "in other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+#| "\">copyleft</a> license.  However, a license that requires modified "
+#| "versions to be nonfree does not qualify as a free license."
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
@@ -501,7 +656,7 @@
 "qualifiziert sich eine Lizenz, die von modifizierten Versionen verlangt "
 "unfrei zu sein, nicht als freie Lizenz."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -521,15 +676,30 @@
 "aber man muss die Freiheit haben solche Formen an Dritte weiterzugeben, "
 "sollte man eine Möglichkeit finden oder entwickeln, sie zu erstellen."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "Copyleft"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Certain kinds of rules about the manner of distributing free software are
+# | acceptable, when they don't conflict with the central freedoms.  For
+# | example, <a [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
+#, fuzzy
+#| msgid ""
+#| "Certain kinds of rules about the manner of distributing free software are "
+#| "acceptable, when they don't conflict with the central freedoms.  For "
+#| "example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+#| "stated) is the rule that when redistributing the program, you cannot add "
+#| "restrictions to deny other people the central freedoms.  This rule does "
+#| "not conflict with the central freedoms; rather it protects them."
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -542,7 +712,7 @@
 "wesentliche Freiheiten zu versagen. Diese Richtlinie widerspricht nicht den "
 "wesentlichen Freiheiten&#160;&#8209;&#160;vielmehr schützt es sie."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the GNU project, we use copyleft to protect the four freedoms legally for "
 "everyone.  We believe there are important reasons why <a href=\"/philosophy/"
@@ -562,11 +732,11 @@
 "wie sich <em>Freie Software</em>, <em>Software mit Copyleft</em> und andere "
 "Softwarekategorien aufeinander beziehen)."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Richtlinien über Verpackungs- und Distributionsinformationen"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules about how to package a modified version are acceptable, if they don't "
 "substantively limit your freedom to release modified versions, or your "
@@ -587,7 +757,7 @@
 "Änderungen effektiv behindern, sind sie zulässig; man nimmt bereits andere "
 "Programmänderungen vor, ein paar mehr sollten kein Problem 
darstellen&#160;…"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -608,7 +778,7 @@
 "Richtlinien akzeptabel, die die Freigabe des Quellcodes für öffentlich "
 "einsetzbare Programmversionen an Nutzer verlangen."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -625,21 +795,42 @@
 "<em>Alias</em>-Funktion gibt, die erlaubt, den Namen des Originalprogramms "
 "als Decknamen für die modifizierte Version anzugeben."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Ausfuhrbestimmungen"
 
-#. type: Content of: <div><p>
-msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any nontrivial export regulations as a condition "
+#| "of exercising any of the essential freedoms."
+msgid ""
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "Mitunter können staatliche <a id=\"exportcontrol"
 "\">Ausfuhrkontrollbestimmungen</a> und Handelssanktionen die Freiheit "
@@ -652,7 +843,7 @@
 "gegenüber allen nicht trivialen Ausfuhrbestimmungen als Bedingung für die "
 "Ausübung einer der wesentlichsten Freiheiten verlangen."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -669,11 +860,11 @@
 "spätere Änderung im Exportgesetz die Erfordernis trivial und damit die "
 "Software unfrei machen könnte."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Rechtliche Hinweise"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In order for these freedoms to be real, they must be permanent and "
 "irrevocable as long as you do nothing wrong; if the developer of the "
@@ -687,7 +878,7 @@
 "zu widerrufen oder rückwirkend Restriktionen hinzuzufügen, ohne dafür 
Anlass "
 "gegeben zu haben, ist die Software unfrei."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -702,7 +893,7 @@
 "ausführt, die Einhaltung mit den Lizenzen dieser unfreien Programme "
 "erfordern. Das macht die Lizenz unfrei."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
@@ -711,11 +902,11 @@
 "oder wo Rechtsstreitigkeiten durchgeführt werden müssen oder beides.<a 
href="
 "\"#tn2\" id=\"tn2-ref\" class=\"transnote\">[**]</a>"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Auftragsbezogene Lizenzen"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -737,7 +928,7 @@
 "es gibt viele Möglichkeiten wie solch eine Lizenz inakzeptabel restriktiv "
 "und unfrei sein könnte."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -750,48 +941,54 @@
 "hier als nicht legitim erwähnt wird, werden wir darüber nachdenken müssen "
 "und wahrscheinlich zu dem Schluss kommen, dass sie unfrei ist."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Die richtigen Wörter, wenn es um Freie Software geht"
-
-#. type: Content of: <div><p>
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Spricht man über Freie Software, empfiehlt es sich Begriffe wie "
-"<em>verschenken</em> oder <em>kostenlos</em> zu vermeiden, weil diese "
-"Begriffe implizieren, es würde um den Preis gehen, nicht um Freiheit. Einige 
"
-"gebräuchliche Begriffe wie <a href=\"/philosophy/words-to-avoid\"><em>"
-"„Piraterie“</em></a> stellen Meinungen dar, von denen wir hoffen, dass 
Sie "
-"diese nicht unterstützen. Weitere voreingenommene oder irreführende 
Begriffe "
-"unter <cite><a href=\"/philosophy/words-to-avoid\">Zu vermeidende Wörter</"
-"a></cite>, ebenso verschiedene <cite><a href=\"/philosophy/fs-translations"
-"\">Übersetzungen des Begriffs <em>Freie Software</em></a></cite>."
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Freie-Software-Definition"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Interpretation diese Kriterien"
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Abschließend noch der Hinweis, dass die in dieser Freie-Software-Definition "
 "angegeben Kriterien sorgfältige Überlegungen bei ihrer Interpretation "
@@ -806,11 +1003,11 @@
 "diese Kriterien aktualisiert, um verständlicher zu machen, warum sich "
 "bestimmte Lizenzen qualifizieren oder nicht."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Hilfe zu freien Lizenzen"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -824,7 +1021,7 @@
 "die betreffende Lizenz nicht aufgeführt sein, kontaktieren Sie uns bitte "
 "unter <a href=\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</a>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are contemplating writing a new license, please contact the Free "
 "Software Foundation first by writing to that address. The proliferation of "
@@ -840,7 +1037,7 @@
 "bereits vorhandenen freien Softwarelizenz behilflich sein, die ihren "
 "Bedürfnissen entspricht."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
@@ -850,11 +1047,67 @@
 "können Sie mit unserer Hilfe sicherstellen, dass die Lizenz wirklich eine "
 "freie Softwarelizenz ist und verschiedene praktische Probleme vermeiden."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Die richtigen Wörter, wenn es um Freie Software geht"
+
+#. type: Content of: <div><div><p>
+msgid ""
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
+msgstr ""
+"Spricht man über Freie Software, empfiehlt es sich Begriffe wie "
+"<em>verschenken</em> oder <em>kostenlos</em> zu vermeiden, weil diese "
+"Begriffe implizieren, es würde um den Preis gehen, nicht um Freiheit. Einige 
"
+"gebräuchliche Begriffe wie <a href=\"/philosophy/words-to-avoid\"><em>"
+"„Piraterie“</em></a> stellen Meinungen dar, von denen wir hoffen, dass 
Sie "
+"diese nicht unterstützen. Weitere voreingenommene oder irreführende 
Begriffe "
+"unter <cite><a href=\"/philosophy/words-to-avoid\">Zu vermeidende Wörter</"
+"a></cite>, ebenso verschiedene <cite><a href=\"/philosophy/fs-translations"
+"\">Übersetzungen des Begriffs <em>Freie Software</em></a></cite>."
+
+#. type: Content of: <div><div><p>
+# | Another group uses the term &ldquo;open source&rdquo; to mean something
+# | close (but not identical) to &ldquo;free software&rdquo;.  We prefer the
+# | term &ldquo;free software&rdquo; because, once you have heard that it
+# | refers to freedom rather than price, it calls to mind freedom.  The word
+# | &ldquo;open&rdquo; [-<a
+# | href=\"/philosophy/open-source-misses-the-point.html\">-] never refers to
+# | [-freedom</a>.-] {+freedom.+}
+#, fuzzy
+#| msgid ""
+#| "Another group uses the term &ldquo;open source&rdquo; to mean something "
+#| "close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+#| "term &ldquo;free software&rdquo; because, once you have heard that it "
+#| "refers to freedom rather than price, it calls to mind freedom.  The word "
+#| "&ldquo;open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html"
+#| "\"> never refers to freedom</a>."
+msgid ""
+"Another group uses the term &ldquo;open source&rdquo; to mean something "
+"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+"term &ldquo;free software&rdquo; because, once you have heard that it refers "
+"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
+"open&rdquo; never refers to freedom."
+msgstr ""
+"Eine andere Gruppierung verwendet den Begriff <em>„Open Source“</em> um "
+"etwas ähnliches (aber nicht identisches) wie <em>Freie Software</em> zu "
+"meinen. Die Freie-Software-Gemeinschaft bevorzugt den Begriff "
+"<em><strong>Freie Software</strong></em>, denn, sobald man gehört hat, dass "
+"sich dieser auf Freiheit statt auf den Preis bezieht, ruft es Freiheit in "
+"Erinnerung. Das Wort <em>offen</em> <a href=\"/philosophy/open-source-misses-"
+"the-point\">bezieht sich niemals auf Freiheit</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Jenseits von Software"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
 "the same reasons that software must be free, and because the manuals are in "
@@ -864,11 +1117,21 @@
 "aus den gleichen Gründen, warum Software frei sein muss und weil Handbücher 
"
 "in der Tat Bestandteil der Software sind."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | The same arguments also make sense for other kinds of works of practical
+# | use &mdash; that is to say, works that embody useful knowledge, such as
+# | educational works and reference works.  <a
+# | href=\"http{+s+}://wikipedia.org\">Wikipedia</a> is the best-known example.
+#, fuzzy
+#| msgid ""
+#| "The same arguments also make sense for other kinds of works of practical "
+#| "use &mdash; that is to say, works that embody useful knowledge, such as "
+#| "educational works and reference works.  <a href=\"http://wikipedia.org";
+#| "\">Wikipedia</a> is the best-known example."
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 "Die gleichen Argumente sind auch für andere Arten von Werken von praktischem 
"
@@ -876,7 +1139,7 @@
 "verkörpern wie etwa pädagogische Werke und Nachschlagewerke. <a 
href=\"//de."
 "wikipedia.org\">Wikipedia</a> ist das wohl bekannteste Beispiel."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Any kind of work <em>can</em> be free, and the definition of free software "
 "has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
@@ -889,31 +1152,10 @@
 "Werke jeglicher Art anwendbar sind."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "„Open Source“, offener Quellcode?"
-
-#. type: Content of: <div><p>
-msgid ""
-"Another group uses the term &ldquo;open source&rdquo; to mean something "
-"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
-"term &ldquo;free software&rdquo; because, once you have heard that it refers "
-"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
-msgstr ""
-"Eine andere Gruppierung verwendet den Begriff <em>„Open Source“</em> um "
-"etwas ähnliches (aber nicht identisches) wie <em>Freie Software</em> zu "
-"meinen. Die Freie-Software-Gemeinschaft bevorzugt den Begriff "
-"<em><strong>Freie Software</strong></em>, denn, sobald man gehört hat, dass "
-"sich dieser auf Freiheit statt auf den Preis bezieht, ruft es Freiheit in "
-"Erinnerung. Das Wort <em>offen</em> <a href=\"/philosophy/open-source-misses-"
-"the-point\">bezieht sich niemals auf Freiheit</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Historie"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
@@ -922,7 +1164,7 @@
 "substanziellen Änderungen sowie Verweise veranschaulichen genau, was "
 "geändert wurde."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a
 # | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153\";>Version
 # | 1.153</a>: Clarify that-]
@@ -949,7 +1191,7 @@
 "Klarstellung, dass die Freiheit, das Programm auszuführen, bedeutet, dass "
 "einen nichts davon abhält es auszuführen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 # | <a
 # | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135\";>Version
 # | 1.135</a>: Say each time-]
@@ -972,7 +1214,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\" hreflang=\"en\">Version 1.135</a>: "
 "Freiheit <em>0</em> ist die Freiheit, das Programm beliebig auszuführen. "
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -983,7 +1225,7 @@
 "Klarstellung, dass die Freiheit, das Programm auszuführen, bedeutet, dass "
 "einen nichts davon abhält es auszuführen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
@@ -993,7 +1235,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\" hreflang=\"en\">Version 1.41</a>: "
 "Klarstellung, welcher Quellcode unter einer freien Lizenz stehen muss."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
@@ -1003,7 +1245,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\" hreflang=\"en\">Version 1.135</a>: "
 "Freiheit <em>0</em> ist die Freiheit, das Programm beliebig auszuführen. "
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
@@ -1013,7 +1255,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\" hreflang=\"en\">Version 1.134</a>: "
 "Freiheit <em>0</em> hat nichts mit der Zweckmäßigkeit des Programm zu tun."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
@@ -1024,7 +1266,7 @@
 "freie Lizenz darf nicht die Einhaltung einer unfreien Lizenz eines anderen "
 "Programms verlangen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1036,7 +1278,7 @@
 "Klarstellung, dass die Wahl des anwendbaren Rechts und des Gerichtsstandes "
 "zulässig sind. (Das war immer unser Grundsatz.)"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1049,7 +1291,7 @@
 "trivial ist&#160;&#8209;&#160;ein echtes Problem; andernfalls nur ein "
 "potenzielles Problem."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1062,7 +1304,7 @@
 "modifizieren zu dürfen, nicht darauf welche Modifizierungen vorgenommen "
 "wurden. Und Modifizierungen sind nicht auf „Verbesserungen“ beschränkt."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1077,7 +1319,7 @@
 "<em>Berechtigung</em> für die Nutzung des Werks dadurch einräumen, das Werk 
"
 "auf eine andere Weise parallel freizugeben."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1090,7 +1332,7 @@
 "(bereits in 1.80 erwähnt), dass man tatsächlich die eigene modifizierte "
 "Version für die eigene Datenverarbeitung nutzen darf."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
@@ -1100,7 +1342,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\" hreflang=\"en\">Version 1.92</a>: "
 "Klarstellung, dass sich verschleierter Code nicht als Quellcode qualifiziert."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1113,7 +1355,7 @@
 "eigenen modifizierten oder verbesserten Version zu distribuieren, nicht "
 "jedoch die Beteiligung an einem Entwicklungsprojekt bei Dritten."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -1124,7 +1366,7 @@
 "Freiheit <em>3</em> gewährt das Recht, modifizierte Versionen als Freie "
 "Software freizugeben."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
@@ -1135,7 +1377,7 @@
 "Freiheit <em>1</em> muss nicht nur theoretisch, sondern praktisch umsetzbar "
 "sein; d. h. keine Tivoisierung."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1147,7 +1389,7 @@
 "Klarstellung, dass alle nachträglichen Lizenzänderungen inakzeptabel sind, "
 "auch wenn nicht als vollständiger Ersatz beschrieben."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1159,7 +1401,7 @@
 "Klarstellungen von Punkten, die nicht explizit genug oder an einigen Stellen "
 "angegebenen sind, aber nicht überall reflektiert werden:"
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
@@ -1170,7 +1412,7 @@
 "Freiheit <em>3</em> enthält die Verbreitung modifizierter Versionen, nicht "
 "nur deren Änderungen."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
@@ -1178,15 +1420,15 @@
 "Das Recht, vorhandene Module zusammenzufügen, bezieht sich auf entsprechend "
 "lizenzierte Module."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr "Ausdrücklich die Schlussfolgerung des Punktes über Exportkontrolle."
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr "Einführung einer Lizenzänderung führt zur Aufhebung der alten 
Lizenz."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
@@ -1196,7 +1438,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\" hreflang=\"en\">Version 1.57</a>: "
 "Abschnitt <em>Jenseits von Software</em> hinzugefügt."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
@@ -1207,7 +1449,7 @@
 "Klarstellung des für die Freiheit bedeutsamen Ziels, das Programm für jeden 
"
 "Zweck auszuführen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
@@ -1217,7 +1459,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\" hreflang=\"en\">Version 1.41</a>: "
 "Klarstellung zum Wortlaut vertraglich geregelter Lizenzen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1229,7 +1471,7 @@
 "Erklärung, dass eine freie Lizenz erlauben muss, andere verfügbare Freie "
 "Software zu verwenden, um eigene Modifizierungen vorzunehmen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1242,7 +1484,7 @@
 "öffentliche Nutzung bereitgestellte Softwareversionen zur Verfügung zu "
 "stellen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1254,7 +1496,7 @@
 "akzeptabel, wenn eine Lizenz erfordert, sich als Autor von Modifikationen zu "
 "identifizieren sowie weitere geringfügige Klarstellungen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1264,7 +1506,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\" hreflang=\"en\">Version 1.23</a>: "
 "Potenzielle Probleme im Zusammenhang mit vertragsbasierten Lizenzen."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
@@ -1274,7 +1516,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\" hreflang=\"en\">Version 1.16</a>: "
 "Erklärung, warum der Vertrieb von Binärdateien wichtig ist."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1286,7 +1528,7 @@
 "Hinweis, dass eine freie Lizenz vorschreiben kann, auf Nachfrage früherer "
 "Entwickler eine Kopie der von Ihnen distribuierten Varianten zu übersenden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1304,11 +1546,11 @@
 "cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"
 "\" hreflang=\"en\">CVSweb-Oberfläche</a> zu finden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Fußnote"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1367,14 +1609,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Bei der Übersetzung dieses Werkes wurde mit größter Sorgfalt vorgegangen. "
@@ -1388,17 +1636,17 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2018-] {+2009-2019, 2021+}
-# | Free Software Foundation, Inc.
+# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2017-] {+2009-2021+} Free
+# | Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
-#| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2018 Free Software "
+#| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2017 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012-2018 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012-2017 Free Software "
 "Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1423,6 +1671,20 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#~ msgid "Open Source?"
+#~ msgstr "„Open Source“, offener Quellcode?"
+
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2018 Free Software "
+#~| "Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012-2018 Free "
+#~ "Software Foundation, Inc."
+
 #~ msgid ""
 #~ "The rest of this page clarifies certain points about what makes specific "
 #~ "freedoms adequate or not."
@@ -1445,13 +1707,6 @@
 #~ "Mitmenschen zu helfen <em>(Freiheit 2)</em>."
 
 #~ msgid ""
-#~ "Copyright &copy; 1996, 2002, 2004-2007, 2009-2017 Free Software "
-#~ "Foundation, Inc."
-#~ msgstr ""
-#~ "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012-2017 Free "
-#~ "Software Foundation, Inc."
-
-#~ msgid ""
 #~ "The freedom to run the program as you wish means that you are not "
 #~ "forbidden or stopped from doing so.  It has nothing to do with what "
 #~ "functionality the program has, or whether it is useful for what you want "

Index: free-sw.el.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.el.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- free-sw.el.po       27 May 2021 19:00:41 -0000      1.29
+++ free-sw.el.po       16 Jul 2021 10:02:23 -0000      1.30
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -22,7 +22,11 @@
 "Outdated-Since: 2008-12-09 14:49+0000\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation"
+# | What is [-free software?-] {+Free Software?+} - GNU Project - Free
+# | Software Foundation
+#, fuzzy
+#| msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Τι είναι το Ελεύθερο Λογισμικό; - Έργο GNU - 
Ίδρυμα Ελεύθερου Λογισμικού"
 
@@ -45,55 +49,14 @@
 "GNU, έτσι ώστε οι χρήστες υπολογιστών να 
έχουν την ελευθερία να "
 "διαμοιράζονται και να βελτιώνουν το 
λογισμικό που χρησιμοποιούν."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr "Τι είναι το Ελεύθερο Λογισμικό;"
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Ο Ορισμός του Ελεύθερου Λογισμικού"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-# | [-We maintain this-]{+The+} free software definition [-to show clearly
-# | what must be true about-] {+presents the criteria for whether+} a
-# | particular software program [-for-] {+qualifies as free software.  From
-# | time to time we revise this definition, to clarify+} it {+or+} to [-be
-# | considered-] {+resolve questions about subtle issues.  See the <a
-# | href=\"#History\">History section</a> below for a list of changes that
-# | affect the definition of+} free software.
+#. type: Content of: <div><h2>
+# | What is [-free software?-] {+Free Software?+}
 #, fuzzy
-#| msgid ""
-#| "We maintain this free software definition to show clearly what must be "
-#| "true about a particular software program for it to be considered free "
-#| "software."
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"Διατηρούμε τον όρο του ελεύθερου 
λογισμικού για να δείξουμε ξεκάθαρα τι "
-"πρέπει να ισχύει για ένα κομμάτι 
λογισμικού ώστε αυτό να θεωρείται 
ελεύθερο."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
+#| msgid "What is free software?"
+msgid "What is Free Software?"
+msgstr "Τι είναι το Ελεύθερο Λογισμικό;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 # | &ldquo;Free software&rdquo; {+means software that respects users' freedom
 # | and community.  Roughly, it means that <b>the users have the freedom to
 # | run, copy, distribute, study, change and improve the software</b>.  Thus,
@@ -123,7 +86,44 @@
 "free&rdquo; όπως ο &ldquo;ελεύθερος λόγος (free 
speech)&rdquo; και όχι η "
 "&ldquo;δωρεάν μπίρα (free beer)&rdquo;."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
+# | A free program must be available for commercial use, commercial
+# | development, and commercial distribution.  Commercial development of free
+# | software is no longer unusual; such free commercial software is very
+# | important.-]You may have paid money to get copies of {+a+} free
+# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
+# | But regardless of how you got your copies, you always have the freedom to
+# | copy and change the software, even to <a
+# | href=\"/philosophy/selling.html\">sell copies</a>.
+#, fuzzy
+#| msgid ""
+#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
+#| "free program must be available for commercial use, commercial "
+#| "development, and commercial distribution.  Commercial development of free "
+#| "software is no longer unusual; such free commercial software is very "
+#| "important.  You may have paid money to get copies of free software, or "
+#| "you may have obtained copies at no charge.  But regardless of how you got "
+#| "your copies, you always have the freedom to copy and change the software, "
+#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"&ldquo;Ελεύθερο λογισμικό&rdquo; δεν σημαίνει 
&ldquo;μη-εμπορικό&rdquo;. Ένα "
+"ελεύθερο πρόγραμμα θα πρέπει να είναι 
διαθέσιμο για εμπορική χρήση, εμπορική "
+"ανάπτυξη ή εμπορική διανομή. Η εμπορική 
ανάπτυξη του ελευθέρου λογισμικού "
+"δεν είναι ασυνήθιστη. Αντιθέτως, τέτοιου 
είδους ελεύθερο λογισμικό είναι "
+"πολύ σημαντικό να υπάρχει. Μπορεί να 
έχετε πληρώσει για να προμηθευτείτε "
+"κάποια αντίγραφα ελεύθερου λογισμικού, ή 
να έχετε προμηθευτεί τα αντίγραφα "
+"χωρίς κάποια οικονομική επιβάρυνση. 
Ανεξαρτήτως όμως από τον τρόπο "
+"προμήθειας, θα πρέπει πάντα να έχετε την 
ελευθερία να τροποποιείτε το "
+"λογισμικό, ακόμα και να <a 
href=\"/philosophy/selling.html\">πουλάτε "
+"αντίγραφα του</a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -134,11 +134,151 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Πίνακας περιεχομένων"
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "Ο Ορισμός του Ελεύθερου Λογισμικού"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | <a [-href=\"#contributor\" id=\"TOCcontributor\">Contributors</a>-]
+# | {+href=\"#exportcontrol\">Export regulations</a>+}
+#, fuzzy
+#| msgid "<a href=\"#contributor\" id=\"TOCcontributor\">Contributors</a>"
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr "<a href=\"#contributor\" id=\"TOCcontributor\">Συ
νεισφέροντες</a>"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Ο Ορισμός του Ελεύθερου Λογισμικού"
+
+#. type: Content of: <div><div><p>
+# | [-We maintain this-]{+The+} free software definition [-to show clearly
+# | what must be true about-] {+presents the criteria for whether+} a
+# | particular software program [-for-] {+qualifies as free software.  From
+# | time to time we revise this definition, to clarify+} it {+or+} to [-be
+# | considered-] {+resolve questions about subtle issues.  See the <a
+# | href=\"#History\">History section</a> below for a list of changes that
+# | affect the definition of+} free software.
+#, fuzzy
+#| msgid ""
+#| "We maintain this free software definition to show clearly what must be "
+#| "true about a particular software program for it to be considered free "
+#| "software."
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"Διατηρούμε τον όρο του ελεύθερου 
λογισμικού για να δείξουμε ξεκάθαρα τι "
+"πρέπει να ισχύει για ένα κομμάτι 
λογισμικού ώστε αυτό να θεωρείται 
ελεύθερο."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-Free software-]{+A program+} is [-a matter of the users' freedom to run,
 # | copy, distribute, study, change and improve the software.  More precisely,
 # | it refers to four kinds of freedom, for-] {+free software if+} the
@@ -157,7 +297,7 @@
 "αντιγράφουν, διανέμουν, μελετούν, 
τροποποιούν και βελτιώνουν το Ελεύθερο "
 "λογισμικό. Για την ακρίβεια, αναφέρεται σε 
τέσσερις βασικές ελευθερίες:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to run the [-program,-] {+program as you wish,+} for any
 # | purpose (freedom 0).
 #, fuzzy
@@ -168,7 +308,7 @@
 "Την ελευθερία να εκτελείτε το πρόγραμμα, 
για οποιονδήποτε σκοπό (ελευθερία "
 "0)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to study how the program works, and [-adapt-] {+change+} it
 # | [-to-] {+so it does+} your [-needs-] {+computing as you wish+} (freedom
 # | 1). Access to the source code is a precondition for this.
@@ -185,7 +325,7 @@
 "προσαρμόζετε στις ανάγκες σας (ελευθερία 
1). Η πρόσβαση στον πηγαίο κώδικα "
 "είναι προϋπόθεση για να ισχύει κάτι 
τέτοιο."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to redistribute copies so you can help [-your neighbor-]
 # | {+others+} (freedom 2).
 #, fuzzy
@@ -197,7 +337,7 @@
 "Την ελευθερία να αναδιανέμετε αντίγραφα 
του προγράμματος ώστε να βοηθάτε το "
 "συνάνθρωπο σας (ελευθερία 2)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 # | The freedom to [-improve the program, and release-] {+distribute copies
 # | of+} your [-improvements-] {+modified versions+} to [-the public, so
 # | that-] {+others (freedom 3).  By doing this you can give+} the whole
@@ -219,7 +359,7 @@
 "(ελευθερία 3). Η πρόσβαση στον πηγαίο 
κώδικα είναι προϋπόθεση για να ισχύει "
 "κάτι τέτοιο."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -227,7 +367,7 @@
 "free, we consider them all equally unethical."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -238,7 +378,11 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -247,7 +391,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -260,7 +404,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -268,7 +412,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -279,59 +423,22 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | [-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;. 
-# | A free program must be available for commercial use, commercial
-# | development, and commercial distribution.  Commercial development of free
-# | software is no longer unusual; such free commercial software is very
-# | important.-]You may have paid money to get copies of {+a+} free
-# | [-software,-] {+program,+} or you may have obtained copies at no charge. 
-# | But regardless of how you got your copies, you always have the freedom to
-# | copy and change the software, even to <a
-# | href=\"/philosophy/selling.html\">sell copies</a>.
-#, fuzzy
-#| msgid ""
-#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
-#| "free program must be available for commercial use, commercial "
-#| "development, and commercial distribution.  Commercial development of free "
-#| "software is no longer unusual; such free commercial software is very "
-#| "important.  You may have paid money to get copies of free software, or "
-#| "you may have obtained copies at no charge.  But regardless of how you got "
-#| "your copies, you always have the freedom to copy and change the software, "
-#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"&ldquo;Ελεύθερο λογισμικό&rdquo; δεν σημαίνει 
&ldquo;μη-εμπορικό&rdquo;. Ένα "
-"ελεύθερο πρόγραμμα θα πρέπει να είναι 
διαθέσιμο για εμπορική χρήση, εμπορική "
-"ανάπτυξη ή εμπορική διανομή. Η εμπορική 
ανάπτυξη του ελευθέρου λογισμικού "
-"δεν είναι ασυνήθιστη. Αντιθέτως, τέτοιου 
είδους ελεύθερο λογισμικό είναι "
-"πολύ σημαντικό να υπάρχει. Μπορεί να 
έχετε πληρώσει για να προμηθευτείτε "
-"κάποια αντίγραφα ελεύθερου λογισμικού, ή 
να έχετε προμηθευτεί τα αντίγραφα "
-"χωρίς κάποια οικονομική επιβάρυνση. 
Ανεξαρτήτως όμως από τον τρόπο "
-"προμήθειας, θα πρέπει πάντα να έχετε την 
ελευθερία να τροποποιείτε το "
-"λογισμικό, ακόμα και να <a 
href=\"/philosophy/selling.html\">πουλάτε "
-"αντίγραφα του</a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program means the freedom for any kind of person or "
 "organization to use it on any kind of computer system, for any kind of "
@@ -353,7 +460,7 @@
 "για τους δικούς του λόγους, δίχως να 
έχετε το δικαίωμα να του υποβάλετε "
 "δικές σας κυρώσεις."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -362,7 +469,7 @@
 "particular computing activity."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -373,18 +480,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for [-the-] freedoms {+1 and 3 (the freedom+} to make
 # | changes[-,-] and {+the freedom+} to publish [-improved versions,-] {+the
 # | changed versions)+} to be meaningful, you [-must-] {+need to+} have access
@@ -410,7 +517,7 @@
 "κώδικα του προγράμματος. Επομένως, η 
πρόσβαση στον πηγαίο κώδικα είναι "
 "απαραίτητη προϋπόθεση στο ελεύθερο 
λογισμικό."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -422,7 +529,7 @@
 "from is free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | One important way to modify a program is by merging in available free
 # | subroutines and modules.  If the program's license says that you cannot
 # | merge in [-an-] {+a suitably licensed+} existing module &mdash; for
@@ -451,25 +558,25 @@
 "περιοριστική ώστε να μπορεί να θεωρηθεί 
ελεύθερη (δηλαδή άδεια ελεύθερου "
 "λογισμικού)."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
 "else considers an improvement, that program is not free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-A program is free software if users have all of these freedoms. 
 # | Thus,-]{+Freedom to distribute (freedoms 2 and 3) means+} you [-should
 # | be-] {+are+} free to redistribute copies, either with or without
@@ -500,7 +607,7 @@
 "πως δεν χρειάζεται να ζητήσετε εξου
σιοδότηση ή να πληρώσετε κάποιον ώστε να "
 "λάβετε τη ανάλογη άδεια."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -512,16 +619,16 @@
 "να το αναφέρετε. Αν δημοσιεύσετε τις 
αλλαγές σας, δεν είστε υποχρεωμένοι να "
 "ειδοποιήσετε κάποιο συγκεκριμένο άτομο."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -541,18 +648,19 @@
 "έχετε την ελευθερία να αναδιανέμετε 
τέτοιες μορφές σε περίπτωση που "
 "αναπτύξετε ή βρείτε κάποιο δικό σας τρόπο 
να τις δημιουργήσετε)."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-However, certain-]{+Certain+} kinds of rules about the manner of
 # | distributing free software are acceptable, when they don't conflict with
 # | the central freedoms.  For example, <a
-# | href=\"/copyleft/copyleft.html\">copyleft</a> (very simply stated) is the
-# | rule that when redistributing the program, you cannot add restrictions to
-# | deny other people the central freedoms.  This rule does not conflict with
-# | the central freedoms; rather it protects them.
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
 #, fuzzy
 #| msgid ""
 #| "However, certain kinds of rules about the manner of distributing free "
@@ -565,7 +673,7 @@
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -578,7 +686,7 @@
 "τέσσερις βασικές ελευθερίες. Αυτός ο 
κανόνας δεν συγκρούεται με τις βασικές "
 "ελευθερίες, αλλά τις προστατεύει."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In the GNU project, we use  [-&ldquo;<a
 # | href=\"/copyleft/copyleft.html\">copyleft</a>&rdquo;-] {+copyleft+} to
 # | protect [-these-] {+the four+} freedoms legally for everyone.  [-But  <a
@@ -628,11 +736,11 @@
 "χρησιμοποιεί την άδεια αντιγραφής&rdquo; 
καθώς και άλλων κατηγοριών "
 "λογισμικού."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Rules about how to package a modified version are acceptable, if they
 # | don't substantively [-block-] {+limit+} your freedom to release modified
 # | versions, or your freedom to make and use modified versions privately. 
@@ -689,7 +797,7 @@
 "κατασκευαστής ζητήσει αντίγραφο του, θα 
πρέπει να του αποστείλετε ένα, ή να "
 "δηλώσετε τον εαυτό σας στις μετατροπές που
 κάνατε."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -701,7 +809,7 @@
 "use are also acceptable."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -711,20 +819,21 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr ""
 
-#. type: Content of: <div><p>
-# | Sometimes government <a id=\"exportcontrol\">export control
-# | regulations</a> and trade sanctions can constrain your freedom to
-# | distribute copies of programs internationally.  Software developers do not
-# | have the power to eliminate or override these restrictions, but what they
-# | can and must do is refuse to impose them as conditions of use of the
-# | program.  In this way, the restrictions will not affect activities and
-# | people outside the jurisdictions of these governments.  {+Thus, free
-# | software licenses must not require obedience to any nontrivial export
-# | regulations as a condition of exercising any of the essential freedoms.+}
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  {+Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.+}
 #, fuzzy
 #| msgid ""
 #| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
@@ -735,15 +844,15 @@
 #| "way, the restrictions will not affect activities and people outside the "
 #| "jurisdictions of these governments."
 msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "Πολλές φορές κρατικοί <a id=\"exportcontrol\"> 
κανονισμοί έλεγχου εξαγωγών</"
 "a> και εμπορικά σωματεία (trade sanctions) μπορούν 
να περιορίσουν την "
@@ -754,7 +863,7 @@
 "περιορισμοί δεν θα επηρεάσουν 
δραστηριότητες και ανθρώπους εκτός της "
 "δικαιοδοσίας αυτών των κυβερνήσεων."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -764,11 +873,11 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In order for these freedoms to be real, they must be {+permanent and+}
 # | irrevocable as long as you do nothing wrong; if the developer of the
 # | software has the power to revoke the license, {+or retroactively add
@@ -791,7 +900,7 @@
 "λάθος. Αν ο προγραμματιστής του 
λογισμικού ανακαλέσει την άδεια, χωρίς να "
 "έχετε δώσει εσείς την αφορμή τότε το 
λογισμικό δεν θεωρείται ελεύθερο."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -800,17 +909,17 @@
 "of those nonfree programs; that makes the license nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -832,7 +941,7 @@
 "τους οποίους μία τέτοια άδεια μπορεί να 
είναι απαράδεκτα περιοριστική και "
 "ανελεύθερη."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -845,68 +954,54 @@
 "δικαιώματα αδυνατούν, και ο οποίος δεν 
αναφέρεται εδώ ως νόμιμος, θα πρέπει "
 "να το σκεφτούμε και πιθανότατα θα 
αποφασίσουμε πως είναι ανελεύθερη."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr ""
-
-#. type: Content of: <div><p>
-# | When talking about free software, it is best to avoid using terms like
-# | &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms
-# | imply that the issue is about price, not freedom.  Some common terms such
-# | as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a
-# | href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that
-# | are Worth Avoiding</a> for a discussion of these terms.  We also have a
-# | list of {+proper+} <a
-# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
-# | software&rdquo;</a> into various languages.
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
 #, fuzzy
-#| msgid ""
-#| "When talking about free software, it is best to avoid using terms like "
-#| "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
-#| "imply that the issue is about price, not freedom.  Some common terms such "
-#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See  "
-#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
-#| "that are Worth Avoiding</a> for a discussion of these terms.  We also "
-#| "have a list of <a href=\"/philosophy/fs-translations.html\">translations "
-#| "of &ldquo;free software&rdquo;</a> into various languages."
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Όταν μιλάμε για το ελεύθερο λογισμικό, 
είναι καλό να αποφεύγουμε όρους όπως "
-"&ldquo;το δίνει έτσι (give away)&rdquo; ή &ldquo;δωρεάν 
(for free),&rdquo; "
-"διότι αυτοί υπονοούν ότι το θέμα είναι το 
κόστος και όχι η ελευθερία. "
-"Κάποιοι δημοφιλείς όροι όπως 
&ldquo;πειρατεία&rdquo; ενσωματώνουν απόψεις "
-"που ελπίζουμε πως δεν θα ασπαστείτε. Δείτε 
το άρθρο <a href=\"/philosophy/"
-"words-to-avoid.html\">Λέξεις που προκαλούν σύγχυση 
και πρέπει να "
-"αποφεύγονται</a> για μία συζήτηση σχετικά 
με αυτούς τους όρους. Έχουμε "
-"επίσης και μία λίστα <a 
href=\"/philosophy/fs-translations.html"
-"\">μεταφράσεων του όρου &ldquo;ελεύθερο 
λογισμικό&rdquo;</a> σε διάφορες "
-"γλώσσες."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Ο Ορισμός του Ελεύθερου Λογισμικού"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Τέλος, αξίζει να σημειωθεί πως κριτήρια 
σαν και αυτά που υπάρχουν στον "
 "ορισμό του ελεύθερου λογισμικού απαιτούν 
προσεκτική σκέψη για την ερμηνεία "
@@ -920,11 +1015,11 @@
 "συμπέρασμα για ένα καινούργιο θέμα, συχνά 
ανανεώνουμε αυτά τα κριτήρια για "
 "να είναι πιο εύκολο να δούμε εάν συ
γκεκριμένες άδειες είναι δεκτές ή όχι."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -938,7 +1033,7 @@
 "στην λίστα, μπορείτε να μας ρωτήσετε 
στέλνοντας ηλεκτρονική αλληλογραφία στο "
 "<a href=\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</a>"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | If you are contemplating writing a new license, please contact the [-FSF-]
 # | {+Free Software Foundation first+} by writing to that address. The
 # | proliferation of different free software licenses means increased work for
@@ -964,7 +1059,7 @@
 "χρηστών στην κατανόηση τους. Ίσως τελικά 
σας βοηθήσουμε να βρείτε μία "
 "υπάρχουσα άδεια Ελεύθερου Λογισμικού που 
ανταποκρίνεται στις ανάγκες σας."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
@@ -974,11 +1069,87 @@
 "μας μπορείτε να εξασφαλίσετε ότι αυτή η 
άδεια είναι πράγματι άδεια ελεύθερου "
 "λογισμικού και να αποφύγετε διάφορα 
πρακτικά προβλήματα."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+# | When talking about free software, it is best to avoid using terms like
+# | &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms
+# | imply that the issue is about price, not freedom.  Some common terms such
+# | as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a
+# | href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that
+# | are Worth Avoiding</a> for a discussion of these terms.  We also have a
+# | list of {+proper+} <a
+# | href=\"/philosophy/fs-translations.html\">translations of &ldquo;free
+# | software&rdquo;</a> into various languages.
+#, fuzzy
+#| msgid ""
+#| "When talking about free software, it is best to avoid using terms like "
+#| "&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
+#| "imply that the issue is about price, not freedom.  Some common terms such "
+#| "as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See  "
+#| "<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases "
+#| "that are Worth Avoiding</a> for a discussion of these terms.  We also "
+#| "have a list of <a href=\"/philosophy/fs-translations.html\">translations "
+#| "of &ldquo;free software&rdquo;</a> into various languages."
+msgid ""
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
+msgstr ""
+"Όταν μιλάμε για το ελεύθερο λογισμικό, 
είναι καλό να αποφεύγουμε όρους όπως "
+"&ldquo;το δίνει έτσι (give away)&rdquo; ή &ldquo;δωρεάν 
(for free),&rdquo; "
+"διότι αυτοί υπονοούν ότι το θέμα είναι το 
κόστος και όχι η ελευθερία. "
+"Κάποιοι δημοφιλείς όροι όπως 
&ldquo;πειρατεία&rdquo; ενσωματώνουν απόψεις "
+"που ελπίζουμε πως δεν θα ασπαστείτε. Δείτε 
το άρθρο <a href=\"/philosophy/"
+"words-to-avoid.html\">Λέξεις που προκαλούν σύγχυση 
και πρέπει να "
+"αποφεύγονται</a> για μία συζήτηση σχετικά 
με αυτούς τους όρους. Έχουμε "
+"επίσης και μία λίστα <a 
href=\"/philosophy/fs-translations.html"
+"\">μεταφράσεων του όρου &ldquo;ελεύθερο 
λογισμικό&rdquo;</a> σε διάφορες "
+"γλώσσες."
+
+#. type: Content of: <div><div><p>
+# | Another group [-has started using-] {+uses+} the term &ldquo;open
+# | source&rdquo; to mean something close (but not identical) to &ldquo;free
+# | software&rdquo;.  We prefer the term &ldquo;free software&rdquo; because,
+# | once you have heard that it refers to freedom rather than price, it calls
+# | to mind freedom.  The word &ldquo;open&rdquo; [-<a
+# | href=\"/philosophy/open-source-misses-the-point.html\">-] never refers to
+# | [-freedom</a>.-] {+freedom.+}
+#, fuzzy
+#| msgid ""
+#| "Another group has started using the term &ldquo;open source&rdquo; to "
+#| "mean something close (but not identical) to &ldquo;free software&rdquo;.  "
+#| "We prefer the term &ldquo;free software&rdquo; because, once you have "
+#| "heard that it refers to freedom rather than price, it calls to mind "
+#| "freedom.  The word &ldquo;open&rdquo; <a href=\"/philosophy/open-source-"
+#| "misses-the-point.html\"> never refers to freedom</a>."
+msgid ""
+"Another group uses the term &ldquo;open source&rdquo; to mean something "
+"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+"term &ldquo;free software&rdquo; because, once you have heard that it refers "
+"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
+"open&rdquo; never refers to freedom."
+msgstr ""
+"Μία άλλη ομάδα έχει αρχίσει να 
χρησιμοποιεί τον όρο &ldquo;ανοιχτός κώδικας 
"
+"(open source)&rdquo; για να επισημάνει κάτι 
παραπλήσιο (αλλά όχι ίδιο) με το "
+"&ldquo;ελεύθερο λογισμικό (free software).&rdquo; Π
ροτιμούμε τον όρο &ldquo;"
+"ελεύθερο λογισμικό (free software)&rdquo; διότι, 
μόλις ακούσεις ότι "
+"αναφέρεται στην ελευθερία και όχι στο 
κόστος, φέρνει στο νου την ελευθερία. "
+"Η λέξη &ldquo;ανοιχτός&rdquo; <a 
href=\"/philosophy/open-source-misses-the-"
+"point.html\">αδυνατεί να αναφερθεί στην ελευ
θερία</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Πέρα από το λογισμικό"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
 "the same reasons that software must be free, and because the manuals are in "
@@ -989,11 +1160,21 @@
 "είναι και το λογισμικό, και επιπρόσθετα 
επειδή αποτελούν αναπόσπαστο κομμάτι "
 "του λογισμικού."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | The same arguments also make sense for other kinds of works of practical
+# | use &mdash; that is to say, works that embody useful knowledge, such as
+# | educational works and reference works.  <a
+# | href=\"http{+s+}://wikipedia.org\">Wikipedia</a> is the best-known example.
+#, fuzzy
+#| msgid ""
+#| "The same arguments also make sense for other kinds of works of practical "
+#| "use &mdash; that is to say, works that embody useful knowledge, such as "
+#| "educational works and reference works.  <a href=\"http://wikipedia.org";
+#| "\">Wikipedia</a> is the best-known example."
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 "Οι ίδιες απόψεις έχουν νόημα και για 
άλλα είδη εργασίας που έχουν πρακτική "
@@ -1001,7 +1182,7 @@
 "επιμορφωτικές και επιστημονικές 
εργασίες. Η <a href=\"http://el.wikipedia.org";
 "\">Βικιπαίδεια</a> είναι το πιο δημοφιλές 
παράδειγμα."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Any kind of work <em>can</em> be free, and the definition of free software "
 "has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
@@ -1013,52 +1194,16 @@
 "μπορεί να εφαρμοστεί σε όλα τα είδη 
εργασίας."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Ανοιχτός Κώδικας;"
-
-#. type: Content of: <div><p>
-# | Another group [-has started using-] {+uses+} the term &ldquo;open
-# | source&rdquo; to mean something close (but not identical) to &ldquo;free
-# | software&rdquo;.  We prefer the term &ldquo;free software&rdquo; because,
-# | once you have heard that it refers to freedom rather than price, it calls
-# | to mind freedom.  The word &ldquo;open&rdquo; <a
-# | href=\"/philosophy/open-source-misses-the-point.html\"> never refers to
-# | freedom</a>.
-#, fuzzy
-#| msgid ""
-#| "Another group has started using the term &ldquo;open source&rdquo; to "
-#| "mean something close (but not identical) to &ldquo;free software&rdquo;.  "
-#| "We prefer the term &ldquo;free software&rdquo; because, once you have "
-#| "heard that it refers to freedom rather than price, it calls to mind "
-#| "freedom.  The word &ldquo;open&rdquo; <a href=\"/philosophy/open-source-"
-#| "misses-the-point.html\"> never refers to freedom</a>."
-msgid ""
-"Another group uses the term &ldquo;open source&rdquo; to mean something "
-"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
-"term &ldquo;free software&rdquo; because, once you have heard that it refers "
-"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
-msgstr ""
-"Μία άλλη ομάδα έχει αρχίσει να 
χρησιμοποιεί τον όρο &ldquo;ανοιχτός κώδικας 
"
-"(open source)&rdquo; για να επισημάνει κάτι 
παραπλήσιο (αλλά όχι ίδιο) με το "
-"&ldquo;ελεύθερο λογισμικό (free software).&rdquo; Π
ροτιμούμε τον όρο &ldquo;"
-"ελεύθερο λογισμικό (free software)&rdquo; διότι, 
μόλις ακούσεις ότι "
-"αναφέρεται στην ελευθερία και όχι στο 
κόστος, φέρνει στο νου την ελευθερία. "
-"Η λέξη &ldquo;ανοιχτός&rdquo; <a 
href=\"/philosophy/open-source-misses-the-"
-"point.html\">αδυνατεί να αναφερθεί στην ελευ
θερία</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -1067,7 +1212,7 @@
 "delete it, so there is no need to state those as separate requirements."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -1075,42 +1220,42 @@
 "1 and 3 enable users to remove them."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
 "to run the program means nothing stops you from making it run."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
 "needs to be free."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
 "freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
 "matter of the program's functionality."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
 "not require compliance with a nonfree license of another program."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1118,7 +1263,7 @@
 "was always our policy.)"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1126,7 +1271,7 @@
 "is only a potential problem."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1134,7 +1279,7 @@
 "made.  And modifications are not limited to &ldquo;improvements&rdquo;"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1143,7 +1288,7 @@
 "the work by releasing the work in another way in parallel."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1151,14 +1296,14 @@
 "that it includes really using your modified version for your computing."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
 "code does not qualify as source code."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1166,21 +1311,21 @@
 "version, not a right to participate in someone else's development project."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
 "right to release modified versions as free software."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
 "practical, not just theoretical; i.e., no tivoization."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1188,7 +1333,7 @@
 "described as a complete replacement."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1196,49 +1341,49 @@
 "everywhere:"
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
 "modified versions, not just changes."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
 "Software&quot; section."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
 "is significant in the freedom to run the program for any purpose."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
 "contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1246,7 +1391,7 @@
 "modifications."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1254,7 +1399,7 @@
 "the software you put into public use."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1262,21 +1407,21 @@
 "of modifications.  Other minor clarifications throughout the text."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
 "problems related to contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
 "distribution of binaries is important."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1284,7 +1429,7 @@
 "previous developers on request."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1296,14 +1441,14 @@
 msgstr ""
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | Footnote[-s-]
 #, fuzzy
 #| msgid "Footnotes"
 msgid "Footnote"
 msgstr "Υποσημειώσεις"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1331,6 +1476,7 @@
 "άλλες διορθώσεις ή προτάσεις μπορούν να 
σταλούν στο <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1338,14 +1484,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Εργαζόμαστε σκληρά και κάνουμε ό,τι 
καλύτερο μπορούμε για να παρέχουμε "
@@ -1358,12 +1510,12 @@
 
 #. type: Content of: <div><p>
 # | Copyright &copy; [-1996-2002, 2004-2007-] {+1996, 2002, 2004-2007,
-# | 2009-2019, 2021+} Free Software Foundation, Inc.
+# | 2009-2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid "Copyright &copy; 1996-2002, 2004-2007 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Πνευματικά δικαιώματα:<br />\n"
 "Copyright &copy; 1996-2002, 2004-2007 Free Software Foundation, Inc. (Ίδρυ
μα "
@@ -1393,3 +1545,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ενημερώθηκε:"
+
+#~ msgid "Open Source?"
+#~ msgstr "Ανοιχτός Κώδικας;"

Index: free-sw.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.es.po,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- free-sw.es.po       30 Apr 2021 09:12:12 -0000      1.144
+++ free-sw.es.po       16 Jul 2021 10:02:23 -0000      1.145
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.es.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: \n"
@@ -20,11 +20,16 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-16 09:55+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation"
+# | What is [-free software?-] {+Free Software?+} - GNU Project - Free
+# | Software Foundation
+#, fuzzy
+#| msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr "¿Qué es el software libre? - Proyecto GNU - Free Software Foundation"
 
 # type: Attribute 'content' of: <meta>
@@ -48,60 +53,15 @@
 "compartir y mejorar el software que usan."
 
 # type: Attribute 'title' of: <link>
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+# | What is [-free software?-] {+Free Software?+}
+#, fuzzy
+#| msgid "What is free software?"
+msgid "What is Free Software?"
 msgstr "¿Qué es el software libre?"
 
-# type: Content of: <h2>
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definición de software libre"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-"¿Tiene alguna pregunta acerca de las licencias de software libre que no 
esté "
-"respondida aquí? Consulte nuestra otra <a 
href=\"http://www.fsf.org/licensing";
-"\">información sobre licencias</a>, y si es necesario contacte con el "
-"Compliance Lab de la FSF en <a href=\"mailto:licensing@fsf.org";
-"\">licensing@fsf.org</a>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"La definición de software libre estipula los criterios que se tienen que "
-"cumplir para que un programa sea considerado libre. De vez en cuando "
-"modificamos esta definición para clarificarla o para resolver problemas "
-"sobre cuestiones delicadas. Más abajo en esta página, en la sección <a 
href="
-"\"#History\">Historial</a>, se puede consultar la lista de modificaciones "
-"que afectan la definición de software libre."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
-"El «Open source» (Código abierto) es algo distinto: su filosofía es "
-"diferente y está basada en otros valores. Su definición práctica también 
es "
-"diferente, pero de hecho casi todos los programas de código abierto son "
-"libres. Explicamos la diferencia <a href=\"/philosophy/open-source-misses-"
-"the-point.html\">aquí</a>."
-
-# type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; means software that respects users' freedom and "
 "community.  Roughly, it means that <b>the users have the freedom to run, "
@@ -122,7 +82,20 @@
 "español, derivado de «libertad», para mostrar que no queremos decir que el 
"
 "software es gratuito."
 
-#. type: Content of: <div><p>
+# type: Content of: <p>
+#. type: Content of: <div><div><div><p>
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"Puede haber pagado dinero para obtener copias de un programa libre, o puede "
+"haber obtenido copias sin costo. Pero con independencia de cómo obtuvo sus "
+"copias, siempre tiene la libertad de copiar y modificar el software, incluso "
+"de <a href=\"/philosophy/selling.html\">vender copias</a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -141,11 +114,194 @@
 "href=\"/philosophy/free-software-even-more-important.html\">un instrumento "
 "de poder injusto</a>."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+"El «Open source» (Código abierto) es algo distinto: su filosofía es "
+"diferente y está basada en otros valores. Su definición práctica también 
es "
+"diferente, pero de hecho casi todos los programas de código abierto son "
+"libres. Explicamos la diferencia <a href=\"/philosophy/open-source-misses-"
+"the-point.html\">aquí</a>."
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Índice general"
+
+# type: Content of: <h2>
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "Definición de software libre"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#four-freedoms\">The+} four essential [-freedoms-]
+# | {+freedoms</a>+}
+#, fuzzy
+#| msgid "The four essential freedoms"
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr "Las cuatro libertades esenciales"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-Clarifying-]{+<a href=\"#clarifying\">Clarifying+} the [-boundary
+# | between free-] {+Boundary Between Free+} and [-nonfree-] {+Nonfree</a>+}
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr "Delimitación de la frontera entre software libre y software privativo"
+
+# type: Content of: <ul><li>
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#run-the-program\">The+} freedom to run the program as
+# | you [-wish-] {+wish</a>+}
+#, fuzzy
+#| msgid "The freedom to run the program as you wish"
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr "La libertad de ejecutar el programa como se desee"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#make-changes\">The+} freedom to study the source code
+# | and make [-changes-] {+changes</a>+}
+#, fuzzy
+#| msgid "The freedom to study the source code and make changes"
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr "La libertad de estudiar el código fuente y modificarlo"
+
+# type: Content of: <ul><li>
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#redistribute\">The+} freedom to redistribute if you
+# | wish: basic [-requirements-] {+requirements</a>+}
+#, fuzzy
+#| msgid "The freedom to redistribute if you wish: basic requirements"
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr "La libertad de redistribuir copias si así lo desea: requisitos 
básicos"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Rules-]{+<a href=\"#packaging\">Rules+} about packaging and distribution
+# | [-details-] {+details</a>+}
+#, fuzzy
+#| msgid "Rules about packaging and distribution details"
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr "Reglas acerca del empaquetamiento y la distribución"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Contract-based licenses-]{+<a href=\"#contracts\">Contract-based
+# | licenses</a>+}
+#, fuzzy
+#| msgid "Contract-based licenses"
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr "Licencias basadas en contrato"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-How-]{+<a href=\"#interpretation\">How+} we interpret these [-criteria-]
+# | {+criteria</a>+}
+#, fuzzy
+#| msgid "How we interpret these criteria"
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr "Cómo entendemos estos criterios"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Get-]{+<a href=\"#get-help\">Get+} help with free [-licenses-]
+# | {+licenses</a>+}
+#, fuzzy
+#| msgid "Get help with free licenses"
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr "Cómo obtener ayuda acerca de licencias libres"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Use-]{+<a href=\"#terminology\">Use+} the right words when talking about
+# | free [-software-] {+software</a>+}
+#, fuzzy
+#| msgid "Use the right words when talking about free software"
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr "Cuando hable del software libre, emplee los términos adecuados"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+"¿Tiene alguna pregunta acerca de las licencias de software libre que no 
esté "
+"respondida aquí? Consulte nuestra otra <a 
href=\"http://www.fsf.org/licensing";
+"\">información sobre licencias</a>, y si es necesario contacte con el "
+"Compliance Lab de la FSF en <a href=\"mailto:licensing@fsf.org";
+"\">licensing@fsf.org</a>."
+
+# type: Content of: <h2>
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Definición de software libre"
+
+# type: Content of: <p>
+#. type: Content of: <div><div><p>
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"La definición de software libre estipula los criterios que se tienen que "
+"cumplir para que un programa sea considerado libre. De vez en cuando "
+"modificamos esta definición para clarificarla o para resolver problemas "
+"sobre cuestiones delicadas. Más abajo en esta página, en la sección <a 
href="
+"\"#History\">Historial</a>, se puede consultar la lista de modificaciones "
+"que afectan la definición de software libre."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "Las cuatro libertades esenciales"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if the program's users have the four essential "
 "freedoms: <a href=\"#f1\">[1]</a>"
@@ -154,7 +310,7 @@
 "esenciales: <a href=\"#f1\">[1]</a>"
 
 # type: Content of: <ul><li>
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr ""
@@ -162,7 +318,7 @@
 "(libertad 0)."
 
 # type: Content of: <ul><li>
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to study how the program works, and change it so it does your "
 "computing as you wish (freedom 1). Access to the source code is a "
@@ -173,12 +329,12 @@
 "necesaria para ello."
 
 # type: Content of: <ul><li>
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "The freedom to redistribute copies so you can help others (freedom 2)."
 msgstr "La libertad de redistribuir copias para ayudar a otros (libertad 2)."
 
 # type: Content of: <ul><li>
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to distribute copies of your modified versions to others "
 "(freedom 3).  By doing this you can give the whole community a chance to "
@@ -190,7 +346,7 @@
 "beneficiarse de las modificaciones. El acceso al código fuente es una "
 "condición necesaria para ello."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -203,7 +359,7 @@
 "en base a cuánto les falta para llegar a ser libres, nosotros los "
 "consideramos contrarios a la ética a todos por igual."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -221,7 +377,11 @@
 "como B son libres. No obstante, si se piensa modificar A para que no haga "
 "uso de B, solo A debe ser libre; B no es relevante en este caso."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -234,7 +394,7 @@
 "y la distribución comercial. Esto es de fundamental importancia, sin ello el 
"
 "software libre no podría alcanzar sus objetivos."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -256,7 +416,7 @@
 "ese software libre comercial es muy importante. El respaldo profesional, "
 "remunerado, al software libre satisface una importante necesidad."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -269,7 +429,7 @@
 "una licencia que contenga tales restricciones no puede considerarse software "
 "libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -287,24 +447,15 @@
 "ejercerlos, equivale a no garantizarles las libertades en cuestión, lo que "
 "hace que el programa no sea libre."
 
-# type: Content of: <p>
-#. type: Content of: <div><p>
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"Puede haber pagado dinero para obtener copias de un programa libre, o puede "
-"haber obtenido copias sin costo. Pero con independencia de cómo obtuvo sus "
-"copias, siempre tiene la libertad de copiar y modificar el software, incluso "
-"de <a href=\"/philosophy/selling.html\">vender copias</a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+# | Clarifying the [-boundary between free-] {+Boundary Between Free+} and
+# | [-n-]{+N+}onfree
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr "Delimitación de la frontera entre software libre y software privativo"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
@@ -315,12 +466,12 @@
 "libre."
 
 # type: Content of: <ul><li>
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "La libertad de ejecutar el programa como se desee"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program means the freedom for any kind of person or "
 "organization to use it on any kind of computer system, for any kind of "
@@ -342,7 +493,7 @@
 "lo que necesite; usted no tiene el derecho de imponerle sus propios "
 "objetivos a la otra persona."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -356,7 +507,7 @@
 "técnica de funcionar en un entorno dado, ni con el hecho de que el programa "
 "sea o no sea útil con relación a una operación computacional determinada."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -375,7 +526,7 @@
 "y distribuir versiones modificadas en las que se haya eliminado el código "
 "problemático."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
@@ -385,12 +536,12 @@
 "desea. De modo que no hay necesidad de añadir una «libertad de no ejecutar "
 "el programa»."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "La libertad de estudiar el código fuente y modificarlo"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In order for freedoms 1 and 3 (the freedom to make changes and the freedom "
 "to publish the changed versions) to be meaningful, you need to have access "
@@ -405,7 +556,7 @@
 "fuente real y no cuenta como código fuente."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -426,7 +577,7 @@
 "compilado a partir de un código fuente libre."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One important way to modify a program is by merging in available free "
 "subroutines and modules.  If the program's license says that you cannot "
@@ -442,7 +593,7 @@
 "restrictiva como para considerarla libre."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
@@ -452,7 +603,7 @@
 "su derecho a modificar un programa se limita, básicamente, a modificaciones "
 "que alguna otra persona considera una mejora, el programa no es libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
@@ -464,12 +615,12 @@
 "eliminar el programa»."
 
 # type: Content of: <ul><li>
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "La libertad de redistribuir copias si así lo desea: requisitos 
básicos"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
 "copies, either with or without modifications, either gratis or charging a "
@@ -485,7 +636,7 @@
 "permiso para hacerlo."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -498,11 +649,25 @@
 "particular, ni de ninguna manera en particular."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Freedom 3 includes the freedom to release your modified versions as free
+# | software.  A free license may also permit other ways of releasing them; in
+# | other words, it does not have to be a <a
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} license.  However, a
+# | license that requires modified versions to be nonfree does not qualify as
+# | a free license.
+#, fuzzy
+#| msgid ""
+#| "Freedom 3 includes the freedom to release your modified versions as free "
+#| "software.  A free license may also permit other ways of releasing them; "
+#| "in other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+#| "\">copyleft</a> license.  However, a license that requires modified "
+#| "versions to be nonfree does not qualify as a free license."
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
@@ -514,7 +679,7 @@
 "considerar libre."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -534,16 +699,31 @@
 "libertad de redistribuir dichos formatos si encontrara o programara una "
 "forma de hacerlo."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "Copyleft"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Certain kinds of rules about the manner of distributing free software are
+# | acceptable, when they don't conflict with the central freedoms.  For
+# | example, <a [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
+#, fuzzy
+#| msgid ""
+#| "Certain kinds of rules about the manner of distributing free software are "
+#| "acceptable, when they don't conflict with the central freedoms.  For "
+#| "example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+#| "stated) is the rule that when redistributing the program, you cannot add "
+#| "restrictions to deny other people the central freedoms.  This rule does "
+#| "not conflict with the central freedoms; rather it protects them."
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -557,7 +737,7 @@
 "principales, más bien las protege."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the GNU project, we use copyleft to protect the four freedoms legally for "
 "everyone.  We believe there are important reasons why <a href=\"/philosophy/"
@@ -577,12 +757,12 @@
 "software libre</a> una descripción de la relación que existe entre el "
 "«software libre», «software con copyleft» y otros tipos de software."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Reglas acerca del empaquetamiento y la distribución"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules about how to package a modified version are acceptable, if they don't "
 "substantively limit your freedom to release modified versions, or your "
@@ -604,7 +784,7 @@
 "le supondrá un problema hacer algunas más."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -624,7 +804,7 @@
 "versión). Las reglas que obligan a suministrar el código fuente a los "
 "usuarios de las versiones publicadas también son admisibles."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -641,22 +821,43 @@
 "instrumento adecuado para la asignación de alias que permita especificar el "
 "nombre del programa original como un alias de la versión modificada."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Normas de exportación"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
-msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any nontrivial export regulations as a condition "
+#| "of exercising any of the essential freedoms."
+msgid ""
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "En algunos casos las <a id=\"exportcontrol\">normas de control de "
 "exportación</a> y las sanciones comerciales impuestas por el Gobierno pueden 
"
@@ -670,7 +871,7 @@
 "exportación que no sea trivial como condición para ejercer cualquiera de 
las "
 "libertades esenciales."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -687,12 +888,12 @@
 "podría hacer que el requisito dejara de ser trivial y que el software dejara 
"
 "de ser libre."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Consideraciones legales"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In order for these freedoms to be real, they must be permanent and "
 "irrevocable as long as you do nothing wrong; if the developer of the "
@@ -706,7 +907,7 @@
 "condiciones de uso en forma retroactiva, sin que haya habido ninguna acción "
 "de parte del usuario que lo justifique, el software no es libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -721,7 +922,7 @@
 "cumplir con las licencias de esos programas privativos, lo cual hace que la "
 "licencia no sea libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
@@ -729,12 +930,12 @@
 "Es aceptable que una licencia especifique la jurisdicción de competencia o "
 "la sede para la resolución de conflictos, o ambas cosas."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Licencias basadas en contrato"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -756,7 +957,7 @@
 "de que tal licencia sea inaceptablemente restrictiva y que no sea libre."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -769,49 +970,56 @@
 "no está mencionado aquí como legítimo, tendremos que analizar el caso, y "
 "probablemente concluyamos que no es libre."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Cuando hable del software libre, emplee los términos adecuados"
-
-# type: Content of: <p>
-#. type: Content of: <div><p>
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Cuando se habla de software libre, es mejor evitar usar términos como "
-"«regalar» o «gratuito», porque dichos términos implican que el asunto es 
el "
-"precio, no la libertad. Algunos términos comunes como «piratería» 
implican "
-"opiniones con las que esperamos no concuerde. Véase un análisis sobre el 
uso "
-"de esos términos en nuestro artículo <a href=\"/philosophy/words-to-avoid."
-"html\">palabras y frases confusas que vale la pena evitar</a>. También "
-"tenemos una lista de las <a href=\"/philosophy/fs-translations.html"
-"\">traducciones correctas de «software libre»</a> a varios idiomas."
+# type: Content of: <h2>
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Definición de software libre"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Cómo entendemos estos criterios"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Por último, tenga en cuenta que para interpretar criterios tales como los "
 "que se establecen en esta definición de software libre, se hace necesario un 
"
@@ -827,12 +1035,12 @@
 "criterios para que resulte más fácil ver por qué una cierta licencia puede 
o "
 "no ser calificada como libre."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Cómo obtener ayuda acerca de licencias libres"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -847,7 +1055,7 @@
 "\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</a>."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are contemplating writing a new license, please contact the Free "
 "Software Foundation first by writing to that address. The proliferation of "
@@ -862,7 +1070,7 @@
 "ya exista y que satisfaga sus necesidades."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
@@ -872,13 +1080,69 @@
 "nuestra ayuda puede asegurarse de que la licencia sea realmente una licencia "
 "de software libre y evitar varios problemas en la práctica."
 
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Cuando hable del software libre, emplee los términos adecuados"
+
+# type: Content of: <p>
+#. type: Content of: <div><div><p>
+msgid ""
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
+msgstr ""
+"Cuando se habla de software libre, es mejor evitar usar términos como "
+"«regalar» o «gratuito», porque dichos términos implican que el asunto es 
el "
+"precio, no la libertad. Algunos términos comunes como «piratería» 
implican "
+"opiniones con las que esperamos no concuerde. Véase un análisis sobre el 
uso "
+"de esos términos en nuestro artículo <a href=\"/philosophy/words-to-avoid."
+"html\">palabras y frases confusas que vale la pena evitar</a>. También "
+"tenemos una lista de las <a href=\"/philosophy/fs-translations.html"
+"\">traducciones correctas de «software libre»</a> a varios idiomas."
+
+# type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | Another group uses the term &ldquo;open source&rdquo; to mean something
+# | close (but not identical) to &ldquo;free software&rdquo;.  We prefer the
+# | term &ldquo;free software&rdquo; because, once you have heard that it
+# | refers to freedom rather than price, it calls to mind freedom.  The word
+# | &ldquo;open&rdquo; [-<a
+# | href=\"/philosophy/open-source-misses-the-point.html\">-] never refers to
+# | [-freedom</a>.-] {+freedom.+}
+#, fuzzy
+#| msgid ""
+#| "Another group uses the term &ldquo;open source&rdquo; to mean something "
+#| "close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+#| "term &ldquo;free software&rdquo; because, once you have heard that it "
+#| "refers to freedom rather than price, it calls to mind freedom.  The word "
+#| "&ldquo;open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html"
+#| "\"> never refers to freedom</a>."
+msgid ""
+"Another group uses the term &ldquo;open source&rdquo; to mean something "
+"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+"term &ldquo;free software&rdquo; because, once you have heard that it refers "
+"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
+"open&rdquo; never refers to freedom."
+msgstr ""
+"Otro grupo emplea el término «código abierto» (del inglés «<cite>open "
+"source</cite>»), que significa algo parecido (pero no idéntico) a 
«software "
+"libre». Preferimos el término «software libre» porque una vez que ya se 
sabe "
+"que se refiere a la libertad y no al precio, evoca la idea de libertad. La "
+"palabra «abierto» <a href=\"/philosophy/open-source-misses-the-point.html"
+"\">nunca se refiere a la libertad</a>."
+
 # type: Content of: <h2>
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Más allá del software"
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
 "the same reasons that software must be free, and because the manuals are in "
@@ -889,11 +1153,21 @@
 "de hecho los manuales son parte del software."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | The same arguments also make sense for other kinds of works of practical
+# | use &mdash; that is to say, works that embody useful knowledge, such as
+# | educational works and reference works.  <a
+# | href=\"http{+s+}://wikipedia.org\">Wikipedia</a> is the best-known example.
+#, fuzzy
+#| msgid ""
+#| "The same arguments also make sense for other kinds of works of practical "
+#| "use &mdash; that is to say, works that embody useful knowledge, such as "
+#| "educational works and reference works.  <a href=\"http://wikipedia.org";
+#| "\">Wikipedia</a> is the best-known example."
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 "También tiene sentido aplicar los mismos argumentos a otros tipos de obras "
@@ -902,7 +1176,7 @@
 "\">Wikipedia</a> es el ejemplo más conocido."
 
 # type: Content of: <p>
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Any kind of work <em>can</em> be free, and the definition of free software "
 "has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
@@ -914,33 +1188,11 @@
 
 # type: Content of: <h2>
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "¿Código abierto?"
-
-# type: Content of: <p>
-#. type: Content of: <div><p>
-msgid ""
-"Another group uses the term &ldquo;open source&rdquo; to mean something "
-"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
-"term &ldquo;free software&rdquo; because, once you have heard that it refers "
-"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
-msgstr ""
-"Otro grupo emplea el término «código abierto» (del inglés «<cite>open "
-"source</cite>»), que significa algo parecido (pero no idéntico) a 
«software "
-"libre». Preferimos el término «software libre» porque una vez que ya se 
sabe "
-"que se refiere a la libertad y no al precio, evoca la idea de libertad. La "
-"palabra «abierto» <a href=\"/philosophy/open-source-misses-the-point.html"
-"\">nunca se refiere a la libertad</a>."
-
-# type: Content of: <h2>
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Historial"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
@@ -950,7 +1202,7 @@
 "exactamente lo que se ha modificado."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -966,7 +1218,7 @@
 "necesidad de declararlas como requisitos adicionales."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -979,7 +1231,7 @@
 "las libertades 1 y 3 permiten a los usuarios solucionarlo."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -991,7 +1243,7 @@
 "impide ejecutarlo."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
@@ -1002,7 +1254,7 @@
 "claramente qué código debe ser libre."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
@@ -1013,7 +1265,7 @@
 "caso que la libertad 0 es la libertad de ejecutar el programa como se desee."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
@@ -1024,7 +1276,7 @@
 "refiere a las funcionalidades del programa."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
@@ -1036,7 +1288,7 @@
 "libre ."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1049,7 +1301,7 @@
 "siempre ha sido nuestra política)."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1063,7 +1315,7 @@
 "potencial."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1077,7 +1329,7 @@
 "«mejoras»."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1093,7 +1345,7 @@
 "paralelamente con una modalidad diferente."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1108,7 +1360,7 @@
 "computación."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
@@ -1119,7 +1371,7 @@
 "fuente ofuscado no se puede considerar código fuente."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1133,7 +1385,7 @@
 "persona."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -1144,7 +1396,7 @@
 "el derecho de publicar versiones modificadas como software libre."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
@@ -1156,7 +1408,7 @@
 "«<i>tivoización</i>»."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1169,7 +1421,7 @@
 "describen como un reemplazo completo."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1182,7 +1434,7 @@
 "no en todos están definidos:"
 
 # type: Content of: <ul><li><ul><li>
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
@@ -1193,7 +1445,7 @@
 "distribución de versiones modificadas, no solo de los cambios."
 
 # type: Content of: <ul><li><ul><li>
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
@@ -1202,21 +1454,21 @@
 "debidamente licenciados."
 
 # type: Content of: <ul><li><ul><li>
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr ""
 "Expresar de manera explícita la conclusión del punto sobre los controles de 
"
 "exportación."
 
 # type: Content of: <ul><li><ul><li>
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr ""
 "Imponer un cambio de licencia constituye una revocación de la antigua "
 "licencia."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
@@ -1227,7 +1479,7 @@
 "«Más allá del software»."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
@@ -1239,7 +1491,7 @@
 "es el propósito del usuario."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
@@ -1250,7 +1502,7 @@
 "el punto sobre las licencias basadas en contratos."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1263,7 +1515,7 @@
 "hacer sus modificaciones."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1276,7 +1528,7 @@
 "versiones del software que se pongan a disposición del público."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1289,7 +1541,7 @@
 "tal. Otras aclaraciones menores en el texto."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1300,7 +1552,7 @@
 "problemas con las licencias basadas en contratos."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
@@ -1311,7 +1563,7 @@
 "distribución de los binarios es importante."
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1325,7 +1577,7 @@
 "usted distribuye."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1345,11 +1597,11 @@
 "cvsweb</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Notas"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1384,7 +1636,6 @@
 "proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
-#
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -1392,14 +1643,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "
@@ -1411,9 +1662,15 @@
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2019, 2021-] {+2009-2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
 "Foundation, Inc."
@@ -1441,3 +1698,7 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
+
+# type: Content of: <h2>
+#~ msgid "Open Source?"
+#~ msgstr "¿Código abierto?"

Index: free-sw.fa.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.fa.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- free-sw.fa.po       3 Feb 2021 13:03:03 -0000       1.20
+++ free-sw.fa.po       16 Jul 2021 10:02:23 -0000      1.21
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th@free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -22,7 +22,7 @@
 #, fuzzy
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation"
-msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr "تعریف نرم‌افزار آزاد - پروژه گنو - 
بنیاد نرم‌افزار آزاد"
 
 #. type: Attribute 'content' of: <meta>
@@ -43,51 +43,13 @@
 "کاربران کامپیوتر می‌توانند این آزادی را 
داشته باشند که نرم‌افزارهایی را که "
 "استفاده می‌کنند به اشتراک بگذارند و بهبود 
بخشند."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr ""
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "تعریف نرم‌افزار آزاد"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><h2>
 #, fuzzy
-#| msgid ""
-#| "We maintain this free software definition to show clearly what must be "
-#| "true about a particular software program for it to be considered free "
-#| "software.  From time to time we revise this definition to clarify it.  If "
-#| "you would like to review the changes we've made, please see the <a href="
-#| "\"#History\">History section</a> below for more information."
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-" عنوان یک نرم‌افزار آزاد تلقی شود. 
گاه‌گاه ما این تعریف را اصلاح می‌کنیم تا "
-"واضح‌تر شود. اگر شما مایلید تغییراتی که 
اعمال کرده‌ایم را ببینید، لطفا <a href="
-"\"#History\">بخش تاریخچه</a> در قسمت پایین صفحه 
انگلیسی را ببینید."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
+#| msgid "The Free Software Definition"
+msgid "What is Free Software?"
+msgstr "تعریف نرم‌افزار آزاد"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 #, fuzzy
 #| msgid ""
 #| "<q>Free software</q> is a matter of liberty, not price.  To understand "
@@ -106,7 +68,33 @@
 "« نرم‌افزار آزاد» درباره آزادی است، نه قیم
ت. برای درک بهتر باید به معنای "
 "«آزاد» در «آزادی بیان» فکر کنید، نه در 
«آبجو مجانی»."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid ""
+#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
+#| "free program must be available for commercial use, commercial "
+#| "development, and commercial distribution.  Commercial development of free "
+#| "software is no longer unusual; such free commercial software is very "
+#| "important.  You may have paid money to get copies of free software, or "
+#| "you may have obtained copies at no charge.  But regardless of how you got "
+#| "your copies, you always have the freedom to copy and change the software, "
+#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"« نرم‌افزار آزاد» به معنای &ldquo;غیر تجاری» 
نیست. یک برنامه آزاد باید برای "
+"استفاده تجاری، توسعه تجاری، و توزیع تجاری 
در دسترس باشد. توسعه تجاری "
+"نرم‌افزار آزاد دیگر غیر معمول نیست، بلکه 
چنین نرم‌افزارهای آزاد تجاری بسیار "
+"مهم هستند. بنابراین شما ممکن است پولی 
پرداخت کرده باشید تا کپی‌هایی از "
+"نرم‌افزار آزاد را بدست آورده باشید و یا مم
کن است کپی‌ها را بدون پرداخت هزینه "
+"بدست آورده باشید. اما صرفنظر از اینکه 
چگونه کپی‌ها را بدست آورده باشید، شما "
+"همیشه این آزادی را دارید تا نرم‌افزار را 
کپی کنید و تغییر دهید و یا حتی <a "
+"href=\"/philosophy/selling.html\">کپی‌هایی از آن را 
بفروشید</a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -117,11 +105,148 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid "Education"
+msgid "Table of contents"
+msgstr "آموزش"
+
+#. type: Content of: <div><div><div><ul><li>
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "تعریف نرم‌افزار آزاد"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "The freedom to run the program, for any purpose (freedom 0)."
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr "آزادی برای اجرای برنامه برای هر منظوری 
(آزادی ۰)"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr ""
+"آزادی برای توزیع مجدد کپی‌هایی از آن، 
بنابراین شما می‌توانید به همسایگان خود "
+"کمک کنید (آزادی ۲)."
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "تعریف نرم‌افزار آزاد"
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "We maintain this free software definition to show clearly what must be "
+#| "true about a particular software program for it to be considered free "
+#| "software.  From time to time we revise this definition to clarify it.  If "
+#| "you would like to review the changes we've made, please see the <a href="
+#| "\"#History\">History section</a> below for more information."
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+" عنوان یک نرم‌افزار آزاد تلقی شود. 
گاه‌گاه ما این تعریف را اصلاح می‌کنیم تا "
+"واضح‌تر شود. اگر شما مایلید تغییراتی که 
اعمال کرده‌ایم را ببینید، لطفا <a href="
+"\"#History\">بخش تاریخچه</a> در قسمت پایین صفحه 
انگلیسی را ببینید."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "Free software is a matter of the users' freedom to run, copy, distribute, "
@@ -135,14 +260,14 @@
 "بهبود دادن نرم‌افزار می‌باشد. بطور 
دقیق‌تر نرم‌افزار آزاد به چهار نوع آزادی 
برای "
 "کاربران یک نرم‌افزار اشاره می‌کند:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 #, fuzzy
 #| msgid "The freedom to run the program, for any purpose (freedom 0)."
 msgid ""
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr "آزادی برای اجرای برنامه برای هر منظوری 
(آزادی ۰)"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 #, fuzzy
 #| msgid ""
 #| "The freedom to study how the program works, and adapt it to your needs "
@@ -155,7 +280,7 @@
 "آزادی برای مطالعه و بررسی چگونگی عملکرد 
برنامه و تغییر آن برای نیاز خود "
 "(آزادی ۱). دسترسی به کد منبع یک پیش‌شرط 
برای این آزادی می‌باشد."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 #, fuzzy
 #| msgid ""
 #| "The freedom to redistribute copies so you can help your neighbor (freedom "
@@ -165,7 +290,7 @@
 "آزادی برای توزیع مجدد کپی‌هایی از آن، 
بنابراین شما می‌توانید به همسایگان خود "
 "کمک کنید (آزادی ۲)."
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 #, fuzzy
 #| msgid ""
 #| "The freedom to improve the program, and release your improvements (and "
@@ -182,7 +307,7 @@
 "از آن بهره می‌برند (آزادی ۳). دسترسی به کد م
نبع یک پیش‌شرط برای این آزادی "
 "می‌باشد."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -190,7 +315,7 @@
 "free, we consider them all equally unethical."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -201,7 +326,11 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -210,7 +339,7 @@
 "its aims."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -223,7 +352,7 @@
 "need."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -231,7 +360,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -242,50 +371,24 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
-#| "free program must be available for commercial use, commercial "
-#| "development, and commercial distribution.  Commercial development of free "
-#| "software is no longer unusual; such free commercial software is very "
-#| "important.  You may have paid money to get copies of free software, or "
-#| "you may have obtained copies at no charge.  But regardless of how you got "
-#| "your copies, you always have the freedom to copy and change the software, "
-#| "even to <a href=\"/philosophy/selling.html\">sell copies</a>."
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"« نرم‌افزار آزاد» به معنای &ldquo;غیر تجاری» 
نیست. یک برنامه آزاد باید برای "
-"استفاده تجاری، توسعه تجاری، و توزیع تجاری 
در دسترس باشد. توسعه تجاری "
-"نرم‌افزار آزاد دیگر غیر معمول نیست، بلکه 
چنین نرم‌افزارهای آزاد تجاری بسیار "
-"مهم هستند. بنابراین شما ممکن است پولی 
پرداخت کرده باشید تا کپی‌هایی از "
-"نرم‌افزار آزاد را بدست آورده باشید و یا مم
کن است کپی‌ها را بدون پرداخت هزینه "
-"بدست آورده باشید. اما صرفنظر از اینکه 
چگونه کپی‌ها را بدست آورده باشید، شما "
-"همیشه این آزادی را دارید تا نرم‌افزار را 
کپی کنید و تغییر دهید و یا حتی <a "
-"href=\"/philosophy/selling.html\">کپی‌هایی از آن را 
بفروشید</a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
 "free."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 #, fuzzy
 #| msgid "The freedom to run the program, for any purpose (freedom 0)."
 msgid "The freedom to run the program as you wish"
 msgstr "آزادی برای اجرای برنامه برای هر منظوری 
(آزادی ۰)"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "The freedom to run the program means the freedom for any kind of person "
@@ -314,7 +417,7 @@
 "شخص دیگری نیز بدهید، او هم آزاد است تا 
برنامه را برای هدف خودش استفاده "
 "نماید، شما حق ندارید هدف خودتان را به وی 
تحمیل نمایید."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -323,7 +426,7 @@
 "particular computing activity."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -334,18 +437,18 @@
 "without the arbitrary nuisance code."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
 "not to run a program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "In order for the freedoms to make changes, and to publish improved "
@@ -363,7 +466,7 @@
 "به کدهای منبع برنامه دسترسی داشته باشید. 
بنابراین دسترسی به کد منبع یک شرط "
 "ضروری برای نرم‌افزار آزاد می‌باشد."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -375,7 +478,7 @@
 "from is free."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "One important way to modify a program is by merging in available free "
@@ -396,7 +499,7 @@
 "باشید که با برنامه اضافه می‌کنید، در این 
صورت این مجوز بیشتر از حد محدود "
 "کننده است تا به عنوان یک مجوز آزاد شناخته 
شود."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "Whether a change constitutes an improvement is a subjective matter.  If "
@@ -411,14 +514,14 @@
 "باز میگردد. اگر حق تغییر شما، محدود به چیزی 
باشد که دیگری آن را بهبود "
 "می‌داند، این آزادی نیست."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
 "includes the &ldquo;freedom to delete the program.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 #, fuzzy
 #| msgid ""
 #| "The freedom to redistribute copies so you can help your neighbor (freedom "
@@ -428,7 +531,7 @@
 "آزادی برای توزیع مجدد کپی‌هایی از آن، 
بنابراین شما می‌توانید به همسایگان خود "
 "کمک کنید (آزادی ۲)."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "A program is free software if users have all of these freedoms.  Thus, "
@@ -451,7 +554,7 @@
 "آزاد بودن برای انجام این کارها (در میان 
کارهای دیگر) به این معنی است که شما "
 "مجبور به درخواست و پرداخت هزینه برای مجوز 
نیستید."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -463,16 +566,16 @@
 "اگر هم تغییرات خود را منتشر کردید، نباید م
لزم به اعلام آن به شخص خاص و یا به "
 "روش خاصی باشید."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "The freedom to redistribute copies must include binary or executable "
@@ -501,11 +604,11 @@
 "برای ارائه شکل باینری و اجرایی برنامه پیدا 
کردید، آن برنامه را مجددا به این "
 "دو شکل توزیع کنید."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "However, certain kinds of rules about the manner of distributing free "
@@ -518,7 +621,7 @@
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -530,7 +633,7 @@
 "اضافه کنید تا آزادی‌های اصلی را برای 
افراد دیگر از بین ببرید. این قانون نه "
 "تنها با آزادی‌های مرکزی در تضاد نیست بلکه 
از آنها محافظت نیز می‌کند."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "In the GNU project, we use copyleft to protect these freedoms legally for "
@@ -562,11 +665,11 @@
 "یکدیگر در ارتباطند، <a 
href=\"/philosophy/categories.html\">بخش‌های نرم‌افزار "
 "آزاد</a> را ببینید."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "However, rules about how to package a modified version are acceptable, if "
@@ -601,7 +704,7 @@
 "توسعه‌دهنده قبلی یک کپی از آن را درخواست 
نمود، شما باید یک کپی برای او "
 "بفرستید یا مشخص کنید که این تغییرات را شما 
انجام داده‌اید."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -613,7 +716,7 @@
 "use are also acceptable."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -623,11 +726,11 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
@@ -640,15 +743,15 @@
 #| "not require obedience to any export regulations as a condition of any of "
 #| "the essential freedoms."
 msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "گاهی اوقات <a id=\"exportcontrol\">مقررات نظارتی 
صادرات</a> و مصوبات تجاری "
 "دولت آزادی شما برای توزیع بین‌المللی 
کپی‌های برنامه را تحت تاثیر قرار خواهند "
@@ -659,7 +762,7 @@
 "داشت. بنابراین مجوزهای نرم‌افزارهای آزاد 
نباید رعایت مقررات صادراتی به عنوان "
 "یکی از شروط آزادی‌های ضروری را تحمیل کنند."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -669,11 +772,11 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "In order for these freedoms to be real, they must be irrevocable as long "
@@ -692,7 +795,7 @@
 "نرم‌افزار قادر باشد مجوز نرم‌افزار را، 
بدون این که شما کاری کنید که سبب این "
 "کار شود، باطل کند، این نرم‌افزار آزاد 
نیست."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -701,17 +804,17 @@
 "of those nonfree programs; that makes the license nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "Most free software licenses are based on copyright, and there are limits "
@@ -741,7 +844,7 @@
 "محدودیت‌های ممکن را تحمیل کنند. این بدان م
عناست که راه‌های بیشماری وجود دارند "
 "تا چنین مجوزی به طرز غیر قابل قبولی م
حدودکننده و غیر آزاد باشد."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "We can't possibly list all the ways that might happen.  If a contract-"
@@ -760,57 +863,42 @@
 "قانونی ذکر نشده باشد، ما درباره آن فکر 
خواهیم کرد و احتمالا آن را غیر آزاد "
 "تشخیص خواهیم داشت."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h3>
 #, fuzzy
-#| msgid ""
-#| "When talking about free software, it is best to avoid using terms like "
-#| "<q>give away</q> or <q>for free,</q> because those terms imply that the "
-#| "issue is about price, not freedom.  Some common terms such as <q>piracy</"
-#| "q> embody opinions we hope you won't endorse.  See <a href=\"/philosophy/"
-#| "words-to-avoid.html\">Confusing Words and Phrases that are Worth "
-#| "Avoiding</a> for a discussion of these terms.  We also have a list of <a "
-#| "href=\"/philosophy/fs-translations.html\">translations of <q>free "
-#| "software</q></a> into various languages."
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"هنگامیکه درباره نرم‌افزار آزاد صحبت م
ی‌شود بهتر است تا از به کار بردن عباراتی "
-"مانند «هدیه دادن» و یا «بطور رایگان» 
خودداری شود، زیرا این عبارات این مفهوم "
-"را می‌رسانند که موضوع در مورد قیمت م
ی‌باشد، نه آزادی. بعضی عبارات معمول مانند "
-"«کپی غیر قانونی» مفاهیمی در بر دارند که ما 
امیدواریم شما بر آنها صحه "
-"نگذارید. برای بحث در مورد این عبارات بخش <a 
href=\"/philosophy/words-to-"
-"avoid.html\">کلمات و عبارات گیج‌کننده که اجتناب 
از آنها با ارزش است</a> را "
-"ببینید. ما همچنین فهرستی از <a 
href=\"/philosophy/fs-translations.html"
-"\">ترجمه‌های «نرم‌افزار آزاد»</a> به 
زبانهای مختلف داریم."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "تعریف نرم‌افزار آزاد"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "در نهایت بخاطر داشته باشید که معیارها و 
ظوابطی مانند آنها که در تعریف "
 "نرم‌افزار آزاد ذکر شدند، برای تفسیر به 
تفکری دقیق نیاز دارند. برای تصمیم‌گیری "
@@ -824,11 +912,11 @@
 "می‌رسیم، غالبا این معیارها را به روز م
ی‌کنیم تا راحت‌تر ببینید که چرا مجوز‌های "
 "خاص صلاحیت دارند و یا ندارند."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -842,7 +930,7 @@
 "فرستادن ایمیل به آدرس <a 
href=\"mailto:licensing@gnu.org\";>&lt;licensing@gnu."
 "org&gt;</a> از ما درباره آن سوال کنید."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "If you are contemplating writing a new license, please contact the FSF by "
@@ -863,7 +951,7 @@
 "شما کمک کنیم تا مجوز نرم‌افزار آزادی را 
پیدا کنید که نیازهای شما را برآورده "
 "می‌کند."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "If that isn't possible, if you really need a new license, with our help "
@@ -878,11 +966,66 @@
 "می‌توانید مطمئن باشید که مجوز واقعا یک م
جوز نرم‌افزار آزاد هست و از مشکلات "
 "عملی گوناگون اجتناب کنید."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "When talking about free software, it is best to avoid using terms like "
+#| "<q>give away</q> or <q>for free,</q> because those terms imply that the "
+#| "issue is about price, not freedom.  Some common terms such as <q>piracy</"
+#| "q> embody opinions we hope you won't endorse.  See <a href=\"/philosophy/"
+#| "words-to-avoid.html\">Confusing Words and Phrases that are Worth "
+#| "Avoiding</a> for a discussion of these terms.  We also have a list of <a "
+#| "href=\"/philosophy/fs-translations.html\">translations of <q>free "
+#| "software</q></a> into various languages."
+msgid ""
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
+msgstr ""
+"هنگامیکه درباره نرم‌افزار آزاد صحبت م
ی‌شود بهتر است تا از به کار بردن عباراتی "
+"مانند «هدیه دادن» و یا «بطور رایگان» 
خودداری شود، زیرا این عبارات این مفهوم "
+"را می‌رسانند که موضوع در مورد قیمت م
ی‌باشد، نه آزادی. بعضی عبارات معمول مانند "
+"«کپی غیر قانونی» مفاهیمی در بر دارند که ما 
امیدواریم شما بر آنها صحه "
+"نگذارید. برای بحث در مورد این عبارات بخش <a 
href=\"/philosophy/words-to-"
+"avoid.html\">کلمات و عبارات گیج‌کننده که اجتناب 
از آنها با ارزش است</a> را "
+"ببینید. ما همچنین فهرستی از <a 
href=\"/philosophy/fs-translations.html"
+"\">ترجمه‌های «نرم‌افزار آزاد»</a> به 
زبانهای مختلف داریم."
+
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Another group has started using the term <q>open source</q> to mean "
+#| "something close (but not identical) to <q>free software.</q> We prefer "
+#| "the term <q>free software</q> because, once you have heard that it refers "
+#| "to freedom rather than price, it calls to mind freedom.  The word "
+#| "<q>open</q> <a href=\"/philosophy/open-source-misses-the-point.html\"> "
+#| "never refers to freedom</a>."
+msgid ""
+"Another group uses the term &ldquo;open source&rdquo; to mean something "
+"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+"term &ldquo;free software&rdquo; because, once you have heard that it refers "
+"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
+"open&rdquo; never refers to freedom."
+msgstr ""
+"برای رساندن مفهومی نزدیک به (و نه دقیقا) 
«نرم‌افزار آزاد» را شروع کرده‌اند. ما "
+"عبارت «نرم‌افزار آزاد» را ترجیح می‌دهیم، 
زیرا به محض شنیدن آزادی را به ذهن "
+"می‌آورد، نه قیمت را. واژه «باز» <a 
href=\"/philosophy/open-source-misses-the-"
+"point.html\">هیچگاه به آزادی منسوب نمی‌شود</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "فراتر از نرم‌افزار"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
 "the same reasons that software must be free, and because the manuals are in "
@@ -892,7 +1035,7 @@
 "راهنماها جزئی از نرم‌افزارها هستند، <a 
href=\"/philosophy/free-doc.html"
 "\">راهنمای نرم‌افزارها نیز باید آزاد 
باشند</a>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "The same arguments also make sense for other kinds of works of practical "
@@ -902,7 +1045,7 @@
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 "این استدلال در مورد دیگر فعالیت‌هایی که م
نجر به تولید نتایج کاربردی می‌شوند "
@@ -910,7 +1053,7 @@
 "می‌کنند، مثل فعالیت‌های آموزشی یا مورد 
ارجاع. <a href=\"http://wikipedia.org";
 "\">ویکی‌پدیا</a> بهترین نمونه شناخته‌شده 
است."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Any kind of work <em>can</em> be free, and the definition of free software "
 "has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
@@ -921,42 +1064,16 @@
 "بسط داده شده است."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "متن‌باز؟"
-
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Another group has started using the term <q>open source</q> to mean "
-#| "something close (but not identical) to <q>free software.</q> We prefer "
-#| "the term <q>free software</q> because, once you have heard that it refers "
-#| "to freedom rather than price, it calls to mind freedom.  The word "
-#| "<q>open</q> <a href=\"/philosophy/open-source-misses-the-point.html\"> "
-#| "never refers to freedom</a>."
-msgid ""
-"Another group uses the term &ldquo;open source&rdquo; to mean something "
-"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
-"term &ldquo;free software&rdquo; because, once you have heard that it refers "
-"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
-msgstr ""
-"برای رساندن مفهومی نزدیک به (و نه دقیقا) 
«نرم‌افزار آزاد» را شروع کرده‌اند. ما "
-"عبارت «نرم‌افزار آزاد» را ترجیح می‌دهیم، 
زیرا به محض شنیدن آزادی را به ذهن "
-"می‌آورد، نه قیمت را. واژه «باز» <a 
href=\"/philosophy/open-source-misses-the-"
-"point.html\">هیچگاه به آزادی منسوب نمی‌شود</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -965,7 +1082,7 @@
 "delete it, so there is no need to state those as separate requirements."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -973,42 +1090,42 @@
 "1 and 3 enable users to remove them."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
 "to run the program means nothing stops you from making it run."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
 "needs to be free."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
 "freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
 "matter of the program's functionality."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
 "not require compliance with a nonfree license of another program."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1016,7 +1133,7 @@
 "was always our policy.)"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1024,7 +1141,7 @@
 "is only a potential problem."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1032,7 +1149,7 @@
 "made.  And modifications are not limited to &ldquo;improvements&rdquo;"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1041,7 +1158,7 @@
 "the work by releasing the work in another way in parallel."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1049,14 +1166,14 @@
 "that it includes really using your modified version for your computing."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
 "code does not qualify as source code."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1064,21 +1181,21 @@
 "version, not a right to participate in someone else's development project."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
 "right to release modified versions as free software."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
 "practical, not just theoretical; i.e., no tivoization."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1086,7 +1203,7 @@
 "described as a complete replacement."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1094,49 +1211,49 @@
 "everywhere:"
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
 "modified versions, not just changes."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr ""
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
 "Software&quot; section."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
 "is significant in the freedom to run the program for any purpose."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
 "contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1144,7 +1261,7 @@
 "modifications."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1152,7 +1269,7 @@
 "the software you put into public use."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1160,21 +1277,21 @@
 "of modifications.  Other minor clarifications throughout the text."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
 "problems related to contract-based licenses."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
 "distribution of binaries is important."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1182,7 +1299,7 @@
 "previous developers on request."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1193,11 +1310,11 @@
 "view=log\">cvsweb interface</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1234,28 +1351,29 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"ما سخت کار می‌کنیم و تمام تلاش خود را به 
کار می‌بریم تا ترجمه‌های دقیق و با "
-"کیفیتی ارائه کنیم. اما با این حال، ما عاری 
از نقص نیستیم. لطفا نظرها و "
-"پیشنهادهای خود در این رابطه را به <a 
href=\"mailto:www-fa-general@gnu.org";
-"\">&lt;www-fa-general@gnu.org&gt;</a> ارسال نمایید.</p> 
<p>لطفا برای اطلاعات "
-"بیشتر جهت هماهنگی و ارسال ترجمه‌های این م
قاله صفحهٔ <a href=\"/server/"
-"standards/README.translations.html\">راهنمای ترجمه‌ها</a> 
را ببینید."
+"لطفا برای اطلاعات بیشتر جهت هماهنگی و 
ارسال ترجمه‌های این مقاله صفحه <a href="
+"\"/server/standards/README.translations.html\">راهنمای ترجم
ه‌ها</a> را ببینید."
 
 #. type: Content of: <div><p>
 #, fuzzy
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "<span dir=\"ltr\">Copyright &copy; 1996-2002, 2004-2007 Free Software "
 "Foundation, Inc.</span>"
@@ -1285,6 +1403,22 @@
 msgid "Updated:"
 msgstr "آخرین به روز رسانی:"
 
+#~ msgid "Open Source?"
+#~ msgstr "متن‌باز؟"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "ما سخت کار می‌کنیم و تمام تلاش خود را به 
کار می‌بریم تا ترجمه‌های دقیق و با "
+#~ "کیفیتی ارائه کنیم. اما با این حال، ما 
عاری از نقص نیستیم. لطفا نظرها و "
+#~ "پیشنهادهای خود در این رابطه را به <a 
href=\"mailto:www-fa-general@gnu.org";
+#~ "\">&lt;www-fa-general@gnu.org&gt;</a> ارسال نمایید.</p> 
<p>لطفا برای "
+#~ "اطلاعات بیشتر جهت هماهنگی و ارسال ترجم
ه‌های این مقاله صفحهٔ <a href=\"/"
+#~ "server/standards/README.translations.html\">راهنمای ترجم
ه‌ها</a> را ببینید."
+
 #~ msgid ""
 #~ "This page is licensed under a <a rel=\"license\" href=\"http://";
 #~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"

Index: free-sw.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.fr.po,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- free-sw.fr.po       31 May 2021 21:09:13 -0000      1.154
+++ free-sw.fr.po       16 Jul 2021 10:02:23 -0000      1.155
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2021-02-03 12:56+0000\n"
+"POT-Creation-Date: 2021-07-16 09:55+0000\n"
 "PO-Revision-Date: 2021-02-04 12:16+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -19,11 +19,16 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-16 09:55+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation"
+# | What is [-free software?-] {+Free Software?+} - GNU Project - Free
+# | Software Foundation
+#, fuzzy
+#| msgid "What is free software? - GNU Project - Free Software Foundation"
+msgid "What is Free Software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Qu'est-ce que le logiciel libre ? - Projet GNU - Free Software Foundation"
 
@@ -45,57 +50,14 @@
 "Unix, pour que les utilisateurs d'ordinateurs puissent avoir la liberté de "
 "partager et d'améliorer les logiciels qu'ils utilisent."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+# | What is [-free software?-] {+Free Software?+}
+#, fuzzy
+#| msgid "What is free software?"
+msgid "What is Free Software?"
 msgstr "Qu'est-ce que le logiciel libre ?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Définition du logiciel libre"
-
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Have a question about free software licensing not answered here? See our "
-"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
-"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a>."
-msgstr ""
-"Vous avez une question sur les licences de logiciel libre qui ne trouve pas "
-"de réponse ici ? Consultez nos autres <a 
href=\"http://www.fsf.org/licensing";
-"\">ressources sur les licences</a> et au besoin contactez le Labo des "
-"licences et de la conformité de la FSF à <a href=\"mailto:licensing@fsf.org";
-"\">licensing@fsf.org</a>."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"The free software definition presents the criteria for whether a particular "
-"software program qualifies as free software.  From time to time we revise "
-"this definition, to clarify it or to resolve questions about subtle issues.  "
-"See the <a href=\"#History\">History section</a> below for a list of changes "
-"that affect the definition of free software."
-msgstr ""
-"La définition du logiciel libre décrit les conditions à remplir pour qu'un 
"
-"logiciel soit considéré comme libre. Nous la révisons de temps à autre 
pour "
-"apporter des clarifications ou résoudre des questions portant sur des points 
"
-"difficiles. Si vous souhaitez avoir un aperçu de ces changements, veuillez "
-"consulter la section <a href=\"#History\">Historique</a> ci-dessous."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"&ldquo;Open source&rdquo; is something different: it has a very different "
-"philosophy based on different values.  Its practical definition is different "
-"too, but nearly all open source programs are in fact free.  We explain the "
-"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
-"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
-msgstr ""
-"L'« open source » est quelque chose d'autre : il a une philosophie très 
"
-"différente basée sur des valeurs différentes. Sa définition pratique est "
-"différente également, mais presque tous les programmes open source sont en "
-"fait libres. Nous expliquons ceci dans « <a href=\"/philosophy/open-source-"
-"misses-the-point.html\">En quoi l'open source perd de vue l'éthique du "
-"logiciel libre</a> »."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; means software that respects users' freedom and "
 "community.  Roughly, it means that <b>the users have the freedom to run, "
@@ -117,7 +79,20 @@
 "anglais l'expression <i>libre software</i>, qui emprunte au français ou à "
 "l'espagnol."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+msgid ""
+"You may have paid money to get copies of a free program, or you may have "
+"obtained copies at no charge.  But regardless of how you got your copies, "
+"you always have the freedom to copy and change the software, even to <a href="
+"\"/philosophy/selling.html\">sell copies</a>."
+msgstr ""
+"Vous pouvez avoir payé pour obtenir une copie d'un logiciel libre ou vous "
+"pouvez l'avoir obtenu gratuitement. Mais quelle que soit la manière dont "
+"vous vous l'êtes procuré, vous avez toujours la liberté de copier et de "
+"modifier le logiciel et même d'en <a href=\"/philosophy/selling.html"
+"\">vendre des copies</a>."
+
+#. type: Content of: <div><div><p>
 msgid ""
 "We campaign for these freedoms because everyone deserves them.  With these "
 "freedoms, the users (both individually and collectively) control the program "
@@ -137,11 +112,189 @@
 "href=\"/philosophy/free-software-even-more-important.html\">l'instrument "
 "d'un pouvoir injuste</a>."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><p>
+msgid ""
+"&ldquo;Open source&rdquo; is something different: it has a very different "
+"philosophy based on different values.  Its practical definition is different "
+"too, but nearly all open source programs are in fact free.  We explain the "
+"difference in <a href=\"/philosophy/open-source-misses-the-point.html\"> Why "
+"&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
+msgstr ""
+"L'« open source » est quelque chose d'autre : il a une philosophie très 
"
+"différente basée sur des valeurs différentes. Sa définition pratique est "
+"différente également, mais presque tous les programmes open source sont en "
+"fait libres. Nous expliquons ceci dans « <a href=\"/philosophy/open-source-"
+"misses-the-point.html\">En quoi l'open source perd de vue l'éthique du "
+"logiciel libre</a> »."
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Table des matières"
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-The-]{+<a href=\"#fs-definition\">The+} Free Software [-Definition-]
+# | {+Definition</a>+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "<a href=\"#fs-definition\">The Free Software Definition</a>"
+msgstr "Définition du logiciel libre"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#four-freedoms\">The+} four essential [-freedoms-]
+# | {+freedoms</a>+}
+#, fuzzy
+#| msgid "The four essential freedoms"
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr "Les quatre libertés essentielles"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#selling\">Free software <em>can</em> be commercial</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+# | [-Clarifying-]{+<a href=\"#clarifying\">Clarifying+} the [-boundary
+# | between free-] {+Boundary Between Free+} and [-nonfree-] {+Nonfree</a>+}
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr "Clarifier la limite entre libre et non libre"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#run-the-program\">The+} freedom to run the program as
+# | you [-wish-] {+wish</a>+}
+#, fuzzy
+#| msgid "The freedom to run the program as you wish"
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr "La liberté d'exécuter le programme comme vous le souhaitez"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#make-changes\">The+} freedom to study the source code
+# | and make [-changes-] {+changes</a>+}
+#, fuzzy
+#| msgid "The freedom to study the source code and make changes"
+msgid ""
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
+msgstr "La liberté d'étudier le code source et de le modifier"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-The-]{+<a href=\"#redistribute\">The+} freedom to redistribute if you
+# | wish: basic [-requirements-] {+requirements</a>+}
+#, fuzzy
+#| msgid "The freedom to redistribute if you wish: basic requirements"
+msgid ""
+"<a href=\"#redistribute\">The freedom to redistribute if you wish: basic "
+"requirements</a>"
+msgstr "La liberté de redistribuer si vous le souhaitez : exigences de base"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#copyleft\">Copyleft</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Rules-]{+<a href=\"#packaging\">Rules+} about packaging and distribution
+# | [-details-] {+details</a>+}
+#, fuzzy
+#| msgid "Rules about packaging and distribution details"
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr "Règles concernant l'empaquetage et les détails de distribution"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+msgid "<a href=\"#legal-details\">Legal considerations</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Contract-based licenses-]{+<a href=\"#contracts\">Contract-based
+# | licenses</a>+}
+#, fuzzy
+#| msgid "Contract-based licenses"
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr "Licences basées sur des contrats"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#in-practice\">The Free Software Definition in Practice</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-How-]{+<a href=\"#interpretation\">How+} we interpret these [-criteria-]
+# | {+criteria</a>+}
+#, fuzzy
+#| msgid "How we interpret these criteria"
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr "Comment nous interprétons ces critères"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Get-]{+<a href=\"#get-help\">Get+} help with free [-licenses-]
+# | {+licenses</a>+}
+#, fuzzy
+#| msgid "Get help with free licenses"
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr "Où trouver de l'aide au sujet des licences libres"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | [-Use-]{+<a href=\"#terminology\">Use+} the right words when talking about
+# | free [-software-] {+software</a>+}
+#, fuzzy
+#| msgid "Use the right words when talking about free software"
+msgid ""
+"<a href=\"#terminology\">Use the right words when talking about free "
+"software</a>"
+msgstr "Utilisez les mots justes pour parler du logiciel libre"
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#beyond-software\">Beyond Software</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+msgid "<a href=\"#History\">History</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"Have a question about free software licensing not answered here? See our "
+"other <a href=\"http://www.fsf.org/licensing\";>licensing resources</a>, and "
+"if necessary contact the FSF Compliance Lab at <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a>."
+msgstr ""
+"Vous avez une question sur les licences de logiciel libre qui ne trouve pas "
+"de réponse ici ? Consultez nos autres <a 
href=\"http://www.fsf.org/licensing";
+"\">ressources sur les licences</a> et au besoin contactez le Labo des "
+"licences et de la conformité de la FSF à <a href=\"mailto:licensing@fsf.org";
+"\">licensing@fsf.org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Définition du logiciel libre"
+
+#. type: Content of: <div><div><p>
+msgid ""
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"La définition du logiciel libre décrit les conditions à remplir pour qu'un 
"
+"logiciel soit considéré comme libre. Nous la révisons de temps à autre 
pour "
+"apporter des clarifications ou résoudre des questions portant sur des points 
"
+"difficiles. Si vous souhaitez avoir un aperçu de ces changements, veuillez "
+"consulter la section <a href=\"#History\">Historique</a> ci-dessous."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "Les quatre libertés essentielles"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if the program's users have the four essential "
 "freedoms: <a href=\"#f1\">[1]</a>"
@@ -149,14 +302,14 @@
 "Un programme est un logiciel libre si vous, en tant qu'utilisateur de ce "
 "programme, avez les quatre libertés essentielles <a 
href=\"#f1\">[1]</a> :"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr ""
 "la liberté de faire fonctionner le programme comme vous voulez, pour "
 "n'importe quel usage (liberté 0) ;"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to study how the program works, and change it so it does your "
 "computing as you wish (freedom 1). Access to the source code is a "
@@ -166,12 +319,12 @@
 "qu'il effectue vos tâches informatiques comme vous le souhaitez "
 "(liberté 1) ; l'accès au code source est une condition nécessaire ;"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "The freedom to redistribute copies so you can help others (freedom 2)."
 msgstr ""
 "la liberté de redistribuer des copies, donc d'aider les autres (liberté 
2) ;"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to distribute copies of your modified versions to others "
 "(freedom 3).  By doing this you can give the whole community a chance to "
@@ -183,7 +336,7 @@
 "possibilité de profiter de vos changements ; l'accès au code source est 
une "
 "condition nécessaire."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A program is free software if it gives users adequately all of these "
 "freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
@@ -197,7 +350,7 @@
 "être libres, nous les considérons tous comme équivalents dans leur manque "
 "d'éthique."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In any given scenario, these freedoms must apply to whatever code we plan to "
 "make use of, or lead others to make use of.  For instance, consider a "
@@ -216,7 +369,11 @@
 "Cependant, si nous projetons de modifier A de telle sorte qu'il n'utilise "
 "pas B, alors seul A doit être libre ; B n'est pas pertinent dans ce cas."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><h4>
+msgid "Free software <em>can</em> be commercial"
+msgstr ""
+
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  On "
 "the contrary, a free program must be available for commercial use, "
@@ -230,7 +387,7 @@
 "primordiale. Sans elle, le logiciel libre ne pourrait pas atteindre son "
 "objectif."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We want to invite everyone to use the GNU system, including businesses and "
 "their workers.  That requires allowing commercial use.  We hope that free "
@@ -253,7 +410,7 @@
 "essentiel. Le support professionnel payant du logiciel libre répond à un "
 "besoin important."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Thus, to exclude commercial use, commercial development or commercial "
 "distribution would hobble the free software community and obstruct its path "
@@ -267,7 +424,7 @@
 "logiciel libre."
 
 # À revoir après clarification de l'original.
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free program must offer the four freedoms to any would-be user that "
 "obtains a copy of the software, who has complied thus far with the "
@@ -286,24 +443,15 @@
 "pas leur accorder les libertés en question, ce qui rend le programme non "
 "libre."
 
-#. type: Content of: <div><p>
-msgid ""
-"You may have paid money to get copies of a free program, or you may have "
-"obtained copies at no charge.  But regardless of how you got your copies, "
-"you always have the freedom to copy and change the software, even to <a href="
-"\"/philosophy/selling.html\">sell copies</a>."
-msgstr ""
-"Vous pouvez avoir payé pour obtenir une copie d'un logiciel libre ou vous "
-"pouvez l'avoir obtenu gratuitement. Mais quelle que soit la manière dont "
-"vous vous l'êtes procuré, vous avez toujours la liberté de copier et de "
-"modifier le logiciel et même d'en <a href=\"/philosophy/selling.html"
-"\">vendre des copies</a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+# | Clarifying the [-boundary between free-] {+Boundary Between Free+} and
+# | [-n-]{+N+}onfree
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr "Clarifier la limite entre libre et non libre"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the rest of this article we explain more precisely how far the various "
 "freedoms need to extend, on various issues, in order for a program to be "
@@ -312,11 +460,11 @@
 "La suite de cet article explique plus précisément quelle étendue doit 
avoir "
 "chacune de ces libertés dans divers domaines pour qu'un programme soit 
libre."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "La liberté d'exécuter le programme comme vous le souhaitez"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program means the freedom for any kind of person or "
 "organization to use it on any kind of computer system, for any kind of "
@@ -337,7 +485,7 @@
 "quelqu'un d'autre, cette personne est libre de l'exécuter comme bon lui "
 "semble, mais vous n'êtes pas autorisé à lui imposer vos conditions."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to run the program as you wish means that you are not forbidden "
 "or stopped from making it run.  This has nothing to do with what "
@@ -352,7 +500,7 @@
 "capable de fonctionner dans un environnement donné ou utile à une activité 
"
 "informatique particulière."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "For example, if the code arbitrarily rejects certain meaningful inputs&mdash;"
 "or even fails unconditionally&mdash;that may make the program less useful, "
@@ -371,7 +519,7 @@
 "permettent, à eux ou à leur communauté, de débarrasser le code des 
nuisances "
 "arbitraires et de distribuer les versions ainsi modifiées."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at all&rdquo; if "
 "that is what you wish.  So there is no need for a separate &ldquo;freedom "
@@ -381,11 +529,11 @@
 "souhait. On n'a donc pas besoin d'une « liberté de ne pas exécuter un "
 "programme »."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "La liberté d'étudier le code source et de le modifier"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In order for freedoms 1 and 3 (the freedom to make changes and the freedom "
 "to publish the changed versions) to be meaningful, you need to have access "
@@ -400,7 +548,7 @@
 "[obfuscated]</i> n'est pas du vrai code source et ne compte pas comme code "
 "source."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom 1 includes the freedom to use your changed version in place of the "
 "original.  If the program is delivered in a product designed to run someone "
@@ -421,7 +569,7 @@
 "liberté concrète. Ces binaires ne sont pas libres, même si le code source 
à "
 "partir duquel ils ont été compilés l'est."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One important way to modify a program is by merging in available free "
 "subroutines and modules.  If the program's license says that you cannot "
@@ -437,7 +585,7 @@
 "sup></a> sur tout code que vous ajoutez, alors la licence est trop "
 "restrictive pour être qualifiée de libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Whether a change constitutes an improvement is a subjective matter.  If your "
 "right to modify a program is limited, in substance, to changes that someone "
@@ -448,7 +596,7 @@
 "que quelqu'un d'autre considère comme une amélioration, ce n'est pas un "
 "programme libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "One special case of freedom 1 is to delete the program's code so it returns "
 "after doing nothing, or make it invoke some other program.  Thus, freedom 1 "
@@ -459,11 +607,11 @@
 "invoque un autre programme. Ainsi, la liberté 1 inclut la « liberté de "
 "supprimer le programme »."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "La liberté de redistribuer si vous le souhaitez : exigences de base"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
 "copies, either with or without modifications, either gratis or charging a "
@@ -477,7 +625,7 @@
 "faire tout cela signifie (entre autres) que vous n'avez pas à demander ni à 
"
 "payer pour en avoir la permission."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You should also have the freedom to make modifications and use them "
 "privately in your own work or play, without even mentioning that they "
@@ -489,11 +637,25 @@
 "l'existence. Si vous publiez vos modifications, vous n'êtes pas obligé de "
 "prévenir quelqu'un en particulier ou de le faire d'une manière 
particulière."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Freedom 3 includes the freedom to release your modified versions as free
+# | software.  A free license may also permit other ways of releasing them; in
+# | other words, it does not have to be a <a
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} license.  However, a
+# | license that requires modified versions to be nonfree does not qualify as
+# | a free license.
+#, fuzzy
+#| msgid ""
+#| "Freedom 3 includes the freedom to release your modified versions as free "
+#| "software.  A free license may also permit other ways of releasing them; "
+#| "in other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+#| "\">copyleft</a> license.  However, a license that requires modified "
+#| "versions to be nonfree does not qualify as a free license."
 msgid ""
 "Freedom 3 includes the freedom to release your modified versions as free "
 "software.  A free license may also permit other ways of releasing them; in "
-"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"other words, it does not have to be a <a href=\"/licenses/copyleft.html"
 "\">copyleft</a> license.  However, a license that requires modified versions "
 "to be nonfree does not qualify as a free license."
 msgstr ""
@@ -505,7 +667,7 @@
 "les versions modifiées soient non libres ne peut pas être qualifiée de "
 "licence libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to redistribute copies must include binary or executable forms "
 "of the program, as well as source code, for both modified and unmodified "
@@ -525,15 +687,30 @@
 "avoir la liberté de distribuer des versions de ce type si vous trouvez ou si 
"
 "vous concevez un moyen d'en produire."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "Copyleft"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | Certain kinds of rules about the manner of distributing free software are
+# | acceptable, when they don't conflict with the central freedoms.  For
+# | example, <a [-href=\"/copyleft/copyleft.html\">copyleft</a>-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | the rule that when redistributing the program, you cannot add restrictions
+# | to deny other people the central freedoms.  This rule does not conflict
+# | with the central freedoms; rather it protects them.
+#, fuzzy
+#| msgid ""
+#| "Certain kinds of rules about the manner of distributing free software are "
+#| "acceptable, when they don't conflict with the central freedoms.  For "
+#| "example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+#| "stated) is the rule that when redistributing the program, you cannot add "
+#| "restrictions to deny other people the central freedoms.  This rule does "
+#| "not conflict with the central freedoms; rather it protects them."
 msgid ""
 "Certain kinds of rules about the manner of distributing free software are "
 "acceptable, when they don't conflict with the central freedoms.  For "
-"example, <a href=\"/copyleft/copyleft.html\">copyleft</a> (very simply "
+"example, <a href=\"/licenses/copyleft.html\">copyleft</a> (very simply "
 "stated) is the rule that when redistributing the program, you cannot add "
 "restrictions to deny other people the central freedoms.  This rule does not "
 "conflict with the central freedoms; rather it protects them."
@@ -546,7 +723,7 @@
 "qui nie les libertés fondamentales des autres. Cette règle n'entre pas en "
 "conflit avec les libertés fondamentales ; en fait, elle les protège."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In the GNU project, we use copyleft to protect the four freedoms legally for "
 "everyone.  We believe there are important reasons why <a href=\"/philosophy/"
@@ -566,11 +743,11 @@
 "de logiciels libres</a> pour une discussion des relations entre « logiciel "
 "libre », « logiciel copylefté » et encore d'autres catégories de 
logiciel)."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Règles concernant l'empaquetage et les détails de distribution"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules about how to package a modified version are acceptable, if they don't "
 "substantively limit your freedom to release modified versions, or your "
@@ -591,7 +768,7 @@
 "elles sont acceptables. Vous avez déjà fait d'autres changements dans le "
 "programme, alors vous n'aurez pas de mal à en faire quelques-uns de plus."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Rules that &ldquo;if you make your version available in this way, you must "
 "make it available in that way also&rdquo; can be acceptable too, on the same "
@@ -612,7 +789,7 @@
 "utilisateurs pour les versions que vous mettez à la disposition du public "
 "sont également acceptables."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A special issue arises when a license requires changing the name by which "
 "the program will be invoked from other programs.  That effectively hampers "
@@ -628,21 +805,42 @@
 "Ce type d'exigence n'est acceptable que s'il existe une possibilité de "
 "spécifier le nom du programme original comme alias de la version modifiée."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Contrôle de l'exportation"
 
-#. type: Content of: <div><p>
-msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
-"and trade sanctions can constrain your freedom to distribute copies of "
-"programs internationally.  Software developers do not have the power to "
-"eliminate or override these restrictions, but what they can and must do is "
-"refuse to impose them as conditions of use of the program.  In this way, the "
-"restrictions will not affect activities and people outside the jurisdictions "
-"of these governments.  Thus, free software licenses must not require "
-"obedience to any nontrivial export regulations as a condition of exercising "
-"any of the essential freedoms."
+#. type: Content of: <div><div><p>
+# | Sometimes government [-<a id=\"exportcontrol\">export-] {+export+} control
+# | [-regulations</a>-] {+regulations+} and trade sanctions can constrain your
+# | freedom to distribute copies of programs internationally.  Software
+# | developers do not have the power to eliminate or override these
+# | restrictions, but what they can and must do is refuse to impose them as
+# | conditions of use of the program.  In this way, the restrictions will not
+# | affect activities and people outside the jurisdictions of these
+# | governments.  Thus, free software licenses must not require obedience to
+# | any nontrivial export regulations as a condition of exercising any of the
+# | essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any nontrivial export regulations as a condition "
+#| "of exercising any of the essential freedoms."
+msgid ""
+"Sometimes government export control regulations and trade sanctions can "
+"constrain your freedom to distribute copies of programs internationally.  "
+"Software developers do not have the power to eliminate or override these "
+"restrictions, but what they can and must do is refuse to impose them as "
+"conditions of use of the program.  In this way, the restrictions will not "
+"affect activities and people outside the jurisdictions of these "
+"governments.  Thus, free software licenses must not require obedience to any "
+"nontrivial export regulations as a condition of exercising any of the "
+"essential freedoms."
 msgstr ""
 "Parfois <a id=\"exportcontrol\">les règles du contrôle des 
exportations</a>, "
 "ou bien des sanctions économiques, peuvent restreindre votre liberté de "
@@ -656,7 +854,7 @@
 "l'exportation comme préalable à l'une des libertés essentielles, quelle "
 "qu'elle soit, dans la mesure où ce règlement a une incidence pratique."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Merely mentioning the existence of export regulations, without making them a "
 "condition of the license itself, is acceptable since it does not restrict "
@@ -674,11 +872,11 @@
 "faire que cette exigence ait des conséquences pratiques et donc rende le "
 "logiciel non libre."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Considérations juridiques"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In order for these freedoms to be real, they must be permanent and "
 "irrevocable as long as you do nothing wrong; if the developer of the "
@@ -692,7 +890,7 @@
 "des clauses restrictives, sans que vous ayez fait quoi que ce soit de mal "
 "pour le justifier, le logiciel n'est pas libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
 "program.  Thus, for instance, if a license requires you to comply with the "
@@ -707,7 +905,7 @@
 "licences de ces programmes non libres et rendrait par conséquent la licence "
 "non libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "It is acceptable for a free license to specify which jurisdiction's law "
 "applies, or where litigation must be done, or both."
@@ -715,11 +913,11 @@
 "Il est acceptable qu'une licence libre précise la juridiction dont le droit "
 "s'applique, la cour compétente pour régler les litiges, ou bien les deux."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Licences basées sur des contrats"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
@@ -741,7 +939,7 @@
 "puisse restreindre de manière inacceptable la liberté des utilisateurs et "
 "ainsi devenir non libre."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We can't possibly list all the ways that might happen.  If a contract-based "
 "license restricts the user in an unusual way that copyright-based licenses "
@@ -754,48 +952,54 @@
 "se conformer et qui n'est pas mentionnée ici comme légitime, nous devrons y 
"
 "réfléchir et nous conclurons probablement qu'elle n'est pas libre."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Utilisez les mots justes pour parler du logiciel libre"
-
-#. type: Content of: <div><p>
-msgid ""
-"When talking about free software, it is best to avoid using terms like "
-"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
-"that the issue is about price, not freedom.  Some common terms such as "
-"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
-"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
-"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
-"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
-"free software&rdquo;</a> into various languages."
-msgstr ""
-"Quand vous parlez de logiciel libre, il est préférable de ne pas utiliser 
de "
-"termes comme « donner » ou « gratuit », car ils laissent supposer que 
la "
-"finalité du logiciel libre est le prix et non la liberté. Certains termes "
-"répandus comme « piratage » comportent des idées auxquelles nous 
espérons "
-"que vous n'adhérerez pas. Lisez « <a 
href=\"/philosophy/words-to-avoid.html"
-"\">Termes prêtant à confusion, que vous devriez éviter</a> », un essai 
sur "
-"l'utilisation de ces termes. Nous avons aussi une liste de <a href=\"/"
-"philosophy/fs-translations.html\">traductions correctes de <i>free software</"
-"i></a> dans de nombreuses langues."
+#. type: Content of: <div><div><h3>
+# | The Free Software Definition {+in Practice+}
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Définition du logiciel libre"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Comment nous interprétons ces critères"
 
-#. type: Content of: <div><p>
-msgid ""
-"Finally, note that criteria such as those stated in this free software "
-"definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we "
-"judge it based on these criteria to determine whether it fits their spirit "
-"as well as the precise words.  If a license includes unconscionable "
-"restrictions, we reject it, even if we did not anticipate the issue in these "
-"criteria.  Sometimes a license requirement raises an issue that calls for "
-"extensive thought, including discussions with a lawyer, before we can decide "
-"if the requirement is acceptable.  When we reach a conclusion about a new "
-"issue, we often update these criteria to make it easier to see why certain "
-"licenses do or don't qualify."
+#. type: Content of: <div><div><p>
+# | [-Finally, note-]{+Note+} that criteria such as those stated in this free
+# | software definition require careful thought for their interpretation.  To
+# | decide whether a specific software license qualifies as a free software
+# | license, we judge it based on these criteria to determine whether it fits
+# | their spirit as well as the precise words.  If a license includes
+# | unconscionable restrictions, we reject it, even if we did not anticipate
+# | the issue in these criteria.  Sometimes a license requirement raises an
+# | issue that calls for extensive thought, including discussions with a
+# | lawyer, before we can decide if the requirement is acceptable.  When we
+# | reach a conclusion about a new issue, we often update these criteria to
+# | make it easier to see why certain licenses do or don't qualify.
+#, fuzzy
+#| msgid ""
+#| "Finally, note that criteria such as those stated in this free software "
+#| "definition require careful thought for their interpretation.  To decide "
+#| "whether a specific software license qualifies as a free software license, "
+#| "we judge it based on these criteria to determine whether it fits their "
+#| "spirit as well as the precise words.  If a license includes "
+#| "unconscionable restrictions, we reject it, even if we did not anticipate "
+#| "the issue in these criteria.  Sometimes a license requirement raises an "
+#| "issue that calls for extensive thought, including discussions with a "
+#| "lawyer, before we can decide if the requirement is acceptable.  When we "
+#| "reach a conclusion about a new issue, we often update these criteria to "
+#| "make it easier to see why certain licenses do or don't qualify."
+msgid ""
+"Note that criteria such as those stated in this free software definition "
+"require careful thought for their interpretation.  To decide whether a "
+"specific software license qualifies as a free software license, we judge it "
+"based on these criteria to determine whether it fits their spirit as well as "
+"the precise words.  If a license includes unconscionable restrictions, we "
+"reject it, even if we did not anticipate the issue in these criteria.  "
+"Sometimes a license requirement raises an issue that calls for extensive "
+"thought, including discussions with a lawyer, before we can decide if the "
+"requirement is acceptable.  When we reach a conclusion about a new issue, we "
+"often update these criteria to make it easier to see why certain licenses do "
+"or don't qualify."
 msgstr ""
 "Enfin, notez que des critères comme ceux qui sont développés dans la "
 "présente définition du logiciel libre demandent une réflexion sérieuse 
quant "
@@ -811,11 +1015,11 @@
 "mettions à jour ces critères pour qu'on sache plus facilement pourquoi 
telle "
 "licence s'y conforme, ou non."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Où trouver de l'aide au sujet des licences libres"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "
 "software license, see our <a href=\"/licenses/license-list.html\">list of "
@@ -830,7 +1034,7 @@
 "courriel à <a href=\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</"
 "a>."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are contemplating writing a new license, please contact the Free "
 "Software Foundation first by writing to that address. The proliferation of "
@@ -845,7 +1049,7 @@
 "comprendre ces licences ; nous pouvons vous aider à trouver une licence de "
 "logiciel libre existante qui réponde à vos besoins."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If that isn't possible, if you really need a new license, with our help you "
 "can ensure that the license really is a free software license and avoid "
@@ -855,11 +1059,66 @@
 "licence, avec notre aide vous pouvez faire en sorte que cette licence soit "
 "vraiment une licence de logiciel libre et éviter divers problèmes 
pratiques."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Utilisez les mots justes pour parler du logiciel libre"
+
+#. type: Content of: <div><div><p>
+msgid ""
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
+msgstr ""
+"Quand vous parlez de logiciel libre, il est préférable de ne pas utiliser 
de "
+"termes comme « donner » ou « gratuit », car ils laissent supposer que 
la "
+"finalité du logiciel libre est le prix et non la liberté. Certains termes "
+"répandus comme « piratage » comportent des idées auxquelles nous 
espérons "
+"que vous n'adhérerez pas. Lisez « <a 
href=\"/philosophy/words-to-avoid.html"
+"\">Termes prêtant à confusion, que vous devriez éviter</a> », un essai 
sur "
+"l'utilisation de ces termes. Nous avons aussi une liste de <a href=\"/"
+"philosophy/fs-translations.html\">traductions correctes de <i>free software</"
+"i></a> dans de nombreuses langues."
+
+#. type: Content of: <div><div><p>
+# | Another group uses the term &ldquo;open source&rdquo; to mean something
+# | close (but not identical) to &ldquo;free software&rdquo;.  We prefer the
+# | term &ldquo;free software&rdquo; because, once you have heard that it
+# | refers to freedom rather than price, it calls to mind freedom.  The word
+# | &ldquo;open&rdquo; [-<a
+# | href=\"/philosophy/open-source-misses-the-point.html\">-] never refers to
+# | [-freedom</a>.-] {+freedom.+}
+#, fuzzy
+#| msgid ""
+#| "Another group uses the term &ldquo;open source&rdquo; to mean something "
+#| "close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+#| "term &ldquo;free software&rdquo; because, once you have heard that it "
+#| "refers to freedom rather than price, it calls to mind freedom.  The word "
+#| "&ldquo;open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html"
+#| "\"> never refers to freedom</a>."
+msgid ""
+"Another group uses the term &ldquo;open source&rdquo; to mean something "
+"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
+"term &ldquo;free software&rdquo; because, once you have heard that it refers "
+"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
+"open&rdquo; never refers to freedom."
+msgstr ""
+"Un autre groupe utilise le terme « open source » pour exprimer quelque 
chose "
+"de proche, mais pas identique au « logiciel libre ». Nous préférons le 
terme "
+"« logiciel libre ». En effet, une fois qu'on a compris que ce terme se "
+"rapporte à la liberté plutôt qu'au prix, il appelle la notion de liberté. 
Le "
+"mot « open » <a href=\"/philosophy/open-source-misses-the-point.html\">ne 
"
+"renvoie jamais à la liberté</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Au-delà du logiciel"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
 "the same reasons that software must be free, and because the manuals are in "
@@ -869,11 +1128,21 @@
 "libres</a>, pour les mêmes raisons que les logiciels doivent être libres et 
"
 "parce que les manuels font en fait partie des logiciels."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+# | The same arguments also make sense for other kinds of works of practical
+# | use &mdash; that is to say, works that embody useful knowledge, such as
+# | educational works and reference works.  <a
+# | href=\"http{+s+}://wikipedia.org\">Wikipedia</a> is the best-known example.
+#, fuzzy
+#| msgid ""
+#| "The same arguments also make sense for other kinds of works of practical "
+#| "use &mdash; that is to say, works that embody useful knowledge, such as "
+#| "educational works and reference works.  <a href=\"http://wikipedia.org";
+#| "\">Wikipedia</a> is the best-known example."
 msgid ""
 "The same arguments also make sense for other kinds of works of practical use "
 "&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a href=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 "Les mêmes arguments peuvent aussi s'appliquer à d'autres types d'œuvres à 
"
@@ -881,7 +1150,7 @@
 "utile, tels que le matériel pédagogique et les ouvrages de référence. <a "
 "href=\"http://wikipedia.org\";>Wikipédia</a> en est l'exemple le plus connu."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Any kind of work <em>can</em> be free, and the definition of free software "
 "has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
@@ -893,30 +1162,10 @@
 "d'œuvre."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Open Source ?"
-
-#. type: Content of: <div><p>
-msgid ""
-"Another group uses the term &ldquo;open source&rdquo; to mean something "
-"close (but not identical) to &ldquo;free software&rdquo;.  We prefer the "
-"term &ldquo;free software&rdquo; because, once you have heard that it refers "
-"to freedom rather than price, it calls to mind freedom.  The word &ldquo;"
-"open&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html\"> never "
-"refers to freedom</a>."
-msgstr ""
-"Un autre groupe utilise le terme « open source » pour exprimer quelque 
chose "
-"de proche, mais pas identique au « logiciel libre ». Nous préférons le 
terme "
-"« logiciel libre ». En effet, une fois qu'on a compris que ce terme se "
-"rapporte à la liberté plutôt qu'au prix, il appelle la notion de liberté. 
Le "
-"mot « open » <a href=\"/philosophy/open-source-misses-the-point.html\">ne 
"
-"renvoie jamais à la liberté</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Historique"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "From time to time we revise this Free Software Definition.  Here is the list "
 "of substantive changes, along with links to show exactly what was changed."
@@ -925,7 +1174,7 @@
 "clarifier. Voici une liste de ces modifications de fond, ainsi que les "
 "liens, pour montrer exactement ce qui a changé."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.168&amp;r2=1.169\">Version 1.169</a>: Explain more clearly "
@@ -940,7 +1189,7 @@
 "exécuter le programme et de le supprimer (on n'a donc pas besoin de définir 
"
 "séparément ces conditions)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -952,7 +1201,7 @@
 "nuisances arbitraires du code ne rendent pas caduque la liberté 0 et que les 
"
 "libertés 1 et 3 permettent aux utilisateurs de les éliminer."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -963,7 +1212,7 @@
 "liberté d'exécuter le programme signifie que rien ne vous empêche de le "
 "faire fonctionner."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
@@ -973,7 +1222,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a> précise quel code "
 "doit être libre."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
@@ -983,7 +1232,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a> répète chaque fois "
 "que la liberté 0 est la liberté d'exécuter le programme comme on veut."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
@@ -993,7 +1242,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: la liberté 0 ne fait 
"
 "pas intervenir la fonctionnalité du programme."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
@@ -1004,7 +1253,7 @@
 "peut pas exiger qu'on se conforme à une licence non libre d'un autre "
 "programme."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1016,7 +1265,7 @@
 "qu'il est permis de choisir le droit applicable et de spécifier la cour "
 "compétente (cela a toujours été notre politique)."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1028,7 +1277,7 @@
 "l'exportation est un véritable problème s'il tire à conséquence ; 
autrement, "
 "ce n'est qu'un problème potentiel."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -1041,7 +1290,7 @@
 "modifications. Et les modifications ne se limitent pas à des "
 "« améliorations »."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1056,7 +1305,7 @@
 "<em>permissions</em> supplémentaires pour les utilisations de ce travail en "
 "le publiant d'une autre manière en parallèle."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
@@ -1069,7 +1318,7 @@
 "liberté 1 implique d'utiliser effectivement votre version modifiée pour "
 "votre travail informatique."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
@@ -1079,7 +1328,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a> précise que le code "
 "rendu illisible <i>[obfuscated]</i> n'est pas considéré comme du code 
source."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
@@ -1092,7 +1341,7 @@
 "modifiée ou améliorée, et non le droit de participer au développement 
d'un "
 "projet tiers."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -1102,7 +1351,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a> : la liberté 3 inclut 
le "
 "droit de distribuer des versions modifiées en tant que logiciel libre."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
@@ -1112,7 +1361,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a> : la liberté 1 doit 
être "
 "concrète, pas seulement théorique ; autrement dit, pas de tivoïsation."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1124,7 +1373,7 @@
 "changement rétroactif de la licence est inacceptable, même si ce n'est pas "
 "décrit comme un remplacement complet."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1136,7 +1385,7 @@
 "quatre points insuffisamment explicites, ou bien mentionnés en divers "
 "endroits mais pas pris en compte partout :"
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "\"Improvements\" does not mean the license can substantively limit what "
 "kinds of modified versions you can release.  Freedom 3 includes distributing "
@@ -1147,7 +1396,7 @@
 "comprend la distribution des versions modifiées, pas seulement des "
 "changements ;"
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid ""
 "The right to merge in existing modules refers to those that are suitably "
 "licensed."
@@ -1155,19 +1404,19 @@
 "le droit d'incorporer des modules existants se réfère à ceux qui sont sous 
"
 "une licence appropriée ;"
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Explicitly state the conclusion of the point about export controls."
 msgstr ""
 "énonce explicitement la conclusion du point se rapportant au contrôle des "
 "exportations ;"
 
-#. type: Content of: <ul><li><ul><li>
+#. type: Content of: <div><ul><li><ul><li>
 msgid "Imposing a license change constitutes revoking the old license."
 msgstr ""
 "imposer un changement de licence constitue une révocation de l'ancienne "
 "licence."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
@@ -1177,7 +1426,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a> : ajout de la section "
 "« Au-delà du logiciel »."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
@@ -1188,7 +1437,7 @@
 "personne l'objectif doit être pris en compte, dans « la liberté 
d'exécuter "
 "le programme, pour tous les usages »."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
@@ -1198,7 +1447,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a> précise la formulation "
 "relative aux licences basées sur des contrats."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
@@ -1210,7 +1459,7 @@
 "libre doit vous autoriser à utiliser d'autres logiciels libres disponibles "
 "pour créer vos modifications."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1222,7 +1471,7 @@
 "acceptable qu'une licence vous oblige à fournir les sources des versions "
 "logicielles que vous mettez à disposition du public."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1234,7 +1483,7 @@
 "acceptable qu'une licence vous oblige à vous identifier en tant qu'auteur de 
"
 "modifications. Ce texte apporte d'autres précisions mineures."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1244,7 +1493,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a> s'intéresse aux "
 "problèmes potentiels relatifs aux licences basées sur des contrats."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
@@ -1254,7 +1503,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a> explique pourquoi la "
 "distribution de binaires est importante."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
@@ -1266,7 +1515,7 @@
 "libre peut vous obliger à envoyer une copie des versions que vous distribuez 
"
 "aux développeurs précédents, sur demande."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are gaps in the version numbers shown above because there are other "
 "changes in this page that do not affect the definition or its "
@@ -1285,11 +1534,11 @@
 "gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log\">interface "
 "cvsweb</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Note"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
 "The reason they are numbered 0, 1, 2 and 3 is historical. Around 1990 there "
 "were three freedoms, numbered 1, 2 and 3. Then we realized that the freedom "
@@ -1349,14 +1598,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -1367,9 +1616,15 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2019, 2021-] {+2009-2021+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 1996, 2002, 2004-2007, 2009-2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
 "Foundation, Inc."
@@ -1396,3 +1651,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid "Open Source?"
+#~ msgstr "Open Source ?"