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 ?"

Index: free-sw.hr-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.hr-diff.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- free-sw.hr-diff.html        30 May 2021 19:32:29 -0000      1.43
+++ free-sw.hr-diff.html        16 Jul 2021 10:02:23 -0000      1.44
@@ -11,8 +11,11 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
-&lt;title&gt;What is free software?
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</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;
 <span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
 .note { margin-left: 6%; margin-right: 6%; }
@@ -22,25 +25,17 @@
 --&gt;&lt;/style&gt;</em></ins></span>
 &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;
+<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;
 
-&lt;h2&gt;What is free software?&lt;/h2&gt;
-
-<span class="inserted"><ins><em>&lt;div class="article"&gt;</em></ins></span>
-&lt;h3&gt;The Free Software Definition&lt;/h3&gt;
-
-<span class="removed"><del><strong>&lt;blockquote&gt;</strong></del></span>
+&lt;h3&gt;The</strong></del></span> Free <span 
class="removed"><del><strong>Software Definition&lt;/h3&gt;
 
-<span class="inserted"><ins><em>&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;</em></ins></span>
+&lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
 particular software program qualifies as free software.  From time to
@@ -49,18 +44,11 @@
 below for a list of changes that affect the definition of free
 software.
 &lt;/p&gt;
-<span class="removed"><del><strong>&lt;/blockquote&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&gt;</em></ins></span>
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>Software?&lt;/h2&gt;
+&lt;div class="thin"&gt;&lt;/div&gt;
 
+&lt;div class="article"&gt;
+&lt;div 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
@@ -75,6 +63,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
@@ -85,9 +81,77 @@
 an instrument of unjust power&lt;/a&gt;.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt; The four essential 
freedoms&lt;/h4&gt;</em></ins></span>
+&lt;p&gt;
+<span class="inserted"><ins><em>&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;
+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 &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 four essential freedoms&lt;/h4&gt;
+&lt;p&gt;</em></ins></span>
 A program is free software if the program's users have the
 four essential freedoms: <span class="inserted"><ins><em>&lt;a 
href="#f1"&gt;[1]&lt;/a&gt;</em></ins></span>
 &lt;/p&gt;
@@ -127,68 +191,65 @@
 consider a program A which automatically launches a program B to
 handle some cases.  If we plan</em></ins></span> to distribute <span 
class="removed"><del><strong>(freedoms 2</strong></del></span> <span 
class="inserted"><ins><em>A as it stands, that
 implies users will need B, so we need to judge whether both 
A</em></ins></span> and <span class="removed"><del><strong>3) means 
you</strong></del></span> <span class="inserted"><ins><em>B</em></ins></span>
-are <span class="inserted"><ins><em>free.  However, if we plan to modify A so 
that it doesn't use B,
+are <span class="removed"><del><strong>free</strong></del></span> <span 
class="inserted"><ins><em>free.  However, if we plan</em></ins></span> to
+<span class="removed"><del><strong>redistribute copies, either with or without 
modifications, either
+gratis or charging</strong></del></span> <span 
class="inserted"><ins><em>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;
 
+
+&lt;h4 id="selling"&gt;Free software &lt;em&gt;can&lt;/em&gt; be 
commercial&lt;/h4&gt;
+
 &lt;p&gt;
 &ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.
-On the contrary, a free program must be available for commercial use,
+On the contrary,</em></ins></span> a <span 
class="removed"><del><strong>fee</strong></del></span> <span 
class="inserted"><ins><em>free program must be available</em></ins></span> for 
<span class="removed"><del><strong>distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  
Being</strong></del></span> <span class="inserted"><ins><em>commercial use,
 commercial development, and commercial distribution.  This policy is
 of fundamental importance&mdash;without this,</em></ins></span> free <span 
class="inserted"><ins><em>software could not
 achieve its aims.
 &lt;/p&gt;
 
 &lt;p&gt;
-We want</em></ins></span> to
-<span class="removed"><del><strong>redistribute copies, either with or without 
modifications, either
-gratis or charging</strong></del></span> <span 
class="inserted"><ins><em>invite everyone to use the GNU system, including 
businesses
-and their workers.  That requires allowing commercial use.  We hope
-that free replacement programs will supplant comparable proprietary
-programs, but they can't do that if businesses are forbidden to use
+We want</em></ins></span> to <span class="removed"><del><strong>do these
+things means (among other things)</strong></del></span> <span 
class="inserted"><ins><em>invite everyone to use the GNU system, including 
businesses
+and their workers.  That requires allowing commercial use.  We 
hope</em></ins></span>
+that <span class="removed"><del><strong>you</strong></del></span> <span 
class="inserted"><ins><em>free replacement programs will supplant comparable 
proprietary
+programs, but they can't</em></ins></span> do <span 
class="removed"><del><strong>not have</strong></del></span> <span 
class="inserted"><ins><em>that if businesses are forbidden</em></ins></span> to 
<span class="removed"><del><strong>ask or pay</strong></del></span> <span 
class="inserted"><ins><em>use
 them.  We want commercial products that contain software to include
-the GNU system, and that would constitute commercial distribution 
for</em></ins></span>
-a <span class="removed"><del><strong>fee</strong></del></span> <span 
class="inserted"><ins><em>price.  Commercial development of free software is no 
longer
+the GNU system, and that would constitute commercial 
distribution</em></ins></span> for <span 
class="removed"><del><strong>permission</strong></del></span>
+<span class="inserted"><ins><em>a price.  Commercial development of free 
software is no longer
 unusual; such free commercial software is very important.  Paid,
-professional support</em></ins></span> for <span 
class="removed"><del><strong>distribution,</strong></del></span> <span 
class="inserted"><ins><em>free software fills an important need.
+professional support for free software fills an important need.
 &lt;/p&gt;
 
 &lt;p&gt;
-Thus,</em></ins></span> to
-<span class="removed"><del><strong>&lt;a href="#exportcontrol"&gt;anyone 
anywhere&lt;/a&gt;.  Being</strong></del></span> <span 
class="inserted"><ins><em>exclude commercial use, commercial development or 
commercial
-distribution would hobble the</em></ins></span> free <span 
class="inserted"><ins><em>software community and obstruct its
-path</em></ins></span> to <span class="removed"><del><strong>do these
-things means (among other things)</strong></del></span> <span 
class="inserted"><ins><em>success.  We must conclude</em></ins></span> that 
<span class="removed"><del><strong>you do</strong></del></span> <span 
class="inserted"><ins><em>a program licensed with such
-restrictions does</em></ins></span> not <span 
class="removed"><del><strong>have</strong></del></span> <span 
class="inserted"><ins><em>qualify as free software.
+Thus,</em></ins></span> to <span class="removed"><del><strong>do 
so.</strong></del></span> <span class="inserted"><ins><em>exclude commercial 
use, commercial development or commercial
+distribution would hobble the 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.</em></ins></span>
 &lt;/p&gt;
 
 &lt;p&gt;
-A free program must offer the four freedoms</em></ins></span> to <span 
class="removed"><del><strong>ask</strong></del></span> <span 
class="inserted"><ins><em>any would-be user that
+<span class="removed"><del><strong>You should also have</strong></del></span>
+<span class="inserted"><ins><em>A free program must offer</em></ins></span> 
the <span class="removed"><del><strong>freedom</strong></del></span> <span 
class="inserted"><ins><em>four freedoms</em></ins></span> to <span 
class="removed"><del><strong>make modifications and use them
+privately</strong></del></span> <span class="inserted"><ins><em>any would-be 
user that
 obtains a copy of the software, who has complied thus far with the
-conditions of the free license covering the software in any previous
+conditions of the free license covering the software</em></ins></span> in 
<span class="removed"><del><strong>your own work</strong></del></span> <span 
class="inserted"><ins><em>any previous
 distribution of it.  Putting some of the freedoms off limits to some
-users,</em></ins></span> or <span class="removed"><del><strong>pay
-for permission</strong></del></span> <span class="inserted"><ins><em>requiring 
that users pay, in money or in kind,</em></ins></span> to <span 
class="removed"><del><strong>do so.</strong></del></span> <span 
class="inserted"><ins><em>exercise
+users,</em></ins></span> or <span class="removed"><del><strong>play, without 
even mentioning</strong></del></span> <span 
class="inserted"><ins><em>requiring</em></ins></span> that <span 
class="removed"><del><strong>they
+exist.  If you do publish your changes, you should not be required to
+notify anyone</strong></del></span> <span class="inserted"><ins><em>users 
pay,</em></ins></span> in <span 
class="removed"><del><strong>particular,</strong></del></span> <span 
class="inserted"><ins><em>money</em></ins></span> or in <span 
class="removed"><del><strong>any particular way.</strong></del></span> <span 
class="inserted"><ins><em>kind, to exercise
 them, is tantamount to not granting the freedoms in question, and thus
 renders the program nonfree.</em></ins></span>
 &lt;/p&gt;
 
-&lt;p&gt;
-You <span class="removed"><del><strong>should also</strong></del></span> <span 
class="inserted"><ins><em>may</em></ins></span> have <span 
class="removed"><del><strong>the freedom</strong></del></span> <span 
class="inserted"><ins><em>paid money</em></ins></span> to <span 
class="removed"><del><strong>make modifications and use them
-privately in your own work</strong></del></span> <span 
class="inserted"><ins><em>get copies of a free program,</em></ins></span> or 
<span class="removed"><del><strong>play, without even mentioning that they
-exist.  If</strong></del></span> you <span class="removed"><del><strong>do 
publish</strong></del></span> <span class="inserted"><ins><em>may
-have obtained copies at no charge.  But regardless of how you 
got</em></ins></span> your <span 
class="removed"><del><strong>changes,</strong></del></span>
-<span class="inserted"><ins><em>copies,</em></ins></span> you <span 
class="removed"><del><strong>should not be required</strong></del></span> <span 
class="inserted"><ins><em>always have the freedom</em></ins></span> to
-<span class="removed"><del><strong>notify anyone in particular, or in any 
particular way.</strong></del></span> <span class="inserted"><ins><em>copy and 
change the software,
-even to &lt;a href="/philosophy/selling.html"&gt;sell 
copies&lt;/a&gt;.</em></ins></span>
-&lt;/p&gt;
 
-<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 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.&lt;/p&gt;
 
-&lt;h4&gt;The freedom to run the program as you 
wish&lt;/h4&gt;</em></ins></span>
+&lt;h4 id="run-the-program"&gt;The freedom to run the program as you 
wish&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -225,7 +286,7 @@
 all&rdquo; if that is what</em></ins></span> you <span 
class="removed"><del><strong>find or develop</strong></del></span> <span 
class="inserted"><ins><em>wish.  So there is no need for</em></ins></span> a 
<span class="removed"><del><strong>way</strong></del></span>
 <span class="inserted"><ins><em>separate &ldquo;freedom not to run a 
program.&rdquo;&lt;/p&gt;
 
-&lt;h4&gt;The freedom</em></ins></span> to <span 
class="inserted"><ins><em>study the source code and</em></ins></span> make 
<span class="removed"><del><strong>them.
+&lt;h4 id="make-changes"&gt;The freedom</em></ins></span> to <span 
class="inserted"><ins><em>study the source code and</em></ins></span> make 
<span class="removed"><del><strong>them.
 &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>changes&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
@@ -269,7 +330,8 @@
 Thus, freedom 1 includes the &ldquo;freedom to delete the program.&rdquo;
 &lt;/p&gt;
 
-&lt;h4&gt;The freedom to redistribute if you wish: basic 
requirements&lt;/h4&gt;
+&lt;h4 id="redistribute"&gt;The 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
@@ -290,7 +352,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;
@@ -311,13 +373,13 @@
 <span class="inserted"><ins><em>make them.</em></ins></span>
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Copyleft&lt;/h4&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h4 
id="copyleft"&gt;Copyleft&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 <span class="removed"><del><strong>However, certain</strong></del></span>
 <span class="inserted"><ins><em>Certain</em></ins></span> kinds of rules about 
the manner of distributing free
 software are acceptable, when they don't conflict with the central
-freedoms.  For example, <span 
class="removed"><del><strong>copyleft</strong></del></span> <span 
class="inserted"><ins><em>&lt;a 
href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
+freedoms.  For example, <span 
class="removed"><del><strong>copyleft</strong></del></span> <span 
class="inserted"><ins><em>&lt;a 
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
@@ -346,7 +408,7 @@
 obtained copies at no charge.  But regardless of how you got your copies,
 you always have the freedom to copy</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;h4&gt;Rules about 
packaging</em></ins></span> and <span class="removed"><del><strong>change the 
software, even to 
+<span class="inserted"><ins><em>&lt;h4 id="packaging"&gt;Rules about 
packaging</em></ins></span> and <span class="removed"><del><strong>change the 
software, even to 
 &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
 &lt;/p&gt;
 
@@ -390,10 +452,10 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Export 
regulations&lt;/h4&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h4 id="exportcontrol"&gt;Export 
regulations&lt;/h4&gt;</em></ins></span>
 
 &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
@@ -414,7 +476,7 @@
 software nonfree.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Legal considerations&lt;/h4&gt;
+<span class="inserted"><ins><em>&lt;h4 id="legal-details"&gt;Legal 
considerations&lt;/h4&gt;
 
 &lt;p&gt;
 In order for these freedoms to be real, they must be permanent and
@@ -438,7 +500,7 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Contract-based 
licenses&lt;/h4&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h4 id="contracts"&gt;Contract-based 
licenses&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
@@ -459,23 +521,24 @@
 it is nonfree.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Use the right words when talking 
about free software&lt;/h4&gt;</em></ins></span>
-
-&lt;p&gt;
+<span class="removed"><del><strong>&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 
+as &ldquo;piracy&rdquo; embody opinions</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 <span 
class="removed"><del><strong>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
+are Worth Avoiding&lt;/a&gt; for a discussion of</strong></del></span> <span 
class="inserted"><ins><em>interpret</em></ins></span> these <span 
class="removed"><del><strong>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;
-
-<span class="inserted"><ins><em>&lt;h4&gt;How we interpret these 
criteria&lt;/h4&gt;</em></ins></span>
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>criteria&lt;/h4&gt;</em></ins></span>
 
 &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
@@ -488,7 +551,7 @@
 it easier to see why certain licenses do or don't qualify.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Get help with free 
licenses&lt;/h4&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h4 id="get-help"&gt;Get help with free 
licenses&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
@@ -512,7 +575,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;,
@@ -524,7 +608,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;
 
@@ -534,17 +618,18 @@
 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 <span class="removed"><del><strong>has started 
using</strong></del></span> <span 
class="inserted"><ins><em>uses</em></ins></span> the term &ldquo;open 
source&rdquo; to mean
+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; &lt;a 
href="/philosophy/open-source-misses-the-point.html"&gt;
 never refers to freedom&lt;/a&gt;.
-&lt;/p&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;hr class="column-limit" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;h3 id="History"&gt;History&lt;/h3&gt;
 
@@ -685,19 +770,21 @@
 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;
 
-<span class="inserted"><ins><em>&lt;h3 
style="font-size:1em"&gt;Footnote&lt;/h3&gt;
+&lt;h3 class="footnote"&gt;Footnote&lt;/h3&gt;
 &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
 the freedom to run the program needed to be mentioned explicitly.
 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;</em></ins></span>
+&lt;/ol&gt;
+&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
@@ -715,13 +802,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;
 
@@ -742,7 +829,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; <span 
class="removed"><del><strong>1996-2002,</strong></del></span> <span 
class="inserted"><ins><em>1996, 2002,</em></ins></span> 2004-2007, <span 
class="removed"><del><strong>2009, 2010, 2012, 2013</strong></del></span> <span 
class="inserted"><ins><em>2009-2019, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span 
class="removed"><del><strong>1996-2002,</strong></del></span> <span 
class="inserted"><ins><em>1996, 2002,</em></ins></span> 2004-2007, <span 
class="removed"><del><strong>2009, 2010, 2012, 2013</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"
@@ -754,7 +841,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:32:29 $
+$Date: 2021/07/16 10:02:23 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: free-sw.hr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.hr.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- free-sw.hr.po       30 May 2021 19:32:29 -0000      1.55
+++ free-sw.hr.po       16 Jul 2021 10:02:23 -0000      1.56
@@ -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: 2014-04-12 09:34+0100\n"
 "Last-Translator: Martina Bebek <martinaporec@gmail.com>\n"
 "Language-Team: GNU Croatian Translation Team <www-hr-lista@gnu.org>\n"
@@ -22,7 +22,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 "Å to je slobodni softver? - Projekt GNU - Zaklada za slobodni softver"
 
 #. type: Attribute 'content' of: <meta>
@@ -43,46 +47,14 @@
 "računalni korisnici imali slobodu razmjenjivati i poboljšavati softver koji 
"
 "koriste."
 
-#. 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 "Å to je slobodni softver?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definicija slobodnog softvera"
-
-#. 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>
-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 ""
-"Definicija slobodnog softvera predstavlja kriterij po kojemu se određeni "
-"program može svrstati u kategoriju slobodnog softvera. S vremena na vrijeme "
-"revidiramo ovu definiciju kako bismo pojasnili ili razriješili neke fine "
-"razlike u značenjima. Na kraju ovog dokumenta nalazi se <a href=\"#History"
-"\">dio o povijesti izmjena</a> koje utječu na definiciju slobodnog softvera."
-
-#. 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,
@@ -118,7 +90,41 @@
 "razumijevanja, koncept  treba promatrati u smislu slobode govora, ne cijene."
 "<sup><a href=\"#TransNote1\">1</a></sup>. "
 
-#. 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 ""
+"Slobodni softver nije netržišni, nekomercijalni softver. Slobodni softver "
+"mora biti dostupan za tržišnu upotrebu, tržišno razvijanje i tržišnu "
+"distribuciju. Tržišno razvijanje slobodnog softvera više nije neobično; "
+"takav je softver vrlo važan. Možda ste platili kopije slobodnog softvera, "
+"možda ste ih dobili besplatno – ma kako vi došli do kopija, uvijek imate "
+"slobodu ponovno ih i mijenjati i kopirati – pa čak i <a 
href=\"/philosophy/"
+"selling.html\">prodavati</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 +142,138 @@
 "\"/philosophy/free-software-even-more-important.html\">instrumentom "
 "nepravedne moći</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 ""
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Sadržaj"
+
+#. 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 "Definicija slobodnog softvera"
+
+#. 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 "Definicija slobodnog softvera"
+
+#. 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 ""
+"Definicija slobodnog softvera predstavlja kriterij po kojemu se određeni "
+"program može svrstati u kategoriju slobodnog softvera. S vremena na vrijeme "
+"revidiramo ovu definiciju kako bismo pojasnili ili razriješili neke fine "
+"razlike u značenjima. Na kraju ovog dokumenta nalazi se <a href=\"#History"
+"\">dio o povijesti izmjena</a> koje utječu na definiciju slobodnog softvera."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | A program is free software if the program's users have the four essential
 # | freedoms: {+<a href=\"#f1\">[1]</a>+}
 #, fuzzy
@@ -153,7 +286,7 @@
 msgstr ""
 "Program je slobodan ako korisnici programa imaju četiri osnovne slobode: "
 
-#. 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
@@ -163,7 +296,7 @@
 msgstr ""
 "Sloboda pokretanja programa kako želite, u bilo koje svrhe (sloboda 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 "
@@ -173,7 +306,7 @@
 "aktivnosti koje želite (sloboda 1). Dostupnost je izvornog kôda za to "
 "preduvjet. "
 
-#. 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
@@ -183,7 +316,7 @@
 msgid "The freedom to redistribute copies so you can help others (freedom 2)."
 msgstr "Sloboda distribucije kopijâ kako biste pomogli bližnjemu (sloboda 
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 "
@@ -194,7 +327,7 @@
 "izmjene koriste cijeloj zajednici. Dostupnost je izvornog kôda za to "
 "preduvjet."
 
-#. 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 "
@@ -206,7 +339,7 @@
 "o tome koliko su pojedine neslobodne distribucijske sheme udaljene od onoga "
 "što se smatra slobodnim; mi ih ipak sve smatramo jednako neetičnima."
 
-#. 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 "
@@ -217,7 +350,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, "
@@ -226,7 +363,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 "
@@ -239,7 +376,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 "
@@ -247,7 +384,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 "
@@ -258,56 +395,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 ""
-"Slobodni softver nije netržišni, nekomercijalni softver. Slobodni softver "
-"mora biti dostupan za tržišnu upotrebu, tržišno razvijanje i tržišnu "
-"distribuciju. Tržišno razvijanje slobodnog softvera više nije neobično; "
-"takav je softver vrlo važan. Možda ste platili kopije slobodnog softvera, "
-"možda ste ih dobili besplatno – ma kako vi došli do kopija, uvijek imate "
-"slobodu ponovno ih i mijenjati i kopirati – pa čak i <a 
href=\"/philosophy/"
-"selling.html\">prodavati</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 "
@@ -327,7 +430,7 @@
 "drugom, on je tada slobodan pokrenuti program za svoje i vi nemate pravo toj "
 "osobi nametati svoje namjene."
 
-#. 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 "
@@ -336,7 +439,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, "
@@ -347,18 +450,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,
@@ -386,7 +489,7 @@
 "nerazumljiv (obfuscated) &ldquo;izvorni kôd&rdquo; nije pravi izvorni kôd i 
"
 "ne može se smatrati izvornim kôdom."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | 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 else's modified versions but refuse to run yours &mdash; a
@@ -426,7 +529,7 @@
 "binarne datoteke nisu slobodni softver iako je izvorni kôd iz kojeg su "
 "prevedene slobodan."
 
-#. 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,7 +543,7 @@
 "posjednik autorskih prava bilo kojeg dodanog koda, tada je licencija odviše "
 "restriktivna da bi se mogla kvalificirati slobodnom."
 
-#. 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 "
@@ -450,18 +553,18 @@
 "da mijenjate program ograničeno na izmjene koje netko drugi smatra "
 "poboljšanjem, takav se program ne može smatrati slobodnim."
 
-#. 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 "
@@ -476,7 +579,7 @@
 "mogućnosti to činiti znači da (između ostaloga)  za takve radnje nije "
 "potrebno prethodno tražiti ili platiti odobrenje."
 
-#. 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 "
@@ -487,11 +590,25 @@
 "u vašem poslu ili igri bez ikakve obveze spominjanja njihova postojanja. Ako 
"
 "izmjene objavite, niste obvezni nikoga i ni na koji način upozoriti."
 
-#. 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 +618,7 @@
 "html\">copyleftu</a>. Naravno, licencija koja zahtijeva da se izmijenjene "
 "inačice objavljuju kao neslobodne, ne može se smatrati slobodnom 
licencijom."
 
-#. 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 "
@@ -520,18 +637,19 @@
 "imati slobodu distribuiranja takvih oblika kako bi pronašli ili razvili "
 "način njihove izrade."
 
-#. 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 "
@@ -544,7 +662,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."
@@ -555,7 +673,7 @@
 "koje vam pri distribuciji programa zabranjuje ograničavanje slobode drugima. 
"
 "Ovo pravilo nije u sukobu s osnovnim slobodama; zapravo ih Å¡titi."
 
-#. 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/"
@@ -574,11 +692,11 @@
 "<a href=\"/philosophy/categories.html\">kategorije</a> slobodni softver, "
 "softver zaštićen copyleftom, ali i druge kategorije."
 
-#. 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 "
@@ -597,7 +715,7 @@
 "ne sprječavaju u objavljivanju vaše izmjene; budući da ionako već radite "
 "izmjene na programu, vjerojatvno vam neće biti teško napraviti i te."
 
-#. 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 "
@@ -617,7 +735,7 @@
 "su i pravila koja zahtijevaju objavu izvornog kôda korisnicima za inačice "
 "koje ste stavili u javnu upotrebu."
 
-#. 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 "
@@ -633,21 +751,42 @@
 "postoji pogodno postrojenje za upravljanje pseudonimima koje vam dopušta da "
 "odredite ime originala kao pseudonim izmijenjene inačice."
 
-#. 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 ""
 "Ponekad vladini propisi o <a id=\"exportcontrol\">kontroli izvoza</a> i "
 "trgovinske sankcije mogu utjecati na slobodu distribuiranja kopija u "
@@ -659,7 +798,7 @@
 "poslušnost kojem od netrivijalnih propisa o izvozu kao uvjetu za "
 "ostvarivanje osnovnih sloboda."
 
-#. 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 "
@@ -675,11 +814,11 @@
 "budući da ga daljnje izmjene u zakonu koji se odnosi na izvoz mogu učiniti "
 "netrivijalnim te tako predstaviti program neslobodnim."
 
-#. 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 "
@@ -692,7 +831,7 @@
 "retroaktivnog ograničavanja pravila – a da uzrok tomu nije vaše 
zlonamjerno "
 "djelovanje – program nije slobodan. "
 
-#. 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 "
@@ -706,7 +845,7 @@
 "korisnik koristi neslobodan program, to bi značilo prihvaćanje licencije i "
 "tih neslobodnih programa; time licencija postaje neslobodnom."
 
-#. 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."
@@ -714,11 +853,11 @@
 "Dozvoljeno je da slobodna licencija navodi pod koju zakonsku nadležnost "
 "ulazi, gdje bi se parnice trebale održati, ili oboje."
 
-#. 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-"
@@ -738,7 +877,7 @@
 "znači da postoje mnogi načini na koje takva licencija može biti "
 "neprihvatljivo ograničavajuća i neslobodna."
 
-#. 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 "
@@ -751,48 +890,54 @@
 "koje nije spomenuto ovdje kao legitimno, morali bismo posebno razmotriti i "
 "vjerojatno bismo zaključili da je riječ o neslobodnoj licenciji."
 
-#. 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 ""
-"Govoreći o slobodnom softveru, najbolje je izbjegavati riječi poput &ldquo;"
-"dijeliti&rdquo; ili &ldquo;dati besplatno&rdquo;, one impliciraju pitanje "
-"cijene, ne slobode. Neki uobičajeni termini kao što je &ldquo;"
-"piratstvo&rdquo; označavaju način razmišljanja koji, nadamo se, ne "
-"odobravate. Pogledajte <a href=\"/philosophy/words-to-avoid.html"
-"\">zbunjujuće riječi i izraze koje je najbolje izbjegavati</a> u takvim "
-"raspravama. Također imamo popis ispravnih <a href=\"/philosophy/fs-"
-"translations.html\">prijevoda &ldquo;slobodnog softvera&rdquo;</a> i na "
-"razne jezike."
+#. 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 "Definicija slobodnog softvera"
 
-#. 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 ""
 "Napokon, primijetite da kriteriji, kakvi su iskazani u ovoj definiciji "
 "slobodnog softvera, zahtijevaju savjesno promišljanje kako bi se ispravno "
@@ -807,11 +952,11 @@
 "bismo olakšali razumijevanje razloga zbog kojih se određene licencije "
 "kvalificiraju ili ne kvalificiraju."
 
-#. 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 "
@@ -825,7 +970,7 @@
 "o toj licenciji na adresu elektroničke pošte <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 "
@@ -839,7 +984,7 @@
 "možda vam možemo pomoći predlaganjem postojeće licencije koja odgovara 
vašim "
 "potrebama."
 
-#. 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 "
@@ -849,11 +994,66 @@
 "možete biti sigurni da će nova licencija zaista biti licencija slobodnog "
 "softvera te time možete izbjeći različite praktične probleme."
 
-#. 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 ""
+"Govoreći o slobodnom softveru, najbolje je izbjegavati riječi poput &ldquo;"
+"dijeliti&rdquo; ili &ldquo;dati besplatno&rdquo;, one impliciraju pitanje "
+"cijene, ne slobode. Neki uobičajeni termini kao što je &ldquo;"
+"piratstvo&rdquo; označavaju način razmišljanja koji, nadamo se, ne "
+"odobravate. Pogledajte <a href=\"/philosophy/words-to-avoid.html"
+"\">zbunjujuće riječi i izraze koje je najbolje izbjegavati</a> u takvim "
+"raspravama. Također imamo popis ispravnih <a href=\"/philosophy/fs-"
+"translations.html\">prijevoda &ldquo;slobodnog softvera&rdquo;</a> i na "
+"razne jezike."
+
+#. 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 ""
+"Jedna je druga grupa počela koristiti termin &ldquo;otvoreni izvorni "
+"kôd&rdquo; (en. open source) kako bi označila nešto blisko (ali ne "
+"identično) &ldquo;slobodnom softveru&rdquo;. Više volimo termin “slobodan 
"
+"softver” jer kada se sloboda spominje i u nazivu, cijeli termin odmah "
+"asocira na slobodu. Riječ <a 
href=\"/philosophy/open-source-misses-the-point."
+"html\">&ldquo;otvoreni&rdquo;</a> nikada ne podsjeća na slobodu."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Nakon softvera"
 
-#. 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 "
@@ -863,11 +1063,21 @@
 "slobodni</a> iz istih razloga zbog kojih softver mora biti slobodan, "
 "priručnici su zapravio dio računalnog programa."
 
-#. 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 ""
 "Isti argumenti također imaju smisla za druge vrste djela praktične 
upotrebe, "
@@ -875,7 +1085,7 @@
 "obrazovanje i referentna djela. <a href=\"http://wikipedia.org\";>Wikipedija</"
 "a> je najbolje znani primjer."
 
-#. 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/\";> "
@@ -886,45 +1096,10 @@
 "\">slobodnih kulturoloških djela</a> primjenjivu na bilo koju vrstu djela."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Otvoreni izvorni kod?"
-
-#. 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 ""
-"Jedna je druga grupa počela koristiti termin &ldquo;otvoreni izvorni "
-"kôd&rdquo; (en. open source) kako bi označila nešto blisko (ali ne "
-"identično) &ldquo;slobodnom softveru&rdquo;. Više volimo termin “slobodan 
"
-"softver” jer kada se sloboda spominje i u nazivu, cijeli termin odmah "
-"asocira na slobodu. Riječ <a 
href=\"/philosophy/open-source-misses-the-point."
-"html\">&ldquo;otvoreni&rdquo;</a> nikada ne podsjeća na slobodu."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Povijest"
 
-#. 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."
@@ -933,7 +1108,7 @@
 "nalazi popis važnijih izmjena zajedno sa poveznicama kako bi se vidjelo što 
"
 "se točno mijenjalo."
 
-#. 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.130&amp;r2=1.131\";>Version
 # | 1.131</a>: A free license may-]
@@ -960,7 +1135,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Inačica 1.131</a>: Slobodna licencija "
 "ne mora tražiti suglasnost neslobodne licencije drugog programa."
 
-#. 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>:-]
@@ -984,35 +1159,35 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Inačica 1.46</a>: Pojasni čija svrha je "
 "značajna u slobodi da se pokreće program u bilo koje svrhe."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1022,7 +1197,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Inačica 1.131</a>: Slobodna licencija "
 "ne mora tražiti suglasnost neslobodne licencije drugog programa."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1034,7 +1209,7 @@
 "je dozvoljen odabir nadležnog zakonodavstva i nadležnog suda. (Ovo je "
 "oduvijek bilo naše stajalište.)"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1046,7 +1221,7 @@
 "postaje problem ako uvjeti izvoza nisu trivijalni, u suprotnom se radi samo "
 "potencijalno o problemu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1058,7 +1233,7 @@
 "je ograničen na vaše pravo na izmjenu, ne na promjene koje ste već "
 "napravili. Izmjene nisu ograničene na “poboljšanja”."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1072,7 +1247,7 @@
 "autorskih prava mogu uvijek dodijeliti dodatna dopuštenja za uporabu djela "
 "objavljivanjem djela paralelno na drugi način."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1084,7 +1259,7 @@
 "izjavi slobode 1, svrhu (već izjavljenu u inačici 1.80) da sloboda uistinu "
 "uključuje uporabu vaše izmijenjene inačice u vašim računalnim 
aktivnostima. "
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1094,7 +1269,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Inačica 1.92</a>: Pojasni da se namjerno "
 "višeznačan i nerazumljiv kod ne kvalificira kao izvorni kod. "
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1106,7 +1281,7 @@
 "znači pravo distribuiranja kopija vaše vlastite izmijenjene ili poboljšane 
"
 "inačice, ne pravo sudjelovanja u tuđem razvojnom projektu. "
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1116,7 +1291,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Inačica 1.89</a>: Sloboda 3 uključuje "
 "pravo objave izmijenjenih inačica kao slobodnog softvera."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1126,7 +1301,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Inačica 1.80</a>: Sloboda 1 mora biti "
 "praktična, ne samo teoretska, to jest, bez tivoizacije."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1138,7 +1313,7 @@
 "retroaktivne izmjene u licenci neprihvatljive, čak iako nisu opisane kao "
 "potpune zamjene. "
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1150,7 +1325,7 @@
 "točaka koje nisu bile dovoljno eksplicitne, ili su navedene na nekim "
 "mjestima, ali nisu odražene svugdje: "
 
-#. 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 "
@@ -1160,7 +1335,7 @@
 "izmijenjenih inačica koje možete objaviti. Sloboda 3 uključuje "
 "distribuiranje izmijenjenih inačica, ne samo izmjena. "
 
-#. 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."
@@ -1168,15 +1343,15 @@
 "Pravo uključivanja postojećih modula se odnosi na one koji su pogodno "
 "licencirani."
 
-#. 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 "Eksplicitno navedi zaključak o smislu kontrole izvoza."
 
-#. 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 "Nametanje izmjene licence tvori opoziv stare 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 "
@@ -1186,7 +1361,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Inačica 1.57</a>: Dodaj odjeljak &quot;"
 "Nakon softvera&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 "
@@ -1196,7 +1371,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Inačica 1.46</a>: Pojasni čija svrha je "
 "značajna u slobodi da se pokreće program u bilo koje svrhe."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1206,7 +1381,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Inačica 1.41</a>: Pojasni formulaciju o "
 "licencama baziranima na ugovoru. "
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1218,7 +1393,7 @@
 "licenca mora dopustiti vama da koristite drugi dostupni slobodan softver da "
 "biste napravili vaše preinake."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1230,7 +1405,7 @@
 "prihvatljivo za licencu da zahtijeva od vas da pružite izvorni kod za "
 "inačice softvera kojeg stavljate u javnu upotrebu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1242,7 +1417,7 @@
 "prihvatljivo za licencu da zahtijeva od vas da se identificirate kao autor "
 "preinaka. Druga manja pojašnjenja kroz tekst."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1252,7 +1427,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Inačica 1.23</a>: Adresiraj potencijalne "
 "probleme vezane uz licence bazirane na ugovoru. "
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1262,7 +1437,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Inačica 1.16</a>: Objasni zašto je "
 "distribucija binarnih datoteka važna."
 
-#. 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.10&amp;r2=1.11\";>Version
 # | 1.11</a>: Note that a free license may require you to send a copy of
@@ -1285,7 +1460,7 @@
 "licenca može zahtijevati od vas da autoru pošaljete kopiju inačice koju "
 "distribuirate."
 
-#. 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 "
@@ -1302,14 +1477,14 @@
 "izmjena na stranici kroz <a href=\"http://web.cvs.savannah.gnu.org/viewvc/";
 "www/philosophy/free-sw.html?root=www&amp;view=log\">cvsweb</a> sučelje."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | Footnote[-s-]
 #, fuzzy
 #| msgid "Footnotes"
 msgid "Footnote"
 msgstr "Fusnote."
 
-#. 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 "
@@ -1350,14 +1525,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 ""
 "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko kvalitetne "
@@ -1370,14 +1551,14 @@
 
 #. type: Content of: <div><p>
 # | Copyright &copy; [-1996-2002,-] {+1996, 2002,+} 2004-2007, [-2009, 2010,
-# | 2012, 2013-] {+2009-2019, 2021+} Free Software Foundation, Inc.
+# | 2012, 2013-] {+2009-2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 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, 2013 Free Software "
 "Foundation, Inc."
@@ -1404,6 +1585,22 @@
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Otvoreni izvorni kod?"
+
+#~ 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 ""
+#~ "Radimo naporno i dajemo sve od sebe da bi pružili točne, visoko "
+#~ "kvalitetne prijevode. Međutim, nismo oslobođeni od nesavršenosti. Molim 
"
+#~ "vas šaljite vaše komentare i općenite prijedloge u tom smislu na <a 
href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Za informacije o koordiniranju i slanju prijevoda naših mrežnih "
+#~ "stranica, pogledajte <a href=\"/server/standards/README.translations.html"
+#~ "\">README za prijevode</a>."
+
 #~ msgid ""
 #~ "The rest of this page clarifies certain points about what makes specific "
 #~ "freedoms adequate or not."

Index: free-sw.id.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.id.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- free-sw.id.po       3 Feb 2021 13:03:03 -0000       1.14
+++ free-sw.id.po       16 Jul 2021 10:02:23 -0000      1.15
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy/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,12 +18,12 @@
 "Outdated-Since: 2001-12-21 17:06+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 "Definisi Perangkat Lunak Bebas - Proyek GNU - Free Software Foundation"
 
 #. type: Attribute 'content' of: <meta>
@@ -45,56 +45,14 @@
 "GNU, sehingga para pengguna komputer dapat secara bebas berbagi serta "
 "mempercanggih perangkat lunak yang mereka gunakan."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr ""
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definisi Perangkat Lunak Bebas"
-
-#. 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 ""
-"Kami mempertahankan definisi perangkat lunak bebas ini untuk menunjukkan "
-"secara jelas perihal persyaratan sebuah program perangkat lunak disebut "
-"perangkat lunak bebas."
-
-#. 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 "Definisi Perangkat Lunak Bebas"
 
-#. 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 +81,31 @@
 "memahami konsep ini, silakan bayangkan tentang “kebebasan berbicara”, dan 
"
 "bukannya “bir gratis.”"
 
-#. 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 ""
+"Jadi, anda mungkin harus membayar untuk mendapatkan perangkat lunak GNU, "
+"atau mungkin juga anda mendapatkannya secara cuma-cuma.  Terlepas dari cara "
+"mendapatkan perangkat lunak tersebut, anda akan selalu bebas untuk menyalin "
+"dan mengubah perangkat lunak tersebut, atau pun <a href=\"/philosophy/"
+"selling.html\">untuk menjualnya</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 +116,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 "Daftar Isi"
+
+#. 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 "Definisi Perangkat Lunak Bebas"
+
+#. 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 "Definisi Perangkat Lunak Bebas"
+
+#. 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 ""
+"Kami mempertahankan definisi perangkat lunak bebas ini untuk menunjukkan "
+"secara jelas perihal persyaratan sebuah program perangkat lunak disebut "
+"perangkat lunak bebas."
+
+#. 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
@@ -158,7 +277,7 @@
 "meningkatkan kinerja perangkat lunak. Tepatnya, mengacu pada empat jenis "
 "kebebasan bagi para pengguna perangkat lunak:"
 
-#. 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 +287,7 @@
 msgstr ""
 "Kebebasan untuk menjalankan programnya untuk tujuan apa saja (kebebasan 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 +304,7 @@
 "disesuaikan dengan kebutuhan anda (kebebasan 1).  Akses pada kode program "
 "merupakan suatu prasyarat."
 
-#. 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 +316,7 @@
 "Kebebasan untuk menyebarluaskan kembali hasil salinan perangkat lunak "
 "tersebut sehingga dapat membantu sesama anda (kebebasan 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 +337,7 @@
 "khalayak umum sehingga semua menikmati keuntungannya (kebebasan 3).  Akses "
 "pada kode program merupakan suatu prasyarat juga."
 
-#. 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 +345,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 +356,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 +369,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 +382,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 +390,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,46 +401,22 @@
 "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 ""
-"Jadi, anda mungkin harus membayar untuk mendapatkan perangkat lunak GNU, "
-"atau mungkin juga anda mendapatkannya secara cuma-cuma.  Terlepas dari cara "
-"mendapatkan perangkat lunak tersebut, anda akan selalu bebas untuk menyalin "
-"dan mengubah perangkat lunak tersebut, atau pun <a href=\"/philosophy/"
-"selling.html\">untuk menjualnya</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
@@ -348,7 +447,7 @@
 "jenis apa pun, untuk kegiatan apa pun, tanpa perlu memberitahu para "
 "pengembang atau pun pihak-pihak lainnya secara khusus."
 
-#. 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 "
@@ -357,7 +456,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, "
@@ -368,18 +467,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
@@ -405,7 +504,7 @@
 "tersebut. Jadi, memiliki akses tersebut merupakan syarat mutlak untuk "
 "perangkat lunak bebas."
 
-#. 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 +516,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 "
@@ -426,25 +525,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
@@ -475,7 +574,7 @@
 "melakukan semua hal di atas berarti anda tidak harus meminta atau pun "
 "membayar untuk ijin tersebut."
 
-#. 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 "
@@ -488,16 +587,16 @@
 "mengedarkan perubahan tersebut, anda seharusnya tidak perlu memberitahu "
 "siapa pun dengan cara apa pun."
 
-#. 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
@@ -528,18 +627,19 @@
 "tersebut, namun perlu ada kebebasan penyebarluasannnya, jika dikemudian hari "
 "ditemukan cara untuk memproduksinya."
 
-#. 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 "
@@ -552,7 +652,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."
@@ -565,7 +665,7 @@
 "sesuai dengan hakikat inti dari kebebasan. Hal ini tidak bertentangan dengan "
 "hakikat inti dari kebebasan itu sendiri, justru aturan ini melindunginya."
 
-#. 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\">
@@ -611,11 +711,11 @@
 "antara “perangkat lunak bebas,” “perangkat lunak copyleft” serta 
kategori "
 "perangkat lunak lainnya."
 
-#. 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
@@ -655,7 +755,7 @@
 "ketentuan yang sama (Perhatikan bahwa aturan tersebut masih memberikan anda "
 "pilihan untuk menentukan apakah program itu akan dipublikasikan atau tidak)."
 
-#. 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 "
@@ -667,7 +767,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 "
@@ -677,20 +777,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</"
@@ -701,15 +802,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 ""
 "Terkadang sebuah pemerintah mengeluarkan <a id=\"exportcontrol\">aturan "
 "pembatasan ekspor</a> perdagangan yang dapat membatasi kebebasan anda untuk "
@@ -721,7 +822,7 @@
 "pengaruh apa pun, baik terhadap sebuah kegiatan mau pun terhadap pihak-pihak "
 "di luar wilayah hukum pemerintah tersebut."
 
-#. 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 "
@@ -731,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
@@ -760,7 +861,7 @@
 "menyebabkan seperti itu, maka program tersebut tidak dapat disebut sebagai "
 "perangkat lunak bebas."
 
-#. 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 "
@@ -769,17 +870,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-"
@@ -791,7 +892,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 "
@@ -799,68 +900,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;,-] {+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 [-\"free
-# | software\"</a>-] {+&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 "
-#| "\"free software\"</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 ""
-"Jika membicarakan perihal perangkat lunak bebas, sebaiknya jangan "
-"menggunakan istilah seperti “cuma-cuma,” “gratisan,” dan sejenisnya; 
karena "
-"istilah tersebut mengacu pada harga, dan bukannya kebebasan.  Kami harap, "
-"bahwa anda juga menghindari istilah seperti “pembajakan.” Lihat juga 
daftar "
-"<a href=\"/philosophy/words-to-avoid.html\">Istilah-istilah Membingungkan "
-"yang Sebaiknya Dihindari</a>.  Kami juga memiliki daftar <a href=\"/"
-"philosophy/fs-translations.html\">terjemahan “perangkat lunak bebas”</a> 
ke "
-"dalam beberapa bahasa."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Definisi Perangkat Lunak Bebas"
 
-#. 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 "
@@ -875,17 +939,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 ""
 "Akhir kata, perhatikan bahwa kriteria perangkat lunak bebas pada tulisan ini "
 "membutuhkan kehati-hatian dalam interpretasinya.  Untuk menetapkan apakah "
@@ -899,11 +963,11 @@
 "mencapai mufakat, terkadang kami mengubah kriteria perangkat lunak bebas ini "
 "untuk memudahkan penilaian kelayakan lisensi serupa berikutnya."
 
-#. 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 "
@@ -918,7 +982,7 @@
 "butuhkan dengan menghubungi kami di <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 "
@@ -927,52 +991,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 [-\"free
+# | software\"</a>-] {+&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 "
+#| "\"free software\"</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 ""
+"Jika membicarakan perihal perangkat lunak bebas, sebaiknya jangan "
+"menggunakan istilah seperti “cuma-cuma,” “gratisan,” dan sejenisnya; 
karena "
+"istilah tersebut mengacu pada harga, dan bukannya kebebasan.  Kami harap, "
+"bahwa anda juga menghindari istilah seperti “pembajakan.” Lihat juga 
daftar "
+"<a href=\"/philosophy/words-to-avoid.html\">Istilah-istilah Membingungkan "
+"yang Sebaiknya Dihindari</a>.  Kami juga memiliki daftar <a href=\"/"
+"philosophy/fs-translations.html\">terjemahan “perangkat lunak bebas”</a> 
ke "
+"dalam beberapa bahasa."
 
-#. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "<cite>Open Source?</cite>"
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Another group [-has started using-] {+uses+} the term [-<a
 # | href=\"/philosophy/open-source-misses-the-point.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>.+}
+# | never refers to freedom.+}
 #, fuzzy
 #| msgid ""
 #| "Another group has started using the term <a href=\"/philosophy/open-"
@@ -983,24 +1060,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 ""
 "Ada pihak yang memulai menggunakan istilah <a href=\"/philosophy/open-source-"
 "misses-the-point.html\"><i>open source</i></a> untuk mengartikan sesuatu "
 "yang mirip (tapi tidak sama)  dengan “perangkat lunak bebas”."
 
-#. 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 "
@@ -1009,7 +1111,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 "
@@ -1017,42 +1119,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 "
@@ -1060,7 +1162,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 "
@@ -1068,7 +1170,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 "
@@ -1076,7 +1178,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 "
@@ -1085,7 +1187,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 "
@@ -1093,14 +1195,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 "
@@ -1108,21 +1210,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 "
@@ -1130,7 +1232,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 "
@@ -1138,49 +1240,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 "
@@ -1188,7 +1290,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 "
@@ -1196,7 +1298,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 "
@@ -1204,21 +1306,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 "
@@ -1226,7 +1328,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 "
@@ -1237,14 +1339,14 @@
 "view=log\">cvsweb interface</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | Footnote[-s-]
 #, fuzzy
 #| msgid "Footnotes"
 msgid "Footnote"
 msgstr "Catatan Kaki"
 
-#. 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 "
@@ -1280,14 +1382,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 ""
 "Jika anda berminat untuk menjadi relawan-penerjemah, atau ingin memberikan "
@@ -1300,8 +1411,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 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1327,6 +1438,21 @@
 msgid "Updated:"
 msgstr "Perubahan terakhir:"
 
+#~ msgid "Open Source?"
+#~ msgstr "<cite>Open Source?</cite>"
+
+#~ 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 ""
+#~ "Jika anda berminat untuk menjadi relawan-penerjemah, atau ingin "
+#~ "memberikan masukan dalam bahasa Indonesia, atau hanya sekedar ingin tahu "
+#~ "lebih lanjut, silakan <a href=\"/server/standards/translations/id/"
+#~ "indoteam.id.html\">mengunjungi laman tersebut</a>. Silakan juga merujuk "
+#~ "berkas <a href=\"/server/standards/README.translations.html\">panduan "
+#~ "menerjemahkan</a> untuk informasi tambahan."
+
 #, fuzzy
 #~| msgid ""
 #~| "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  "

Index: free-sw.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.it.po,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- free-sw.it.po       27 Jun 2021 08:59:49 -0000      1.175
+++ free-sw.it.po       16 Jul 2021 10:02:23 -0000      1.176
@@ -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: 2021-06-27 10:51+0200\n"
 "Last-Translator: Dora Scilipoti\n"
 "Language-Team: Italian\n"
@@ -16,12 +16,17 @@
 "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.4.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 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 "Cos'è il Software Libero? - Progetto GNU - Free Software Foundation"
 
 # type: Attribute 'content' of: <meta>
@@ -46,60 +51,15 @@
 "utilizzano."
 
 # type: Content of: <h2>
-#. 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 "Cos'è il Software Libero?"
 
-# type: Content of: <h3>
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definizione di Software Libero"
-
-#. 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 ""
-"Avete una domanda sulle licenze libere e non trovate la risposta in questa "
-"pagina? Provate con le nostre altree <a href=\"http://www.fsf.org/licensing";
-"\">pagine sulle licenze</a> oppure se necessario contattate (in inglese) FSF "
-"Compliance Lab all'indirizzo <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 definizione di Software Libero chiarisce quali sono i requisiti che un "
-"certo programma deve soddisfare perché lo si possa considerare &ldquo;"
-"software libero&rdquo;. La definizione viene occasionalmente sottoposta a "
-"revisioni per chiarificarla o spiegare come interpretare alcune sfumature. "
-"Per analizzare le modifiche effettuate basta leggere la sezione <a href="
-"\"#History\">Storia</a> nel seguito."
-
-#. 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 ""
-"Il cosiddetto &ldquo;Open source&rdquo; è diverso: ha una filosofia diversa "
-"basata su valori diversi; benché la definizione pratica sia diversa, in "
-"traltà praticamente tutti i programmi \"open source\" sono liberi. "
-"Spieghiamo la differenza in <a href=\"/philosophy/open-source-misses-the-"
-"point.html\"> un articolo dedicato</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, "
@@ -120,7 +80,20 @@
 "francese e spagnolo, per disambiguare [NdT: il termine free in inglese "
 "significa sia gratuito che libero, in italiano il problema non esiste]."
 
-#. 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 ""
+"Potreste aver pagato per una copia di un programma libero, o potreste averne "
+"ottenuto copie gratuitamente. Ma a prescindere da come lo si è ottenuto, "
+"rimane sempre la libertà di copiare e modificare il software, o anche di <a "
+"href=\"/philosophy/selling.it.html\">venderne copie</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 "
@@ -139,11 +112,194 @@
 "philosophy/free-software-even-more-important.html\"> uno strumento di abuso</"
 "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 ""
+"Il cosiddetto &ldquo;Open source&rdquo; è diverso: ha una filosofia diversa "
+"basata su valori diversi; benché la definizione pratica sia diversa, in "
+"traltà praticamente tutti i programmi \"open source\" sono liberi. "
+"Spieghiamo la differenza in <a href=\"/philosophy/open-source-misses-the-"
+"point.html\"> un articolo dedicato</a>."
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Indice"
+
+# type: Content of: <h3>
+#. 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 "Definizione di Software Libero"
+
+#. 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 "Le quattro libertà essenziali"
+
+#. 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 "Chiariamento del confine tra software libero e non libero"
+
+# 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 "Libertà di eseguire il programma come si desidera"
+
+#. 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 "Libertà di studiare il codice sorgente ed apportare modifiche"
+
+# 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 "Libertà di ridistribuire copie se si desidera: requisiti di 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 "Regole sulla produzione di pacchetti e sulla distribuzione"
+
+#. 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 "Licenze basate sui contratti"
+
+#. 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 "Come interpretiamo questi criteri"
+
+#. 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 "Ottenere assistenza sulle licenze libere"
+
+#. 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 "Usare le parole giuste quando si parla di software libero"
+
+#. 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 ""
+"Avete una domanda sulle licenze libere e non trovate la risposta in questa "
+"pagina? Provate con le nostre altree <a href=\"http://www.fsf.org/licensing";
+"\">pagine sulle licenze</a> oppure se necessario contattate (in inglese) FSF "
+"Compliance Lab all'indirizzo <a href=\"mailto:licensing@fsf.org";
+"\">licensing@fsf.org</a>."
+
+# type: Content of: <h3>
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Definizione di Software Libero"
+
+# 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 definizione di Software Libero chiarisce quali sono i requisiti che un "
+"certo programma deve soddisfare perché lo si possa considerare &ldquo;"
+"software libero&rdquo;. La definizione viene occasionalmente sottoposta a "
+"revisioni per chiarificarla o spiegare come interpretare alcune sfumature. "
+"Per analizzare le modifiche effettuate basta leggere la sezione <a href="
+"\"#History\">Storia</a> nel seguito."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "Le quattro libertà essenziali"
 
-#. 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>"
@@ -152,7 +308,7 @@
 "quattro libertà fondamentali: <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 ""
@@ -160,7 +316,7 @@
 "(libertà 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 "
@@ -171,13 +327,13 @@
 "ne è un prerequisito."
 
 # 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 ""
 "Libertà di ridistribuire copie in modo da aiutare gli altri (libertà 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 "
@@ -189,7 +345,7 @@
 "in modo tale che tutta la comunità ne tragga beneficio (libertà 3).  "
 "L'accesso al codice sorgente ne è un prerequisito."
 
-#. 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 "
@@ -201,7 +357,7 @@
 "non liberi si possono differenziare a seconda di quanto si distanziano "
 "dall'essere liberi, ma per noi sono tutti non etici allo stesso modo."
 
-#. 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 "
@@ -219,7 +375,11 @@
 "programmi A e B è libera. Altrimenti, se vogliamo modificare A in modo che "
 "non usi B, dovrà essere libero solo A e non ci importa di 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, "
@@ -233,7 +393,7 @@
 "importanza fondamentale &mdash; senza questa il software libero non potrebbe "
 "raggiungere i suoi obiettivi."
 
-#. 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 @@
 "importante. Il supporto professionale a pagamento per il software libero "
 "soddisfa un importante bisogno."
 
-#. 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 @@
 "programma la cui licenza prevede queste restrizioni non può essere "
 "considerato software libero."
 
-#. 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 @@
 "forma, per poterle esercitare, equivale a non garantire le libertà in "
 "questione, e quindi rende il programma non libero."
 
-# 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 ""
-"Potreste aver pagato per una copia di un programma libero, o potreste averne "
-"ottenuto copie gratuitamente. Ma a prescindere da come lo si è ottenuto, "
-"rimane sempre la libertà di copiare e modificare il software, o anche di <a "
-"href=\"/philosophy/selling.it.html\">venderne copie</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 "Chiariamento del confine tra software libero e non libero"
 
-#. 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 @@
 "programma sia libero."
 
 # 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 "Libertà di eseguire il programma come si desidera"
 
 # 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 "
@@ -340,7 +491,7 @@
 "scopi; se lo ridistribuite a qualcun altro, egli è libero di eseguirlo per i 
"
 "propri scopi, ma non potete imporgli i vostri scopi."
 
-#. 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 "
@@ -354,7 +505,7 @@
 "funzionare in un determinato ambiente, o se è utile per una specifica "
 "attività."
 
-#. 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,7 +524,7 @@
 "agli utenti e alle comunità di creare e distribuire versioni modificate "
 "senza il codice di disturbo arbitrario."
 
-#. 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 "
@@ -384,12 +535,12 @@
 "necessità di una libertà aggiuntiva &ldquo;di non eseguire un "
 "programma&ldquo;."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "Libertà di studiare il codice sorgente ed apportare modifiche"
 
 # 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 @@
 "può essere considerato tale."
 
 # 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 "
@@ -428,7 +579,7 @@
 "libero."
 
 # 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 "
@@ -444,7 +595,7 @@
 "restrittiva per essere considerata libera."
 
 # 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 "
@@ -455,7 +606,7 @@
 "sostanza, a variazioni che qualcun altro considera miglioramenti, quel "
 "programma non è libero."
 
-#. 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 "
@@ -467,12 +618,12 @@
 "cancellare il programma.&rdquo;"
 
 # 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 "Libertà di ridistribuire copie se si desidera: requisiti di base"
 
 # 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 "
@@ -487,7 +638,7 @@
 "chiedere o pagare alcun permesso."
 
 # 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 "
@@ -500,11 +651,25 @@
 "particolare o in qualche modo particolare."
 
 # 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 ""
@@ -516,7 +681,7 @@
 "categorizzare come licenza libera."
 
 # 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 "
@@ -535,16 +700,31 @@
 "caratteristica), ma si deve avere la libertà di ridistribuire tali forme nel 
"
 "caso si trovi o si sviluppi un modo per farlo."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "Il 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."
@@ -559,7 +739,7 @@
 "protegge."
 
 # 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/"
@@ -578,12 +758,12 @@
 "libero</a> per una discussione più ampia delle relazioni tra &ldquo;software 
"
 "libero&rdquo;, &ldquo;software con copyleft&rdquo; e altre categorie."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Regole sulla produzione di pacchetti e sulla distribuzione"
 
 # 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 "
@@ -605,7 +785,7 @@
 "faticherete troppo ad apportarne qualcuna in più."
 
 # 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 "
@@ -626,7 +806,7 @@
 "richiedano di distribuire il codice sorgente agli utenti delle versioni che "
 "avete pubblicamente distribuito sono accettabili."
 
-#. 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 "
@@ -643,22 +823,43 @@
 "funzionalità che permetta di specificare il nome originario del programma "
 "come alias della versione modificata."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Regole sull'esportazione"
 
 # 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 ""
 "Qualche volta le <a id=\"exportcontrol\">leggi sul controllo delle "
 "esportazioni</a> e le sanzioni sul commercio possono limitare la libertà di "
@@ -671,7 +872,7 @@
 "il rispetto di un controllo (non banale) sulle esportazioni come condizione "
 "sull'esercizio di una qualsiasi delle libertà essenziali."
 
-#. 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 "
@@ -688,12 +889,12 @@
 "sull'esportazione potrebbero rendere non banale quel requisito e quindi fare "
 "diventare non libero il software."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Considerazioni legali"
 
 # 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 "
@@ -707,7 +908,7 @@
 "una più restrittiva, anche senza che l'utente sia causa di tale revoca, il "
 "software non è libero."
 
-#. 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 "
@@ -722,7 +923,7 @@
 "l'utente rispetti la licenza di tali programmi non liberi, e renderebbe non "
 "libera la licenza in questione."
 
-#. 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."
@@ -731,12 +932,12 @@
 "applica, o quale sede è designata per dirimere le controversie, o entrambe "
 "le cose."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Licenze basate sui contratti"
 
 # 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-"
@@ -757,7 +958,7 @@
 "inaccettabilmente restrittiva e non libera una licenza del genere."
 
 # 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 "
@@ -770,49 +971,56 @@
 "fare, e non citata qui come legittima, dovremmo esaminare il caso, ma "
 "probabilmente concluderemmo che la licenza non è libera."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Usare le parole giuste quando si parla di software libero"
-
-# 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 ""
-"Quando si parla di software libero, è meglio evitare di usare espressioni "
-"come &ldquo;regalato&rdquo; o &ldquo;gratuito&rdquo;, perché esse pongono "
-"l'attenzione sul prezzo, e non sulla libertà.  Parole comuni quali &ldquo;"
-"pirateria&rdquo; implicano opinioni che speriamo non vogliate sostenere.  Si "
-"veda <a href=\"/philosophy/words-to-avoid.html\">Termini da evitare</a> per "
-"una discussione su queste parole.  Abbiamo anche una lista di <a href=\"/"
-"philosophy/fs-translations.html\">traduzioni</a> in varie lingue "
-"dell'espressione &ldquo;software libero&rdquo;."
+# type: Content of: <h3>
+#. 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 "Definizione di Software Libero"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Come interpretiamo questi criteri"
 
 # 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 ""
 "Infine, si noti che criteri come quelli indicati in questa definizione di "
 "software libero richiedono un'attenta interpretazione.  Per decidere se una "
@@ -827,12 +1035,12 @@
 "problema, spesso aggiorniamo questi criteri per fare in modo che sia più "
 "facile capire perché determinate licenze siano adeguate o meno."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Ottenere assistenza sulle licenze libere"
 
 # 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 "
@@ -848,7 +1056,7 @@
 "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 "
@@ -863,7 +1071,7 @@
 "soddisfi le vostre necessità."
 
 # 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 "
@@ -873,13 +1081,70 @@
 "nostro aiuto potrete essere sicuri che la licenza sia davvero una licenza di "
 "software libero ed evitare vari problemi pratici."
 
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Usare le parole giuste quando si parla di software libero"
+
+# 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 ""
+"Quando si parla di software libero, è meglio evitare di usare espressioni "
+"come &ldquo;regalato&rdquo; o &ldquo;gratuito&rdquo;, perché esse pongono "
+"l'attenzione sul prezzo, e non sulla libertà.  Parole comuni quali &ldquo;"
+"pirateria&rdquo; implicano opinioni che speriamo non vogliate sostenere.  Si "
+"veda <a href=\"/philosophy/words-to-avoid.html\">Termini da evitare</a> per "
+"una discussione su queste parole.  Abbiamo anche una lista di <a href=\"/"
+"philosophy/fs-translations.html\">traduzioni</a> in varie lingue "
+"dell'espressione &ldquo;software libero&rdquo;."
+
+# 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 ""
+"Un altro gruppo usa il termine &ldquo;open source&rdquo; per indicare "
+"qualcosa di simile (ma non identico) al &ldquo;software libero&rdquo; (o "
+"&ldquo;free software&rdquo;). Preferiamo il termine &ldquo;software "
+"libero&rdquo; perché, una volta chiarita (nella dizione inglese) la "
+"precisazione sul fatto che si parla di libertà e non di prezzo, <a href=\"/"
+"philosophy/open-source-misses-the-point.html\">fa subito pensare alla "
+"libertà</a>, la parola &ldquo;open&rdquo; (o &ldquo;aperto&rdquo;) no."
+
 # type: Content of: <h2>
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Al di là 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 "
@@ -890,11 +1155,21 @@
 "e poiché i manuali sono 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 ""
 "Lo stesso ragionamento si applica ad altri tipi di lavori di utilizzo "
@@ -903,7 +1178,7 @@
 "è l'esempio più noto."
 
 # 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/\";> "
@@ -916,34 +1191,11 @@
 
 # type: Content of: <h2>
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Open Source?"
-
-# 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 ""
-"Un altro gruppo usa il termine &ldquo;open source&rdquo; per indicare "
-"qualcosa di simile (ma non identico) al &ldquo;software libero&rdquo; (o "
-"&ldquo;free software&rdquo;). Preferiamo il termine &ldquo;software "
-"libero&rdquo; perché, una volta chiarita (nella dizione inglese) la "
-"precisazione sul fatto che si parla di libertà e non di prezzo, <a href=\"/"
-"philosophy/open-source-misses-the-point.html\">fa subito pensare alla "
-"libertà</a>, la parola &ldquo;open&rdquo; (o &ldquo;aperto&rdquo;) no."
-
-# type: Content of: <h2>
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Storia"
 
 # 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."
@@ -953,7 +1205,7 @@
 "effettuate, con collegamenti che illustrano esattamente cosa è cambiato."
 
 # 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 "
@@ -969,7 +1221,7 @@
 "necessario indicarle come requisiti separati."
 
 # 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 "
@@ -982,7 +1234,7 @@
 "3 consentono agli utenti di rimuoverle."
 
 # 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 "
@@ -993,7 +1245,7 @@
 "libertà di eseguire il programma significa che nulla lo ostacola."
 
 # 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 "
@@ -1004,7 +1256,7 @@
 "quale codice deve essere libero."
 
 # 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 "
@@ -1016,7 +1268,7 @@
 "desidera."
 
 # 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 "
@@ -1027,7 +1279,7 @@
 "dipende dalle funzionalità del programma."
 
 # 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 "
@@ -1039,7 +1291,7 @@
 "non libero."
 
 # 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 "
@@ -1052,7 +1304,7 @@
 "già in essere."
 
 # 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 "
@@ -1065,7 +1317,7 @@
 "banale, altrimenti è solo un problema potenziale."
 
 # 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 "
@@ -1079,7 +1331,7 @@
 "miglioramenti&rdquo;."
 
 # 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 "
@@ -1094,7 +1346,7 @@
 "sull'uso dell'opera, rilasciando l'opera in parallelo in altro modo."
 
 # 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 "
@@ -1107,7 +1359,7 @@
 "che questo include che la versione modificabile sia davvero utilizzabile."
 
 # 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 "
@@ -1118,7 +1370,7 @@
 "offuscato non conta come codice sorgente."
 
 # 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 "
@@ -1132,7 +1384,7 @@
 "di sviluppo gestiti da altri."
 
 # 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 "
@@ -1143,7 +1395,7 @@
 "il diritto di rilasciare versioni modificate come software libero."
 
 # 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 "
@@ -1154,7 +1406,7 @@
 "essere pratica, non teorica; la \"tivoization\" non vale."
 
 # 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 "
@@ -1166,7 +1418,7 @@
 "licenza retroattive sono inaccettabili, non solo la completa sostituzione."
 
 # 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 "
@@ -1178,7 +1430,7 @@
 "punti non abbastanza espliciti, o citati in alcune parti ma non in altre:"
 
 # 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 "
@@ -1189,7 +1441,7 @@
 "distribuzione di versioni modificate, non dei soli cambiamenti."
 
 # 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."
@@ -1198,18 +1450,18 @@
 "una licenza opportuna."
 
 # 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 ""
 "Esplicitare la conclusione del punto sulla restrizione alle esportazioni."
 
 # 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 "Imporre un cambio di licenza comporta la revoca di quella precedente."
 
 # 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 "
@@ -1220,7 +1472,7 @@
 "Al di là del software&quot;."
 
 # 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 "
@@ -1232,7 +1484,7 @@
 "per ogni scopo\"."
 
 # 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 "
@@ -1243,7 +1495,7 @@
 "licenze basate sui contratti."
 
 # 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 "
@@ -1256,7 +1508,7 @@
 "per creare le vostre modifiche."
 
 # 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 "
@@ -1269,7 +1521,7 @@
 "versioni del software utilizzate pubblicamente."
 
 # 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 "
@@ -1282,7 +1534,7 @@
 "modifiche. Altre piccole correzioni nel testo."
 
 # 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 "
@@ -1293,7 +1545,7 @@
 "problemi legati alle licenze basate sui contratti."
 
 # 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 "
@@ -1304,7 +1556,7 @@
 "è importante la distribuzione dei file in formato binario."
 
 # 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 "
@@ -1317,7 +1569,7 @@
 "copia delle versioni modificate che distribuite."
 
 # 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 "
@@ -1336,11 +1588,11 @@
 "free-sw.html?root=www&amp;view=log\">interfaccia cvsweb</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Nota"
 
-#. 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 "
@@ -1382,14 +1634,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 ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -1403,9 +1655,15 @@
 "traduzioni</a>."
 
 #. 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."
@@ -1434,3 +1692,7 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+# type: Content of: <h2>
+#~ msgid "Open Source?"
+#~ msgstr "Open Source?"

Index: free-sw.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ja.po,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- free-sw.ja.po       1 Jul 2021 02:03:52 -0000       1.109
+++ free-sw.ja.po       16 Jul 2021 10:02:23 -0000      1.110
@@ -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: 2021-03-01 11:09+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -16,9 +16,12 @@
 "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"
 
 #. type: Content of: <title>
-msgid "What is 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プロジェクト - 
フリーソフトウェアファウンデーショ"
 "ン"
@@ -41,55 +44,13 @@
 "ピュータの利用者が自らが使うソフトウェアをå…
±æœ‰ã—改良する自由を有するよう、活"
 "動しています。"
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+#, 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>をご覧ください。そして必
要であれば、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 ""
-"自由ソフトウェアの定義は、ある特定のソフトウェア・プログラãƒ
 ãŒã€è‡ªç”±ã‚½ãƒ•ãƒˆ"
-"ウェアとして適æ 
¼ã§ã‚るかどうかの基準を示します。時に応じて、わたしたちはこの"
-"定義を改訂し、これを明確化し、また、本質的な問題に対する疑問を解決します。自"
-"由ソフトウェアの定義に関連する変更については、<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 ""
-"「オープンソース」は異なるものです: 
それは異なる価値にもとづいたとても違った"
-"理念を有します。その実際の定義も異なりますが、ほとんどすべてのオープンソース"
-"のプログラム
は実際に自由です。わたしたちはその違いを<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, "
@@ -108,7 +69,20 @@
 "くだ
さい。わたしたちは無償の意味ではないことを示すのに時ã€
…、「自由」を表すフ"
 
"ランス語あるいはスペイン語の言葉を借りて「リブレソフトウェア」と呼びます。"
 
-#. 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 ""
+"自由ソフトウェアのコピーを手にå…
¥ã‚Œã‚‹ã®ã«ãŠé‡‘を払った方もいるかも知れません"
+"し、コピーを無料で手にå…
¥ã‚ŒãŸæ–¹ã‚‚いるでしょう。しかしどのようにしてご自分のコ"
+"ピーを手にå…
¥ã‚ŒãŸã‹ã«ã¯é–¢ä¿‚なく、あなたにはいつでもソフトウェアをコピーし変更"
+"する自由があるのです。その自由には、<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 "
@@ -127,11 +101,166 @@
 "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 ""
+"「オープンソース」は異なるものです: 
それは異なる価値にもとづいたとても違った"
+"理念を有します。その実際の定義も異なりますが、ほとんどすべてのオープンソース"
+"のプログラム
は実際に自由です。わたしたちはその違いを<a 
href=\"/philosophy/"
+"open-source-misses-the-point.html\">なぜ「オープンソース」は自由ソフトウェア"
+"の的を外すのか</a>で説明しています。"
+
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+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>
+#, 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>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+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 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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>をご覧ください。そして必
要であれば、FSFのコンプライアンス・ラボ、<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>"
@@ -139,13 +268,13 @@
 "あるプログラム
が自由ソフトウェアであるとは、そのプログラムの利用者
が、以下の"
 "四つの必須の自由を有するときです: <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 ""
 "どんな目的に対しても、プログラム
を望むままに実行する自由 (第零の自由)。"
 
-#. 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 "
@@ -154,11 +283,11 @@
 "プログラムがどのように動作しているか研究し、必
要に応じて改造する自由 (第一の"
 
"自由)。ソースコードへのアクセスは、この前提条件となります。"
 
-#. 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 "ほかの人を助けられるよう、コピーを再é…
å¸ƒã™ã‚‹è‡ªç”± (第二の自由)。"
 
-#. 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 "
@@ -169,7 +298,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 "
@@ -181,7 +310,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 +329,11 @@
 "ないようにしようとするならば、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, "
@@ -213,7 +346,7 @@
 "ません。このポリシーは基本的な重要事項
の一つであり、これなしでは、自由ソフト"
 "ウェアはその目的を達しえないでしょう。"
 
-#. 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 +368,7 @@
 
"れる、プロフェッショナルの自由ソフトウェアのサポートは、重要な需要を満たしま"
 "す。"
 
-#. 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 "
@@ -247,7 +380,7 @@
 "う。そのような制限でライセンスされたプログラム
は自由ソフトウェアとして適格で"
 "はないと結論づけなければなりません。"
 
-#. 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 "
@@ -264,24 +397,13 @@
 
"とや、自由を行使するユーザに対して金品やその種の支払いを要求することは、当該"
 "の自由を与えないことに等しく、ですから、プログラム
を不自由としてしまいます。"
 
-#. 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 ""
-"自由ソフトウェアのコピーを手にå…
¥ã‚Œã‚‹ã®ã«ãŠé‡‘を払った方もいるかも知れません"
-"し、コピーを無料で手にå…
¥ã‚ŒãŸæ–¹ã‚‚いるでしょう。しかしどのようにしてご自分のコ"
-"ピーを手にå…
¥ã‚ŒãŸã‹ã«ã¯é–¢ä¿‚なく、あなたにはいつでもソフトウェアをコピーし変更"
-"する自由があるのです。その自由には、<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>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+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 "
@@ -290,11 +412,11 @@
 "ここからは、あるプログラム
が自由であるために、さまざまな自由がどれだけ拡張さ"
 "れる必
要があるか、いろいろな問題について、より正確に説明します。"
 
-#. 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 "
@@ -313,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 "
@@ -326,7 +448,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, "
@@ -343,7 +465,7 @@
 
"ぜなら、第一の自由と第三の自由が、ユーザとコミュニティが任意の迷惑のコードな"
 "しの改変されたバージョンを作成してé…
å¸ƒã™ã‚‹ã“とを許すからです。"
 
-#. 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 "
@@ -353,11 +475,11 @@
 "なし」を含みます。ですから、別の「プログラム
を実行しない自由」は必要ありませ"
 "ん。"
 
-#. 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>
 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 "
@@ -371,7 +493,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 "
@@ -390,7 +512,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 "
@@ -405,7 +527,7 @@
 
"求する)、そのライセンスは自由であるとするには、制限が強すぎるといえるでしょ"
 "う。"
 
-#. 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 "
@@ -415,7 +537,7 @@
 
"本質的に制限され、他の誰かが改良と考えなければいけないとすると、そのプログラ"
 "ムは自由ではありません。"
 
-#. 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 "
@@ -425,11 +547,11 @@
 "くるように削除したり、ほかのプログラム
を起動するようにさせることです。ですか"
 "ら、第一の自由は「プログラム
を削除する自由」を含みます。"
 
-#. 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 "
@@ -443,7 +565,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 "
@@ -455,11 +577,18 @@
 "え必
要とされずにです。もし、あなたがご自分の行った変更を発表するå
 ´åˆã§ã‚‚、特"
 
"定の誰かに、もしくは何か特定の方法で、それを知らせるå¿
…要はありません。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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 ""
@@ -469,7 +598,7 @@
 "センスである必
要はありません。しかし、変更した版は不自由であるとするライセン"
 "スは、自由ソフトウェアとして適æ 
¼ã§ã‚るとはいえません。"
 
-#. 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 "
@@ -487,15 +616,23 @@
 
"構いませんが、後にそういった形式を作成する方法を見つけたり開発したりするかも"
 "知れませんから、そのような形式で再é…
å¸ƒã™ã‚‹è‡ªç”±ãŒãªã‘ればなりません。"
 
-#. 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 ""
+#| "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."
@@ -506,7 +643,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/"
@@ -526,11 +663,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>
 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 "
@@ -550,7 +687,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 "
@@ -570,7 +707,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 "
@@ -586,21 +723,32 @@
 "ラム
の名前を変更版の別名として指定できるような適切なエイリアスの仕組みがある"
 "場合のみ容認できます。"
 
-#. 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>
+#, 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>と貿易制裁があなた"
 "が国際的にプログラムのコピーをé…
å¸ƒã™ã‚‹è‡ªç”±ã‚’束縛することがあります。ソフト"
@@ -611,7 +759,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 "
@@ -626,11 +774,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 "
@@ -644,7 +792,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 "
@@ -659,7 +807,7 @@
 "に準拠
することを要求するかもしれません。それはこのライセンスを不自由としてし"
 "まいます。"
 
-#. 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."
@@ -667,11 +815,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-"
@@ -690,7 +838,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 "
@@ -703,47 +851,42 @@
 
"れについて検討しないといけないでしょうし、そのライセンスは、不自由であると結"
 "論づけるかもしれません。"
 
-#. 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 ""
-"自由ソフトウェアについて語るとき、「タダであげる」とか「無料」といった言い回"
-"しは避けるのが最上です。というのも、こういった言い回しは問題としているのが値"
-"段であって、自由ではないような印象を与えるからです。「海賊版(piracy)」などの"
-"よく使われる用語もまた、わたしたちとしてはあなたが支持しないことを望む通説を"
-"具現しています。<a 
href=\"/philosophy/words-to-avoid.html\">避けた方が良い混"
-"乱を招く言葉と言い回し</a>でこういった用語について検討していますのでご参ç
…§ä¸‹"
-"さい。また<a 
href=\"/philosophy/fs-translations.html\">「自由ソフトウェア」の"
-"各言語訳</a>の一覧もご用意しています。"
+#. type: Content of: <div><div><h3>
+#, 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>
+#, 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 ""
 
"最後になりますが、この自由ソフトウェアの定義で述べられたような基準はその解釈"
 "に関して熟慮を必
要とすることに注意して下さい。ある特定のソフトウェアライセン"
@@ -757,11 +900,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 "
@@ -775,7 +918,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 "
@@ -789,7 +932,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 "
@@ -799,11 +942,58 @@
 
"援助によって、あなたはそのライセンスが本当に自由ソフトウェアのライセンスであ"
 
"ることを確実にでき、いくつもの実際的な問題を避けることができます。"
 
-#. 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 ""
+"自由ソフトウェアについて語るとき、「タダであげる」とか「無料」といった言い回"
+"しは避けるのが最上です。というのも、こういった言い回しは問題としているのが値"
+"段であって、自由ではないような印象を与えるからです。「海賊版(piracy)」などの"
+"よく使われる用語もまた、わたしたちとしてはあなたが支持しないことを望む通説を"
+"具現しています。<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 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 ""
+"別の人びとは、「オープンソース」という用語を「自由ソフトウェア」と近い(しかし"
+"同一ではない)ものを意味するのに使ます。わたしたちは「自由ソフトウェア」という"
+"用語のほうを好んでいます。それはいったん皆さんが「フリー」が値段ではなく自由"
+"について言及しているのだ
ということを聞けば、それが自由について思い起こさせて"
+"くれるからです。「オープン」という言葉が<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 "
@@ -813,18 +1003,24 @@
 
"ばなりません</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 "
+#| "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 ""
 
"他の種類の作品で実践的な利用をされるものについて同様な議論が意味を持つでしょ"
 "う。つまり、有用な知識をå…
·ä½“化する作品、教育作品やリファレンス作品などです。"
 "<a href=\"http://wikipedia.org\";>Wikipedia</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/\";> "
@@ -835,30 +1031,10 @@
 "のような種類の作品へも適用できます。"
 
 #. 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 ""
-"別の人びとは、「オープンソース」という用語を「自由ソフトウェア」と近い(しかし"
-"同一ではない)ものを意味するのに使ます。わたしたちは「自由ソフトウェア」という"
-"用語のほうを好んでいます。それはいったん皆さんが「フリー」が値段ではなく自由"
-"について言及しているのだ
ということを聞けば、それが自由について思い起こさせて"
-"くれるからです。「オープン」という言葉が<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."
@@ -866,7 +1042,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 "
@@ -880,7 +1056,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.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -892,7 +1068,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.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -902,7 +1078,7 @@
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 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 "
@@ -912,7 +1088,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 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 "
@@ -922,7 +1098,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</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.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
@@ -932,7 +1108,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</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.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
@@ -942,7 +1118,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 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 "
@@ -954,7 +1130,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.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -966,7 +1142,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 "
@@ -978,7 +1154,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.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -992,7 +1168,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 "
@@ -1004,7 +1180,7 @@
 "簡潔な文章で、(既に version 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 "
@@ -1014,7 +1190,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 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 "
@@ -1026,7 +1202,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 "
@@ -1036,7 +1212,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</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.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
@@ -1046,7 +1222,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: 
第一の自由は、単に理論的"
 "なだ
けでなく、実際的でなければならない(すなわち、Tivoization 
なしに)。"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1058,7 +1234,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.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1069,7 +1245,7 @@
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: 
4つの重要な点の説明は明"
 "示が充分でないか、他のところで述べられているがå…
¨ä½“に反映されていない:"
 
-#. 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 "
@@ -1079,7 +1255,7 @@
 
"的に制限することを意味しない。第三の自由は、変更そのものã
 ã‘でなく変更を加え"
 "た版も配布する自由を含む。"
 
-#. 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."
@@ -1087,16 +1263,16 @@
 
"存在するモジュールにマージする権利は、適切にライセンスされたモジュールについ"
 "て、である。"
 
-#. 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 "
@@ -1106,7 +1282,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 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 "
@@ -1116,7 +1292,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 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 "
@@ -1126,7 +1302,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 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 "
@@ -1138,7 +1314,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.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1150,7 +1326,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 "
@@ -1162,7 +1338,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.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1172,7 +1348,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 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 "
@@ -1182,7 +1358,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 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 "
@@ -1194,7 +1370,7 @@
 "が配布した版を以前の開発者
の要求に応じて送ることをあなたに要請することができ"
 "ることを述べた。"
 
-#. 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 "
@@ -1211,11 +1387,11 @@
 "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 "
@@ -1254,26 +1430,30 @@
 #.         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 ""
 
"正確で良い品質の翻訳を提供するよう努力していますが、不完å
…¨ãªå ´åˆã‚‚あるかと思"
 "います。翻訳に関するコメントと提案は、<a 
href=\"mailto:web-translators@gnu.";
 
"org\">&lt;web-translators@gnu.org&gt;</a>におねがいします。</p><p>わたしたち"
-"のウェブページの翻訳の調整と提出については、<a 
href=\"/server/standards/"
+"のウェブページの翻訳の調整と貢献については、<a 
href=\"/server/standards/"
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
+#, 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."
@@ -1298,6 +1478,9 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
+#~ msgid "Open Source?"
+#~ msgstr "オープンソース?"
+
 #~ msgid "Clarifying the line at various points"
 #~ msgstr "さまざまな点の区分を明確にする"
 

Index: free-sw.ko.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ko.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- free-sw.ko.po       31 May 2021 16:30:40 -0000      1.7
+++ free-sw.ko.po       16 Jul 2021 10:02:23 -0000      1.8
@@ -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 AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -19,7 +19,11 @@
 "Outdated-Since: 2000-02-25 00:00+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 프로젝트 - 자유 
소프트웨어"
 
 #. type: Attribute 'content' of: <meta>
@@ -40,41 +44,14 @@
 "해 주기 위해서, 1983년부터 자유 유닉스 형태의 운영체ì 
œì¸ GNU를 개발해 왔습니"
 "다."
 
-#. 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 ""
-
-#. 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 ""
-
-#. 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,
@@ -105,7 +82,37 @@
 "아닌 &ldquo;언론의 자유(free speech)&rdquo;와 같은 예를 생각해 
볼 수 있습니"
 "다."
 
-#. type: Content of: <div><p>
+# Missed update. This is a leftover from the 1997 version:
+#  
https://web.archive.org/web/19980126185518/www.gnu.org/philosophy/free-sw.html
+# This string was split on April 9, 1999, and 2 sentences were added to the 
second part:
+# 
https://web.archive.org/web/19990430060825/www.gnu.org/philosophy/free-sw.html
+#. type: Content of: <div><div><div><p>
+# | 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. In the GNU project, we use ``copyleft''-] {+software,
+# | even+} to [-protect these freedoms legally for everyone.-] {+<a
+# | href=\"/philosophy/selling.html\">sell copies</a>.+}
+#, fuzzy
+#| msgid ""
+#| "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. In the GNU "
+#| "project, we use ``copyleft'' to protect these freedoms legally for "
+#| "everyone."
+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 ""
+"GNU 소프트웨어를 사용하기 위해서 지불된 비용의 유무에 
상관없이 일단, 소프트웨"
+"어를 입수한 뒤에는 이를 복제하고 수정할 수 있는 자유가 
제한 없이 주어집니다. "
+"GNU 프로젝트는 이러한 자유를 모든 사용자들에게 실질ì 
ìœ¼ë¡œ 보장하기 위해서 저"
+"작권의 양도에 관한 실정법에 의해서 그 법률적 효력이 
인정될 수 있는 '카피 레프"
+"트(copyleft)'라는 새로운 개념을 도입하고 있습니다."
+
+#. type: Content of: <div><div><p>
 # | [-&ldquo;Free software&rdquo; refers to the users' freedom to run, copy,
 # | distribute, study, change-]{+We campaign for these freedoms because
 # | everyone deserves them.  With these freedoms, the users (both
@@ -136,17 +143,135 @@
 "정, 개선시킬 수 있는 원천적인 자유까지를 모두 포괄하는 
것입니다. 따라서, 간략"
 "히 말하면 다음과 같은 4가지 종류의 자유를 내포한다고 할
 수 있습니다."
 
-#. 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>
+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>
+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>
+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>
 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>
 # | The freedom to run the [-program,-] {+program as you wish,+} for any
 # | purpose (freedom 0).
 #, fuzzy
@@ -155,7 +280,7 @@
 "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>
 # | 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.
@@ -172,7 +297,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
@@ -182,7 +307,7 @@
 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>
 # | 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 +328,7 @@
 "자유 (자유 3). 이러한 자유를 위해서는 소스 코드에 대한 ì 
‘근이 선행되어야 합니"
 "다."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | A program is free software if {+it gives+} users [-have-] {+adequately+}
 # | all of these freedoms.  {+Otherwise, it is nonfree.  While we can
 # | distinguish various nonfree distribution schemes in terms of how far they
@@ -219,7 +344,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 "
@@ -230,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, "
@@ -239,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 "
@@ -252,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 "
@@ -260,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 "
@@ -271,52 +400,22 @@
 "program nonfree."
 msgstr ""
 
-# Missed update. This is a leftover from the 1997 version:
-#  
https://web.archive.org/web/19980126185518/www.gnu.org/philosophy/free-sw.html
-# This string was split on April 9, 1999, and 2 sentences were added to the 
second part:
-# 
https://web.archive.org/web/19990430060825/www.gnu.org/philosophy/free-sw.html
-#. type: Content of: <div><p>
-# | 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. In the GNU project, we use ``copyleft''-] {+software,
-# | even+} to [-protect these freedoms legally for everyone.-] {+<a
-# | href=\"/philosophy/selling.html\">sell copies</a>.+}
-#, fuzzy
-#| msgid ""
-#| "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. In the GNU "
-#| "project, we use ``copyleft'' to protect these freedoms legally for "
-#| "everyone."
-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 ""
-"GNU 소프트웨어를 사용하기 위해서 지불된 비용의 유무에 
상관없이 일단, 소프트웨"
-"어를 입수한 뒤에는 이를 복제하고 수정할 수 있는 자유가 
제한 없이 주어집니다. "
-"GNU 프로젝트는 이러한 자유를 모든 사용자들에게 실질ì 
ìœ¼ë¡œ 보장하기 위해서 저"
-"작권의 양도에 관한 실정법에 의해서 그 법률적 효력이 
인정될 수 있는 '카피 레프"
-"트(copyleft)'라는 새로운 개념을 도입하고 있습니다."
-
-#. 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 "
@@ -328,7 +427,7 @@
 "but you are not entitled to impose your purposes on her."
 msgstr ""
 
-#. 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 "
@@ -337,7 +436,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, "
@@ -348,18 +447,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
@@ -385,7 +484,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 "
@@ -397,7 +496,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 "
@@ -406,25 +505,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>
 # | [-Thus,-]{+Freedom to distribute (freedoms 2 and 3) means+} you [-should
 # | be-] {+are+} free to redistribute copies, either with or without
 # | modifications, either gratis or charging a fee for distribution, to <a
@@ -451,7 +550,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 +562,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 "
@@ -483,18 +582,19 @@
 "redistribute such forms should you find or develop a way to make them."
 msgstr ""
 
-#. 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 "
@@ -507,7 +607,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."
@@ -522,7 +622,7 @@
 "전을 배포하는데 따른 자유를 막는 것이 아니라면 그러한 
방법을 위해서 사용되는 "
 "규정이나 제한 조건들은 받아들여 질 수 있습니다."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In the GNU project, we use [-copyleft&rdquo;-] {+copyleft+} to protect
 # | [-these-] {+the four+} freedoms legally for everyone.  {+We believe there
 # | are important reasons why <a href=\"/philosophy/pragmatic.html\">it is
@@ -557,11 +657,11 @@
 "&ldquo;<a href=\"/philosophy/categories.html\">소프트웨어의 
범주</a>&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 [-effectively block-] {+substantively limit+} your freedom to
 # | release modified [-versions. Rules that &ldquo;if you make the program
@@ -603,7 +703,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 "
@@ -615,7 +715,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 "
@@ -625,20 +725,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</"
@@ -649,15 +750,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>ê³¼ 무역 제재 ì¡°"
 "치는 프로그램을 국제적으로 배포하려는 여러분의 자유를 
제한할 수 있습니다. 소"
@@ -666,7 +767,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 "
@@ -676,11 +777,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, [-even though you have not
@@ -704,7 +805,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 "
@@ -713,17 +814,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-"
@@ -735,7 +836,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 "
@@ -743,11 +844,67 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h3>
+# | The Free Software [-Foundation claims no copyright on this joke.-]
+# | {+Definition in Practice+}
+#, fuzzy
+#| msgid "The Free Software Foundation claims no copyright on this joke."
+msgid "The Free Software Definition in Practice"
+msgstr "자유 소프트웨어 재단은 이 유머에 대한 저작권을 
갖고 있지 않습니다."
+
+#. type: Content of: <div><div><h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+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 ""
+
+#. type: Content of: <div><div><h4>
+msgid "Get help with free licenses"
+msgstr ""
+
+#. 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 "
+"licenses</a>.  If the license you are concerned with is not listed there, "
+"you can ask us about it by sending us email at <a href=\"mailto:";
+"licensing@gnu.org\">&lt;licensing@gnu.org&gt;</a>."
+msgstr ""
+
+#. 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 "
+"different free software licenses means increased work for users in "
+"understanding the licenses; we may be able to help you find an existing free "
+"software license that meets your needs."
+msgstr ""
+
+#. 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><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
@@ -782,74 +939,35 @@
 "서는 &ldquo;<a href=\"/philosophy/words-to-avoid.html\">혼동을 피하기 
위해서 "
 "사용을 삼가해야 할 단어나 구문들</a>&rdquo; 문서를 참고
하기 바랍니다."
 
-#. type: Content of: <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."
-msgstr ""
-
-#. type: Content of: <div><h4>
-msgid "Get help with free licenses"
-msgstr ""
-
-#. type: Content of: <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 "
-"licenses</a>.  If the license you are concerned with is not listed there, "
-"you can ask us about it by sending us email at <a href=\"mailto:";
-"licensing@gnu.org\">&lt;licensing@gnu.org&gt;</a>."
-msgstr ""
-
-#. type: Content of: <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 "
-"different free software licenses means increased work for users in "
-"understanding the licenses; we may be able to help you find an existing free "
-"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."
+"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 ""
 
-#. type: Content of: <div><h3>
+#. 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 "
 "effect part of the software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. 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=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 
-#. 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/\";> "
@@ -857,30 +975,16 @@
 msgstr ""
 
 #. 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 ""
-
-#. 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 "
@@ -889,7 +993,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 "
@@ -897,42 +1001,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 "
@@ -940,7 +1044,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 "
@@ -948,7 +1052,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 "
@@ -956,7 +1060,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 "
@@ -965,7 +1069,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 "
@@ -973,14 +1077,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 "
@@ -988,21 +1092,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 "
@@ -1010,7 +1114,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 "
@@ -1018,49 +1122,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 "
@@ -1068,7 +1172,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 "
@@ -1076,7 +1180,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 "
@@ -1084,21 +1188,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 "
@@ -1106,7 +1210,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 "
@@ -1117,11 +1221,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 "
@@ -1148,6 +1252,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
@@ -1155,29 +1260,35 @@
 #.         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 ""
 "이 글의 다른 언어 번역문 작성이나 제출에 대한 정보는 <a 
href=\"/server/"
 "standards/README.translations.html\">번역 안내</a>를 참고해 
주세요."
 
 #. 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 (C) 1996 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>

Index: free-sw.lt-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.lt-diff.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- free-sw.lt-diff.html        30 May 2021 19:32:29 -0000      1.23
+++ free-sw.lt-diff.html        16 Jul 2021 10:02:23 -0000      1.24
@@ -11,8 +11,11 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
-&lt;title&gt;What is free software?
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</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;
 <span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
 .note { margin-left: 6%; margin-right: 6%; }
@@ -22,26 +25,19 @@
 --&gt;&lt;/style&gt;</em></ins></span>
 &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="removed"><del><strong>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;div class="article"&gt;</em></ins></span>
-&lt;h3&gt;The Free Software Definition&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h2&gt;What is free 
software?&lt;/h2&gt;</strong></del></span>
+&lt;!--#include <span 
class="removed"><del><strong>virtual="/licenses/fsf-licensing.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/philosophy/ph-breadcrumb.html"</em></ins></span>
 --&gt;
 
-<span class="removed"><del><strong>&lt;blockquote&gt;</strong></del></span>
+<span class="removed"><del><strong>&lt;h3&gt;The</strong></del></span>
+<span class="inserted"><ins><em>&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;
+&lt;h2&gt;What is</em></ins></span> Free <span 
class="removed"><del><strong>Software Definition&lt;/h3&gt;
 
-<span class="inserted"><ins><em>&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;</em></ins></span>
+&lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
 particular software program qualifies as free software.  From time to
@@ -50,18 +46,11 @@
 below for a list of changes that affect the definition of free
 software.
 &lt;/p&gt;
-<span class="removed"><del><strong>&lt;/blockquote&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&gt;</em></ins></span>
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>Software?&lt;/h2&gt;
+&lt;div class="thin"&gt;&lt;/div&gt;
 
+&lt;div class="article"&gt;
+&lt;div 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
@@ -77,6 +66,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
@@ -87,9 +84,77 @@
 an instrument of unjust power&lt;/a&gt;.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt; The four essential 
freedoms&lt;/h4&gt;</em></ins></span>
+&lt;p&gt;
+<span class="inserted"><ins><em>&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;
+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 &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 four essential freedoms&lt;/h4&gt;
+&lt;p&gt;</em></ins></span>
 A program is free software if the program's users have the
 four essential freedoms: <span class="inserted"><ins><em>&lt;a 
href="#f1"&gt;[1]&lt;/a&gt;</em></ins></span>
 &lt;/p&gt;
@@ -129,6 +194,9 @@
 
 &lt;p&gt;The rest</strong></del></span> <span class="inserted"><ins><em>B is 
not pertinent to that plan.&lt;/p&gt;
 
+
+&lt;h4 id="selling"&gt;Free software &lt;em&gt;can&lt;/em&gt; be 
commercial&lt;/h4&gt;
+
 &lt;p&gt;
 &ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.
 On the contrary, a free program must be available for commercial use,
@@ -160,37 +228,32 @@
 distribution would hobble the</em></ins></span> free <span 
class="inserted"><ins><em>software community and obstruct its
 path</em></ins></span> to <span class="removed"><del><strong>do these
 things means (among other things)</strong></del></span> <span 
class="inserted"><ins><em>success.  We must conclude</em></ins></span> that 
<span class="removed"><del><strong>you do</strong></del></span> <span 
class="inserted"><ins><em>a program licensed with such
-restrictions does</em></ins></span> not <span 
class="removed"><del><strong>have</strong></del></span> <span 
class="inserted"><ins><em>qualify as free software.
+restrictions does</em></ins></span> not <span 
class="removed"><del><strong>have to ask or pay
+for permission to do so.</strong></del></span> <span 
class="inserted"><ins><em>qualify as free software.</em></ins></span>
 &lt;/p&gt;
 
 &lt;p&gt;
-A free program must offer the four freedoms</em></ins></span> to <span 
class="removed"><del><strong>ask</strong></del></span> <span 
class="inserted"><ins><em>any would-be user that
+<span class="removed"><del><strong>You should also have</strong></del></span>
+<span class="inserted"><ins><em>A free program must offer</em></ins></span> 
the <span class="removed"><del><strong>freedom</strong></del></span> <span 
class="inserted"><ins><em>four freedoms</em></ins></span> to <span 
class="removed"><del><strong>make modifications and use them
+privately</strong></del></span> <span class="inserted"><ins><em>any would-be 
user that
 obtains a copy of the software, who has complied thus far with the
-conditions of the free license covering the software in any previous
+conditions of the free license covering the software</em></ins></span> in 
<span class="removed"><del><strong>your own work</strong></del></span> <span 
class="inserted"><ins><em>any previous
 distribution of it.  Putting some of the freedoms off limits to some
-users,</em></ins></span> or <span class="removed"><del><strong>pay
-for permission</strong></del></span> <span class="inserted"><ins><em>requiring 
that users pay, in money or in kind,</em></ins></span> to <span 
class="removed"><del><strong>do so.</strong></del></span> <span 
class="inserted"><ins><em>exercise
+users,</em></ins></span> or <span class="removed"><del><strong>play, without 
even mentioning</strong></del></span> <span 
class="inserted"><ins><em>requiring</em></ins></span> that <span 
class="removed"><del><strong>they
+exist.  If you do publish your changes, you should not be required to
+notify anyone</strong></del></span> <span class="inserted"><ins><em>users 
pay,</em></ins></span> in <span 
class="removed"><del><strong>particular,</strong></del></span> <span 
class="inserted"><ins><em>money</em></ins></span> or in <span 
class="removed"><del><strong>any particular way.</strong></del></span> <span 
class="inserted"><ins><em>kind, to exercise
 them, is tantamount to not granting the freedoms in question, and thus
 renders the program nonfree.</em></ins></span>
 &lt;/p&gt;
 
-&lt;p&gt;
-You <span class="removed"><del><strong>should also</strong></del></span> <span 
class="inserted"><ins><em>may</em></ins></span> have <span 
class="removed"><del><strong>the freedom</strong></del></span> <span 
class="inserted"><ins><em>paid money</em></ins></span> to <span 
class="removed"><del><strong>make modifications and use them
-privately in your own work</strong></del></span> <span 
class="inserted"><ins><em>get copies of a free program,</em></ins></span> or 
<span class="removed"><del><strong>play, without even mentioning that they
-exist.  If</strong></del></span> you <span class="removed"><del><strong>do 
publish</strong></del></span> <span class="inserted"><ins><em>may
-have obtained copies at no charge.  But regardless of how you 
got</em></ins></span> your <span 
class="removed"><del><strong>changes,</strong></del></span>
-<span class="inserted"><ins><em>copies,</em></ins></span> you <span 
class="removed"><del><strong>should not be required</strong></del></span> <span 
class="inserted"><ins><em>always have the freedom</em></ins></span> to
-<span class="removed"><del><strong>notify anyone in particular, or in any 
particular way.</strong></del></span> <span class="inserted"><ins><em>copy and 
change the software,
-even to &lt;a href="/philosophy/selling.html"&gt;sell 
copies&lt;/a&gt;.</em></ins></span>
-&lt;/p&gt;
 
-<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 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.&lt;/p&gt;
 
-&lt;h4&gt;The freedom to run the program as you 
wish&lt;/h4&gt;</em></ins></span>
+&lt;h4 id="run-the-program"&gt;The freedom to run the program as you 
wish&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -232,7 +295,7 @@
 freedom</strong></del></span>
 <span class="inserted"><ins><em>separate &ldquo;freedom not</em></ins></span> 
to <span class="removed"><del><strong>redistribute such forms should you find 
or develop</strong></del></span> <span 
class="inserted"><ins><em>run</em></ins></span> a <span 
class="removed"><del><strong>way</strong></del></span> <span 
class="inserted"><ins><em>program.&rdquo;&lt;/p&gt;
 
-&lt;h4&gt;The freedom</em></ins></span> to <span 
class="inserted"><ins><em>study the source code and</em></ins></span> make 
<span class="removed"><del><strong>them.
+&lt;h4 id="make-changes"&gt;The freedom</em></ins></span> to <span 
class="inserted"><ins><em>study the source code and</em></ins></span> make 
<span class="removed"><del><strong>them.
 &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>changes&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
@@ -275,7 +338,8 @@
 Thus, freedom 1 includes the &ldquo;freedom to delete the program.&rdquo;
 &lt;/p&gt;
 
-&lt;h4&gt;The freedom to redistribute if you wish: basic 
requirements&lt;/h4&gt;
+&lt;h4 id="redistribute"&gt;The 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
@@ -296,7 +360,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;
@@ -317,13 +381,13 @@
 <span class="inserted"><ins><em>make them.</em></ins></span>
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Copyleft&lt;/h4&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h4 
id="copyleft"&gt;Copyleft&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 <span class="removed"><del><strong>However, certain</strong></del></span>
 <span class="inserted"><ins><em>Certain</em></ins></span> 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
@@ -352,7 +416,7 @@
 obtained copies at no charge.  But regardless of how you got your copies,
 you always have the freedom to copy</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;h4&gt;Rules about 
packaging</em></ins></span> and <span class="removed"><del><strong>change the 
software, even to 
+<span class="inserted"><ins><em>&lt;h4 id="packaging"&gt;Rules about 
packaging</em></ins></span> and <span class="removed"><del><strong>change the 
software, even to 
 &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
 &lt;/p&gt;
 
@@ -396,10 +460,10 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Export 
regulations&lt;/h4&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h4 id="exportcontrol"&gt;Export 
regulations&lt;/h4&gt;</em></ins></span>
 
 &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
@@ -420,7 +484,7 @@
 software nonfree.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Legal considerations&lt;/h4&gt;
+<span class="inserted"><ins><em>&lt;h4 id="legal-details"&gt;Legal 
considerations&lt;/h4&gt;
 
 &lt;p&gt;
 In order for these freedoms to be real, they must be permanent and
@@ -444,7 +508,7 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Contract-based 
licenses&lt;/h4&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h4 id="contracts"&gt;Contract-based 
licenses&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
@@ -465,23 +529,24 @@
 it is nonfree.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Use the right words when talking 
about free software&lt;/h4&gt;</em></ins></span>
-
-&lt;p&gt;
+<span class="removed"><del><strong>&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 
+as &ldquo;piracy&rdquo; embody opinions</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 <span 
class="removed"><del><strong>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
+are Worth Avoiding&lt;/a&gt; for a discussion of</strong></del></span> <span 
class="inserted"><ins><em>interpret</em></ins></span> these <span 
class="removed"><del><strong>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;
-
-<span class="inserted"><ins><em>&lt;h4&gt;How we interpret these 
criteria&lt;/h4&gt;</em></ins></span>
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>criteria&lt;/h4&gt;</em></ins></span>
 
 &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
@@ -494,7 +559,7 @@
 it easier to see why certain licenses do or don't qualify.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;h4&gt;Get help with free 
licenses&lt;/h4&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h4 id="get-help"&gt;Get help with free 
licenses&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
@@ -518,7 +583,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;,
@@ -530,7 +616,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;
 
@@ -540,7 +626,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
@@ -549,8 +635,9 @@
 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;
-<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;hr class="column-limit" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;h3 id="History"&gt;History&lt;/h3&gt;
 
@@ -691,19 +778,21 @@
 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;
 
-<span class="inserted"><ins><em>&lt;h3 
style="font-size:1em"&gt;Footnote&lt;/h3&gt;
+&lt;h3 class="footnote"&gt;Footnote&lt;/h3&gt;
 &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
 the freedom to run the program needed to be mentioned explicitly.
 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;</em></ins></span>
+&lt;/ol&gt;
+&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
@@ -721,13 +810,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;
 
@@ -748,7 +837,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-2016</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-2016</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"
@@ -759,7 +848,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:32:29 $
+$Date: 2021/07/16 10:02:23 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: free-sw.lt.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.lt.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- free-sw.lt.po       30 May 2021 19:32:29 -0000      1.40
+++ free-sw.lt.po       16 Jul 2021 10:02:23 -0000      1.41
@@ -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: 2016-01-25 14:59+0200\n"
 "Last-Translator: Donatas Klimašauskas <klimasauskas.d@gmail.com>\n"
 "Language-Team: Lithuanian <web-translators@gnu.org>\n"
@@ -19,7 +19,11 @@
 "X-Outdated-Since: 2016-08-20 14:55+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 ""
 "Kas yra laisva programinė įranga? - GNU projektas - Laisvos programinės "
 "įrangos fondas"
@@ -43,63 +47,14 @@
 "kompiuterių naudotojai turėtų laisvę jų naudojama programine įranga 
dalintis "
 "ir ją tobulinti."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr "Kas yra laisva programinė įranga?"
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Laisvos programinės įrangos apibrėžimas"
-
-#. type: Content of: <div><blockquote><p>
-# | Have a question {+about free software licensing+} not answered here?
-# | [-Check out some of-] {+See+} our other <a
-# | href=\"http://www.fsf.org/licensing\";>licensing [-resources</a> or-]
-# | {+resources</a>, and if necessary+} contact the {+FSF+} Compliance Lab at
-# | <a href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</a>.
+#. type: Content of: <div><h2>
+# | What is [-free software?-] {+Free Software?+}
 #, fuzzy
-#| msgid ""
-#| "Have a question not answered here? Check out some of our other <a href="
-#| "\"http://www.fsf.org/licensing\";>licensing resources</a> or contact the "
-#| "Compliance Lab at <a href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</"
-#| "a>."
-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 ""
-"Turite klausimą į kurį čia neatsakyta? Patikrinkite kuriuos nors iš 
mūsų "
-"kitų <a href=\"http://www.fsf.org/licensing\";>licencijavimo resursų</a> 
arba "
-"susisiekite su atitikimo laboratorija <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 ""
-"Laisvos programinės įrangos apibrėžimu pateikiami kriterijai, kuriais "
-"remiantis nustatoma ar konkreti programinės įrangos programa gali būti "
-"kvalifikuojama kaip laisva programinė įranga.  Laikas nuo laiko, mes "
-"peržiūrim šį apibrėžimą, siekdami didesnio jo aiškumo arba atsakyti 
į "
-"subtilių problemų klausimus.  Pakeitimų, kurie įtakoja laisvos 
programinės "
-"įrangos apibrėžimą, sąrašą pamatykite toliau pateiktame <a 
href=\"#History"
-"\">Istorijos skyriuje</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 "What is free software?"
+msgid "What is Free Software?"
+msgstr "Kas yra laisva programinė įranga?"
 
-#. 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,
@@ -140,7 +95,43 @@
 "href=\"#TransNote2\">2</a></sup> programinė įranga&ldquo; siekdami 
parodyti, "
 "kad mes mintyje neturime jos kainos nebuvimo."
 
-#. 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 ""
+"&bdquo;Laisva programinė įranga&ldquo; nereiškia 
&bdquo;nekomercinė&ldquo;.  "
+"Laisvą programą turi būti galima naudoti komercijai, komerciniam kūrimui 
ir "
+"komerciniam platinimui.  Komercinis laisvos programinės įrangos kūrimas "
+"nebėra neįprastas; tokia laisva komercinė programinė įranga yra labai "
+"svarbi.  Galbūt jūs sumokėjote pinigais, kad gautumėte laisvos 
programinės "
+"įrangos kopijas arba jūs kopijas gavote nemokamai.  Nepaisant būdo kaip 
jūs "
+"gavote savo kopijas, jūs visada turite laisvę kopijuoti ir pakeisti tokią "
+"programinę įrangą, net <a href=\"/philosophy/selling.html\">kopijas "
+"parduoti</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 "
@@ -158,11 +149,159 @@
 "valdo tą programą; tai tokią programą paverčia <a 
href=\"/philosophy/free-"
 "software-even-more-important.html\">neteisingos galios instrumentu</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 ""
+
+#. type: Content of: <div><div><div><h3>
+# | [-Education Contents-]{+Table of contents+}
+#, fuzzy
+#| msgid "Education Contents"
+msgid "Table of contents"
+msgstr "Å vietimo turinys"
+
+#. 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 "Laisvos programinės įrangos apibrėžimas"
+
+#. 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 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 "Laisvė leisti tą programą kaip jūs norite"
+
+#. 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>
+# | Have a question {+about free software licensing+} not answered here?
+# | [-Check out some of-] {+See+} our other <a
+# | href=\"http://www.fsf.org/licensing\";>licensing [-resources</a> or-]
+# | {+resources</a>, and if necessary+} contact the {+FSF+} Compliance Lab at
+# | <a href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</a>.
+#, fuzzy
+#| msgid ""
+#| "Have a question not answered here? Check out some of our other <a href="
+#| "\"http://www.fsf.org/licensing\";>licensing resources</a> or contact the "
+#| "Compliance Lab at <a href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</"
+#| "a>."
+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 ""
+"Turite klausimą į kurį čia neatsakyta? Patikrinkite kuriuos nors iš 
mūsų "
+"kitų <a href=\"http://www.fsf.org/licensing\";>licencijavimo resursų</a> 
arba "
+"susisiekite su atitikimo laboratorija <a href=\"mailto:licensing@fsf.org";
+"\">licensing@fsf.org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Laisvos programinės įrangos apibrėžimas"
+
+#. 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 ""
+"Laisvos programinės įrangos apibrėžimu pateikiami kriterijai, kuriais "
+"remiantis nustatoma ar konkreti programinės įrangos programa gali būti "
+"kvalifikuojama kaip laisva programinė įranga.  Laikas nuo laiko, mes "
+"peržiūrim šį apibrėžimą, siekdami didesnio jo aiškumo arba atsakyti 
į "
+"subtilių problemų klausimus.  Pakeitimų, kurie įtakoja laisvos 
programinės "
+"įrangos apibrėžimą, sąrašą pamatykite toliau pateiktame <a 
href=\"#History"
+"\">Istorijos skyriuje</a>."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | A program is free software if the program's users have the four essential
 # | freedoms: {+<a href=\"#f1\">[1]</a>+}
 #, fuzzy
@@ -176,13 +315,13 @@
 "Programa yra laisva programinė įranga, jeigu tos programos naudotojai turi "
 "keturias esmines laisves."
 
-#. 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 ""
 "Laisvė leisti tą programą kaip jūs norite, bet kokiu tikslu (laisvė Nr. 
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 "
@@ -193,7 +332,7 @@
 "šaltinio kodo<sup><a href=\"#TransNote4\">4</a></sup> šiai yra išankstinė 
"
 "sąlyga."
 
-#. 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
@@ -205,7 +344,7 @@
 "Laisvė išplatinti kopijas, kad jūs galėtumėte padėti savo kaimynui 
(laisvė "
 "Nr. 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 "
@@ -216,7 +355,7 @@
 "Taip elgdamiesi, jūs visai bendruomenei galite suteikti galimybę patirti "
 "jūsų pakeitimų naudą.  Prieiga prie šaltinio kodo šiai yra išankstinė 
sąlyga."
 
-#. 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 "
@@ -228,7 +367,7 @@
 "galime atskirti įvairias nelaisvas platinimo schemas pagal tai, kiek daug "
 "joms trūksta iki laisvų, mes jas visas laikome vienodai neetiškomis."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | 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
 # | program A which automatically launches a program B to handle some cases. 
@@ -263,7 +402,11 @@
 "modifikuoti A taip, jog ji nenaudotų B, reikia, kad tik A būtų laisva; B 
mes "
 "galime ignoruoti."
 
-#. 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, "
@@ -272,7 +415,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 "
@@ -285,7 +428,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 "
@@ -293,7 +436,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 "
@@ -304,58 +447,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 ""
-"&bdquo;Laisva programinė įranga&ldquo; nereiškia 
&bdquo;nekomercinė&ldquo;.  "
-"Laisvą programą turi būti galima naudoti komercijai, komerciniam kūrimui 
ir "
-"komerciniam platinimui.  Komercinis laisvos programinės įrangos kūrimas "
-"nebėra neįprastas; tokia laisva komercinė programinė įranga yra labai "
-"svarbi.  Galbūt jūs sumokėjote pinigais, kad gautumėte laisvos 
programinės "
-"įrangos kopijas arba jūs kopijas gavote nemokamai.  Nepaisant būdo kaip 
jūs "
-"gavote savo kopijas, jūs visada turite laisvę kopijuoti ir pakeisti tokią "
-"programinę įrangą, net <a href=\"/philosophy/selling.html\">kopijas "
-"parduoti</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 "Laisvė leisti tą programą kaip jūs norite"
 
-#. 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 "
@@ -375,7 +482,7 @@
 "kažkam kitam, tas asmuo irgi yra laisvas leisti ją savo tikslais, bet jums "
 "nesuteikiama teisė to asmens apriboti jūsų tikslais."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | The freedom to run the program as you wish means that you are not
 # | forbidden or stopped from [-doing so.  It-] {+making it run.  This+} has
 # | nothing to do with what functionality the program has, {+whether it is
@@ -399,7 +506,7 @@
 "arba trukdoma taip padaryti.  Tai nesusiję su programos funkcionalumu, nei "
 "su jos naudingumu tam, ką jūs norite atlikti."
 
-#. 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, "
@@ -410,18 +517,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,
@@ -450,7 +557,7 @@
 "\"#TransNote7\">7</a></sup> &bdquo;šaltinio kodas&ldquo; nėra tikras "
 "Å¡altinio kodas ir nesiskaito Å¡altinio kodu."
 
-#. 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 "
@@ -471,7 +578,7 @@
 "laisva programinė įranga, net jei jų šaltinio kodai, kuriuos 
kompiliuojant "
 "jie sukurti, yra laisvi."
 
-#. 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 "
@@ -486,7 +593,7 @@
 "kokiam jumis pridedamam kodui turėtoju &ndash; tada tokia licencija yra "
 "pernelyg suvaržanti, kad ją būtų galima kvalifikuoti laisva."
 
-#. 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 "
@@ -496,18 +603,18 @@
 "teisė modifikuoti programą yra ribota, iš esmės, tik leidžiant 
pakeitimus, "
 "kuriuos kažkas kitas laiko patobulinimais, ta programa nėra laisva."
 
-#. 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 "
@@ -521,7 +628,7 @@
 "reiškia (tame tarpe ir kitus dalykus), kad jūs neturite atsiklausti arba "
 "sumokėti už leidimą tai atlikti."
 
-#. 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 "
@@ -533,11 +640,25 @@
 "egzistuoja.  Jei jūs paviešinsite savo pakeitimus, iš jūsų neturėtų 
būti "
 "reikalaujama konkrečiai kam nors pranešti arba kokiu nors konkrečiu būdu."
 
-#. 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 ""
@@ -548,7 +669,7 @@
 "reikalaujama, kad modifikuotos versijos būtų nelaisvos, nekvalifikuojama "
 "laisva licencija."
 
-#. 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 "
@@ -567,18 +688,19 @@
 "ypatybės), gerai, bet jūs turite turėti laisvę tokias formas išplatinti, 
jei "
 "surastumėte arba sukurtumėte būdą jas sukurti."
 
-#. 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 "
@@ -591,7 +713,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."
@@ -604,7 +726,7 @@
 "pagrindinės laisvės.  Ši taisyklė nesikerta su pagrindinėmis laisvėmis; 
ji "
 "jas apsaugo."
 
-#. 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/"
@@ -625,11 +747,11 @@
 "laisva programinė įranga&ldquo;, &bdquo;copyleft programinė įranga&ldquo; 
ir "
 "kitos programinės įrangos kategorijos yra tarpusavyje susijusios."
 
-#. 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
@@ -671,7 +793,7 @@
 "programos pakeitimus, tad kelių papildomų pakeitimų padarymas nesukels "
 "problemų."
 
-#. 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 +813,7 @@
 "kuriomis reikalaujama pateikti jūsų paviešintų naudotojams versijų 
Å¡altinio "
 "kodus, taip pat yra priimtinos."
 
-#. 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 "
@@ -708,21 +830,42 @@
 "sprendimas, kuris jums sudaro galimybę nurodyti originalios programos "
 "pavadinimą, kaip modifikuotos versijos pseudonimą."
 
-#. 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 ""
 "Kartais vyriausybė <a id=\"exportcontrol\">eksportuoja valdymo reglamentus</"
 "a> ir prekybos sankcijos gali apriboti jūsų laisvę tarptautiniu mastu "
@@ -734,7 +877,7 @@
 "laisvos programinės įrangos licencijomis neturi būti reikalaujama 
vadovautis "
 "bet kokiais nemažareikšmiais eksporto reglamentais."
 
-#. 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 "
@@ -750,11 +893,11 @@
 "problema, nes vėlesnis eksporto teisės pakeitimas galėtų padaryti tą "
 "reikalavimą nemažareikšmiu ir, vadinasi, paversti programinę įrangą 
nelaisva."
 
-#. 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 "
@@ -769,7 +912,7 @@
 "palaikytas priežastimi tokiems pokyčiams, tokia programinė įranga nėra "
 "laisva."
 
-#. 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 "
@@ -783,7 +926,7 @@
 "atveju, kai naudotojas leidžia nelaisvas programas, jau reikėtų atitikimo 
tų "
 "nelaisvų programų licencijoms; tai padaro tokią licenciją nelaisva."
 
-#. 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."
@@ -791,11 +934,11 @@
 "Laisva licencija yra priimtina nurodyti kurios jurisdikcijos teisė taikoma "
 "arba kur turi būti teisiamasi, arba abu."
 
-#. 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-"
@@ -816,7 +959,7 @@
 "didesnės apimties.  Tai reiškia, kad egzistuoja daug įmanomų būdų, 
kuriais "
 "tokia licencija gali būti nepriimtinai suvaržanti ir nelaisva."
 
-#. 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 "
@@ -829,48 +972,54 @@
 "paminėta legalia, mes turėsime apie tai pagalvoti ir greičiausiai 
prieisime "
 "prie išvados, kad ji yra nelaisva."
 
-#. 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 ""
-"Kai kalbama apie laisvą programinę įrangą, geriausia vengti tokių 
terminų "
-"kaip &bdquo;atiduodama&ldquo; arba &bdquo;nemokamai&ldquo; vartojimo, nes "
-"tie terminai netiesiogiai reiškia, kad problema yra pinigai, o ne laisvė.  "
-"Kai kurie plačiai vartojami terminai, pavyzdžiui, 
&bdquo;piratavimas&ldquo;, "
-"yra sudėtinės dalys nuomonių, kurių mes tikimės jūs neparemsite.  
Pamatykite "
-"diskusiją <a href=\"/philosophy/words-to-avoid.html\">Klaidinantys žodžiai 
"
-"ir frazės, kurių verta vengti</a> apie šiuos terminus.  Mes taip pat 
turime "
-"sąrašą tinkamų <a href=\"/philosophy/fs-translations.html\">&bdquo;laisva 
"
-"programinė įranga&ldquo; vertimų</a> į įvairias kalbas."
+#. 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 "Laisvos programinės įrangos apibrėžimas"
 
-#. 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 ""
 "Pabaigai, pastebėkite, kad kriterijus, tokius kaip pateikti šiame laisvos "
 "programinės įrangos apibrėžime, reikia interpretuoti atsargiai apmą
stant.  "
@@ -886,11 +1035,11 @@
 "kriterijus, kad būtų galima lengviau įžvelgti kodėl tam tikros 
licencijos "
 "kvalifikuojamos arba ne."
 
-#. 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 "
@@ -904,7 +1053,7 @@
 "pateikta, jūs galite mūsų apie ją paklausti mums atsiųsdami el. laišką 
į <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 "
@@ -919,7 +1068,7 @@
 "surasti egzistuojančią laisvos programinės įrangos licenciją, kuri 
atitinka "
 "jūsų poreikius."
 
-#. 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 "
@@ -929,11 +1078,67 @@
 "jūs galite užsitikrinti, kad ši licencija iš tikrųjų yra laisvos 
programinės "
 "įrangos licencija ir išvengti įvairių praktinių problemų."
 
-#. 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 ""
+"Kai kalbama apie laisvą programinę įrangą, geriausia vengti tokių 
terminų "
+"kaip &bdquo;atiduodama&ldquo; arba &bdquo;nemokamai&ldquo; vartojimo, nes "
+"tie terminai netiesiogiai reiškia, kad problema yra pinigai, o ne laisvė.  "
+"Kai kurie plačiai vartojami terminai, pavyzdžiui, 
&bdquo;piratavimas&ldquo;, "
+"yra sudėtinės dalys nuomonių, kurių mes tikimės jūs neparemsite.  
Pamatykite "
+"diskusiją <a href=\"/philosophy/words-to-avoid.html\">Klaidinantys žodžiai 
"
+"ir frazės, kurių verta vengti</a> apie šiuos terminus.  Mes taip pat 
turime "
+"sąrašą tinkamų <a href=\"/philosophy/fs-translations.html\">&bdquo;laisva 
"
+"programinė įranga&ldquo; vertimų</a> į įvairias kalbas."
+
+#. 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 ""
+"Kita grupė naudoja terminą &bdquo;atviras šaltinis&ldquo;, reiškiantį 
kažką "
+"artimo (bet ne identišką) &bdquo;laisva programinė įranga&ldquo;.  Mes "
+"teikiame pirmenybę terminui &bdquo;laisva programinė įranga&ldquo;, nes, 
kai "
+"vieną kartą jūs išgirdote, kad jis siejasi su laisve, o ne su kaina, juo "
+"kviečiama mąstyti apie laisvę.  Žodis &bdquo;atviras&ldquo; <a href=\"/"
+"philosophy/open-source-misses-the-point.html\">niekada nesiejamas su laisve</"
+"a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Už programinės įrangos"
 
-#. 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 "
@@ -944,11 +1149,21 @@
 "būti laisva ir todėl, kad vadovėliai, iš esmės, yra tos programinės 
įrangos "
 "dalis."
 
-#. 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 ""
 "Tie patys argumentai taip pat logiškai tinka ir kitų tipų praktinio "
@@ -956,7 +1171,7 @@
 "tokie kaip edukaciniai darbai ir cituojamieji darbai.  <a href=\"http://";
 "wikipedia.org\">Vikipedija</a> yra žinomiausias pavyzdys."
 
-#. 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/\";> "
@@ -967,31 +1182,10 @@
 "\">laisvų kultūrinių darbų</a> apibrėžimu, taikytinu bet kokio tipo 
darbams."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Atviras Å¡altinis?"
-
-#. 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 ""
-"Kita grupė naudoja terminą &bdquo;atviras šaltinis&ldquo;, reiškiantį 
kažką "
-"artimo (bet ne identišką) &bdquo;laisva programinė įranga&ldquo;.  Mes "
-"teikiame pirmenybę terminui &bdquo;laisva programinė įranga&ldquo;, nes, 
kai "
-"vieną kartą jūs išgirdote, kad jis siejasi su laisve, o ne su kaina, juo "
-"kviečiama mąstyti apie laisvę.  Žodis &bdquo;atviras&ldquo; <a href=\"/"
-"philosophy/open-source-misses-the-point.html\">niekada nesiejamas su laisve</"
-"a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Istorija"
 
-#. 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."
@@ -1000,7 +1194,7 @@
 "Toliau pateikiami esminiai pakeitimai, kartu su nuorodomis, kuriomis "
 "tiksliai parodoma kas buvo pakeista."
 
-#. 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 that freedom 0 is-]
@@ -1026,7 +1220,7 @@
 "įvardinti, kad laisvė Nr. 0 yra laisvė leisti programą taip, kaip jūs "
 "pageidaujate."
 
-#. 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-]
@@ -1050,14 +1244,14 @@
 "įvardinti, kad laisvė Nr. 0 yra laisvė leisti programą taip, kaip jūs "
 "pageidaujate."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1067,7 +1261,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Versija 1.141</a>: paaiškinti kuris "
 "kodas reikia, kad būtų laisvas."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1078,7 +1272,7 @@
 "įvardinti, kad laisvė Nr. 0 yra laisvė leisti programą taip, kaip jūs "
 "pageidaujate."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1088,7 +1282,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Versija 1.134</a>: laisvė Nr. 0 nėra "
 "programos funkcionalumo reikalas."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1098,7 +1292,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Versija 1.131</a>: laisva licencija "
 "gali būti nereikalaujama atitikimo kitos programos nelaisvai licencijai."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1110,7 +1304,7 @@
 "kad teisės pasirinkimas ir forumo specifikacijų pasirinkimas yra 
leidžiami.  "
 "(Mūsų politika visada buvo tokia.)"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1122,7 +1316,7 @@
 "reikalavimas, jei šis reikalavimas nėra mažareikšmis, yra tikra problema; 
"
 "kitu atveju, tai tik potenciali problema."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1135,7 +1329,7 @@
 "padarėte.  Modifikacijos taip pat nėra apribotos &bdquo;"
 "patobulinimais&ldquo;."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1149,7 +1343,7 @@
 "Autorių teisių turėtojai visada gali suteikti papildomą <em>leidimą</em> 
"
 "darbo naudojimui, tą darbą tuo pačiu metu išleisdami kitu būdu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1161,7 +1355,7 @@
 "laisvės Nr. 1 teiginyje, akcentą (jau pateiktas versijoje 1.80), kad ji "
 "apima jūsų modifikuotos versijos realų naudojimą jūsų kompiuterijai."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1171,7 +1365,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Versija 1.92</a>: paaiškinti, kad "
 "užslėptas kodas nėra kvalifikuojamas šaltinio kodu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1183,7 +1377,7 @@
 "Nr. 3 reiškia teisę platinti jūsų paties modifikuotos arba patobulintos "
 "versijos kopijas, o ne teisę dalyvauti kažkieno kito kūrimo projekte."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1193,7 +1387,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Versija 1.89</a>: laisvė Nr. 3 apima "
 "teisę modifikuotas versijas išleisti laisva programine įranga."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1203,7 +1397,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Versija 1.80</a>: laisvė Nr. 1 turi būti 
"
 "praktiška, o ne tik teorine; t. y., jokios tivoizacijos."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1215,7 +1409,7 @@
 "retrospektyvūs licencijos pakeitimai yra nepriimtini, net jei tai nėra "
 "apibrėžta išbaigtu pakeitimu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1227,7 +1421,7 @@
 "paaiškinimai nėra pakankamai konkretūs arba yra išreikšti tam tikrose "
 "vietose, tačiau nėra paminėti visur."
 
-#. 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 "
@@ -1237,7 +1431,7 @@
 "kokių tipų modifikuotas versijas jūs galite išleisti.  Laisvė Nr. 3 
apima "
 "modifikuotų versijų platinimą, o ne tik pakeitimus."
 
-#. 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."
@@ -1245,15 +1439,15 @@
 "Teise apjungti egzistuojančius modulius turimi mintyje tie, kurie yra "
 "tinkamai licencijuoti."
 
-#. 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 "Aiškiai įvardinti akcento apie eksporto valdymą išvadą."
 
-#. 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 "Licencijos pakeitimo sudarymas prilygsta senos licencijos atšaukimui."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1263,7 +1457,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Versija 1.57</a>: pridėti &bdquo;Už "
 "programinės įrangos&ldquo; skyrių."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1273,7 +1467,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Versija 1.46</a>: paaiškinti kieno "
 "tikslas, laisve leisti programą bet kokiu tikslu, yra svarbus."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1283,7 +1477,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Versija 1.41</a>: paaiškinti įvardijimą 
"
 "apie sutartimi paremtas licencijas."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1295,7 +1489,7 @@
 "licencija jums turi būti leidžiama savo modifikacijų sukūrimui naudotis 
kita "
 "prieinama laisva programine įranga."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1307,7 +1501,7 @@
 "kad licencija būtų iš jūsų reikalaujama pateikti programinės įrangos "
 "versijų, kurias jūs padedate viešam naudojimui, šaltinius."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1319,7 +1513,7 @@
 "kad licencija būtų iš jūsų reikalaujama save įvardinti modifikacijų "
 "autoriumi.  Kiti nežymūs paaiškinimai visame tekste."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1329,7 +1523,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Versija 1.23</a>: panagrinėti "
 "potencialias problemas, susijusias su sutartimi paremtomis licencijomis."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1339,7 +1533,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Versija 1.16</a>: paaiškinti kodėl "
 "dvejetainių platinimas yra svarbus."
 
-#. 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.10&amp;r2=1.11\";>Version
 # | 1.11</a>: Note that a free license may require you to send a copy of
@@ -1362,7 +1556,7 @@
 "licencija galima iš jūsų reikalauti atsiųsti jūsų platinamų versijų 
kopijas "
 "autoriui."
 
-#. 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 "
@@ -1379,14 +1573,14 @@
 "puslapio pakeitimų sąrašą per <a href=\"http://web.cvs.savannah.gnu.org/";
 "viewvc/www/philosophy/free-sw.html?root=www&amp;view=log\">cvsweb sąsają
</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | Footnote[-s-]
 #, fuzzy
 #| msgid "Footnotes"
 msgid "Footnote"
 msgstr "Pastabos"
 
-#. 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 "
@@ -1434,6 +1628,7 @@
 "pasiūlymai gali būti atsiųsti į <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
@@ -1441,14 +1636,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 ""
 "Mes dirbame sunkiai ir labai stengiamės, kad pateiktume tikslius, geros "
@@ -1460,15 +1661,15 @@
 "PERSKAITYKITEMANE</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2016-] {+2009-2019, 2021+}
-# | Free Software Foundation, Inc.
+# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-2016-] {+2009-2021+} Free
+# | Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2016 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-2016 Free Software Foundation, "
 "Inc. (Laisvos programinės įrangos fondas, korporacija)"
@@ -1493,6 +1694,23 @@
 msgid "Updated:"
 msgstr "Atnaujinta:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Atviras Å¡altinis?"
+
+#~ 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 ""
+#~ "Mes dirbame sunkiai ir labai stengiamės, kad pateiktume tikslius, geros "
+#~ "kokybės vertimus.  Tačiau mes nesame išimtys netobulumui.  Prašome "
+#~ "siųskite savo komentarus ir bendrus pasiūlymus šia prasme į <a href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p>\n"
+#~ "<p>Mūsų tinklapių vertimų koordinavimo ir pateikimo informaciją "
+#~ "pamatykite <a href=\"/server/standards/README.translations.html\">Vertimų 
"
+#~ "PERSKAITYKITEMANE</a>."
+
 #~ msgid ""
 #~ "The rest of this page clarifies certain points about what makes specific "
 #~ "freedoms adequate or not."

Index: free-sw.ml.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ml.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- free-sw.ml.po       1 Jun 2021 17:00:02 -0000       1.16
+++ free-sw.ml.po       16 Jul 2021 10:02:23 -0000      1.17
@@ -6,7 +6,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-06-01 17:16+0200\n"
 "Last-Translator: Aiswarya Kaitheri Kandoth <aiswaryakk29@gmail.com>\n"
 "Language-Team: Malayalam <www-ml-gnu-malayalam-project-public@gnu.org>\n"
@@ -14,11 +14,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: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 20.12.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 "എന്താണു് സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയര്‍? - ഗ്നു 
സംരംഭം - സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയര്‍ പ്രസ്ഥാനം"
 
 #. type: Attribute 'content' of: <meta>
@@ -39,57 +44,14 @@
 "മെച്ചപ്പെടുത്തുവാനുമുള്ള 
സ്വാതന്ത്ര്യം 
സാധ്യമാക്കുന്ന രീതിയിൽ, 1983 
മുതൽ, ഗ്നു എന്ന യുണിക്സ് "
 "ശൈലിയിലുള്ള സ്വതന്ത്ര 
ഓപ്പറേറ്റിങ് സിസ്റ്റം 
‍‍ഡവലപ്പു ചെയ്യുന്നു."
 
-#. 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;ഓപ്പൺ സോഴ്സ്&rdquo; എന്നതു് 
വ്യത്യസ്തമായ ഒരു കാര്യമാണു്: 
വ്യത്യസ്തമായ മൂല്യങ്ങളെ "
-"അടിസ്ഥാനമാക്കി വളരെ 
വ്യത്യസ്തമായ 
തത്ത്വശാസ്ത്രമാണ് 
ഇതിനുള്ളതു്. ഇതിന്റെ 
പ്രായോഗിക നിർവചനവും "
-"വ്യത്യസ്തമാണു്, എന്നാൽ 
ഒട്ടുമിക്ക ഓപ്പൺ സോഴ്സ് 
പ്രോഗ്രാമുകളും 
സ്വതന്ത്രമാണു താനും. ഈ 
വ്യത്യാസത്തെ "
-"കുറിച്ചു് ഞങ്ങൾ <a 
href=\"/philosophy/open-source-misses-the-point.html\"> 
സ്വതന്ത്ര "
-"സോഫ്റ്റ്‌വെയറിന്റെ ആശയം 
&ldquo;ഓപ്പൺ സോഴ്സ്&rdquo; 
വിട്ടുപോകുന്നതു് 
എന്തുകൊണ്ടു്</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, "
@@ -110,7 +72,19 @@
 "കാണിക്കാൻ, സ്വാതന്ത്ര്യം 
എന്നർത്ഥം വരുന്ന ഫ്രെഞ്ച് അ
ല്ലെങ്കിൽ സ്പാനിഷ് വാക്കു 
കടമെടുത്ത് &ldquo;"
 "ലിബൃ സോഫ്റ്റ്‍വെയർ&rdquo; 
എന്നും ഞങ്ങൾ ചിലപ്പോഴൊക്കെ 
വിളിയ്ക്കാറുണ്ടു്."
 
-#. 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 ""
+"ഒരു സ്വതന്ത്ര 
പ്രോഗ്രാമിന്റെ 
പകർപ്പുകൾക്കായി താങ്കൾ പണം 
നൽകിയിരിക്കാം, അല്ലെങ്കിൽ 
താങ്കൾക്കു "
+"സൌജന്യമായി പകർപ്പുകൾ 
ലഭിച്ചിരിക്കാം. താങ്കൾക്കു് 
എങ്ങനെ ഈ പകർപ്പുകൾ 
ലഭിച്ചുവെന്നതു നോക്കാതെ, "
+"സോഫ്റ്റ്‍വെയർ പകർത്താനും 
മാറ്റം വരുത്താനും <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 "
@@ -130,11 +104,190 @@
 "ആണു്; ഇതു് പ്രോഗ്രാമിനെ <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;ഓപ്പൺ സോഴ്സ്&rdquo; എന്നതു് 
വ്യത്യസ്തമായ ഒരു കാര്യമാണു്: 
വ്യത്യസ്തമായ മൂല്യങ്ങളെ "
+"അടിസ്ഥാനമാക്കി വളരെ 
വ്യത്യസ്തമായ 
തത്ത്വശാസ്ത്രമാണ് 
ഇതിനുള്ളതു്. ഇതിന്റെ 
പ്രായോഗിക നിർവചനവും "
+"വ്യത്യസ്തമാണു്, എന്നാൽ 
ഒട്ടുമിക്ക ഓപ്പൺ സോഴ്സ് 
പ്രോഗ്രാമുകളും 
സ്വതന്ത്രമാണു താനും. ഈ 
വ്യത്യാസത്തെ "
+"കുറിച്ചു് ഞങ്ങൾ <a 
href=\"/philosophy/open-source-misses-the-point.html\"> 
സ്വതന്ത്ര "
+"സോഫ്റ്റ്‌വെയറിന്റെ ആശയം 
&ldquo;ഓപ്പൺ സോഴ്സ്&rdquo; 
വിട്ടുപോകുന്നതു് 
എന്തുകൊണ്ടു്</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>
+# | [-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 "സ്വാതന്ത്ര്യത്തിനും അ
സ്വാതന്ത്ര്യത്തിനും 
ഇടയിലുള്ള അതിർത്തി 
വ്യക്തമാക്കുന്നു"
+
+#. 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>
+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 "കരാർ-അടിസ്ഥാനമാക്കിയുള്ള 
അനുമതിപത്രങ്ങൾ"
+
+#. 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>"
@@ -142,14 +295,14 @@
 "ഒരു പ്രോഗ്രാമിന്റെ 
ഉപയോക്താവിനു് ഈ നാലു് അവശ്യ 
സ്വാതന്ത്ര്യങ്ങളും 
ഉണ്ടെങ്കിൽ ആ പ്രോഗ്രാം 
സ്വതന്ത്ര "
 "സോഫ്റ്റ്‍വെയർ ആണ് : <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 ""
 "ഏതാവശ്യത്തിനും താങ്കളുടെ 
ഇഷ്ടപ്രകാരം പ്രോഗ്രാം 
പ്രവർത്തിപ്പിക്കാനുള്ള 
സ്വാതന്ത്ര്യം 
(സ്വാതന്ത്ര്യം "
 "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 "
@@ -159,13 +312,13 @@
 "ചെയ്യുന്ന തരത്തിൽ അതിനു 
മാറ്റം വരുത്തുവാനുമുള്ള 
സ്വാതന്ത്ര്യം 
(സ്വാതന്ത്ര്യം 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 "
@@ -176,7 +329,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 "
@@ -188,7 +341,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 "
@@ -206,7 +359,11 @@
 "ഉപയോഗിയ്ക്കാത്ത രീതിയിൽ A-യെ 
പരിഷ്കരിക്കുവാൻ ഞങ്ങൾ 
ഉദ്ദേശിക്കുന്നുവെങ്കിൽ, 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, "
@@ -220,7 +377,7 @@
 "പ്രാധാന്യം തന്നെ 
ഉണ്ടു്&mdash;ഇതു കൂടാതെ 
സ്വതന്ത്ര സോഫ്റ്റ്‍വെയറിനു് 
അതിന്റെ ലക്ഷ്യത്തിലേക്കു് "
 "എത്തിച്ചേരുവാൻ 
സാധിക്കുമായിരുന്നില്ല."
 
-#. 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 "
@@ -242,7 +399,7 @@
 "സ്വതന്ത്ര സോഫ്റ്റ്‍വെയർ 
വളരെ പ്രധാനപ്പെട്ടതാണു്. 
സ്വതന്ത്ര 
സോഫ്റ്റ്‍വെയറിനുവേണ്ടിയുള്ള
 പണമടച്ചുള്ള "
 "പ്രൊഫെഷണൽ സപ്പോർട്ട് ഒരു 
സുപ്രധാന ആവശ്യം 
നിറവേറ്റുന്നു."
 
-#. 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 "
@@ -254,7 +411,7 @@
 "അത്തരം 
നിയന്ത്രണങ്ങളോടുകൂടിയ അ
നുമതിപത്രത്തിനു കീഴിലുള്ള 
ഒരു പ്രോഗ്രാം സ്വതന്ത്ര 
സോഫ്റ്റ്‍വെയറാകാൻ "
 "യോഗ്യമല്ലെന്നുള്ള 
നിഗമനത്തിലേക്കു് ഞങ്ങൾ 
എത്തിച്ചേരുന്നു."
 
-#. 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 "
@@ -272,23 +429,15 @@
 "നല്കേണ്ടിവരുന്നതും ഈ പറഞ്ഞ 
സ്വാതന്ത്ര്യങ്ങൾ 
നല്കാത്തതിനു തുല്യമാണു്, അ
തായതു് അതു പ്രോഗ്രാമിനെ "
 "അസ്വതന്ത്രമാക്കുന്നു."
 
-#. 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 ""
-"ഒരു സ്വതന്ത്ര 
പ്രോഗ്രാമിന്റെ 
പകർപ്പുകൾക്കായി താങ്കൾ പണം 
നൽകിയിരിക്കാം, അല്ലെങ്കിൽ 
താങ്കൾക്കു "
-"സൌജന്യമായി പകർപ്പുകൾ 
ലഭിച്ചിരിക്കാം. താങ്കൾക്കു് 
എങ്ങനെ ഈ പകർപ്പുകൾ 
ലഭിച്ചുവെന്നതു നോക്കാതെ, "
-"സോഫ്റ്റ്‍വെയർ പകർത്താനും 
മാറ്റം വരുത്താനും <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>
+# | 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 "സ്വാതന്ത്ര്യത്തിനും അ
സ്വാതന്ത്ര്യത്തിനും 
ഇടയിലുള്ള അതിർത്തി 
വ്യക്തമാക്കുന്നു"
 
-#. 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 "
@@ -298,11 +447,11 @@
 "വിഷയങ്ങളിലും എത്രത്തോളം 
വ്യാപിപ്പിക്കണമെന്നു് ഈ 
ലേഖനത്തിന്റെ ഇനിയുള്ള 
ഭാഗത്തു് ഞങ്ങൾ കൂടുതൽ "
 "കൃത്യമായി വിശദീകരിക്കുന്നു."
 
-#. 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 "
@@ -323,7 +472,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 "
@@ -337,7 +486,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, "
@@ -356,7 +505,7 @@
 "ഉം 3-ഉം ഉപയോക്താക്കളെയും 
കൂട്ടായ്മകളെയും തകരാറുള്ള 
കോഡിനെ ഒഴിവാക്കി 
പരിഷ്കരിച്ച പതിപ്പുകൾ "
 "ഉണ്ടാക്കുവാനും വിതരണം 
ചെയ്യുവാനും അനുവദിക്കുന്നു. "
 
-#. 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 "
@@ -366,11 +515,11 @@
 "താങ്കളുടെ ആഗ്രഹമെങ്കിൽ അതും 
ഉൾക്കൊള്ളുന്നു. അതുകൊണ്ടു് 
പ്രത്യേകമായി &ldquo;ഒരു പ്രോഗ്രം "
 
"പ്രവർത്തിപ്പിക്കാതിരിക്കാനുള്ള
 സ്വാതന്ത്ര്യത്തിന്റെ&rdquo; 
ആവശ്യമില്ല."
 
-#. 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>
 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 "
@@ -384,7 +533,7 @@
 "നിബന്ധനയാണു്. അവ്യക്തമായ 
&ldquo;സോഴ്സ് കോഡ്&rdquo; യഥാർത്ഥ 
സോഴ്സ് കോഡല്ല, അതിനെ സോഴ്സ് "
 "കോഡായി കണക്കാക്കുന്നില്ല. "
 
-#. 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 +554,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 "
@@ -420,7 +569,7 @@
 "ആവശ്യപ്പെടുകയാണെങ്കിൽ &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 "
@@ -430,7 +579,7 @@
 "പരിഷ്കരിക്കാനുള്ള 
താങ്കളുടെ അവകാശം, 
പ്രധാനമായും, മറ്റാരെങ്കിലും 
ഒരു മെച്ചപ്പെടുത്തലായി "
 "കണക്കാക്കുന്നതിനു മാറ്റം 
വരുത്തുന്നതിൽ 
നിയന്ത്രിതമാണെങ്കിൽ, ആ 
പ്രോഗ്രാം സ്വതന്ത്രമല്ല."
 
-#. 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 "
@@ -442,12 +591,12 @@
 "എന്നതാണു്. അതായതു്, 
സ്വാതന്ത്ര്യം 1 &ldquo;ഒരു 
പ്രോഗ്രാം ഡിലീറ്റു 
ചെയ്യാനുള്ള "
 "സ്വാതന്ത്ര്യം&rdquo; 
ഉൾക്കൊള്ളുന്നു."
 
-#. 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 "
@@ -462,7 +611,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 "
@@ -475,11 +624,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 ""
@@ -489,7 +652,7 @@
 "\">പകർപ്പുപേക്ഷ</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 "
@@ -508,15 +671,30 @@
 "അവയുണ്ടാക്കുവാനുള്ള ഒരു 
മാർഗം താങ്കൾ കണ്ടെത്തുകയോ 
ഡവലപ്പുചെയ്യുകയോ ചെയ്താൽ ആ 
ഫോമുകൾ പുനർവിതരണം "
 "ചെയ്യാനുള്ള സ്വാതന്ത്ര്യം 
താങ്കൾക്കുണ്ടായിരിക്കണം."
 
-#. 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>
+# | 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."
@@ -528,7 +706,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/"
@@ -549,11 +727,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>
 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 "
@@ -574,7 +752,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 "
@@ -594,7 +772,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 "
@@ -611,21 +789,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> 
വ്യാപാര "
 "അനുമതികൾക്കും, 
ചിലപ്പോഴൊക്കെ 
പ്രോഗ്രാമുകളുടെ പകർപ്പു് അ
ന്താരാഷ്ട്ര തലത്തിൽ വിതരണം 
ചെയ്യാനുള്ള "
@@ -637,7 +836,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 "
@@ -653,11 +852,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 "
@@ -670,7 +869,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 "
@@ -684,7 +883,7 @@
 "ഉപയോഗിക്കുന്ന ഒരു 
ഉപയോക്താവിനു് അത്തരം 
സ്വതന്ത്രമല്ലാത്ത 
പ്രോഗ്രാമുകളുടെ അ
നുമതിപത്രത്തെ "
 "അനുസരിക്കേണ്ടിവരും; ഇതു് ആ അ
നുമതിപത്രത്തെ അ
സ്വതന്ത്രമാക്കുന്നു."
 
-#. 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."
@@ -693,11 +892,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-"
@@ -717,7 +916,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 "
@@ -730,48 +929,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 ""
-"ഫ്രീ സോഫ്റ്റ്‍വെയറിനെ 
കുറിച്ചു സംസാരിയ്ക്കുമ്പോൾ, 
&ldquo;വെറുതെ കൊടുക്കുക&rdquo; അ
ല്ലെങ്കിൽ "
-"&ldquo;സൌജന്യമായി&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><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 ""
 "അവസാനമായി, ഈ സ്വതന്ത്ര 
സോഫ്റ്റ്‍വെയർ നിർവചനത്തിൽ 
കൊടുത്തിരിയ്ക്കുന്നതുപോലെയുള്ള
 മാനദണ്ഡങ്ങൾ "
 "വളരെ ശ്രദ്ധയോടുകൂടി വേണം 
വ്യഖ്യാനിക്കുവാൻ. ഒരു 
പ്രത്യേക സോഫ്റ്റ്‍വെയർ അ
നുമതിപത്രം സ്വതന്ത്ര "
@@ -785,11 +990,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 "
@@ -803,7 +1008,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 "
@@ -817,7 +1022,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 "
@@ -827,11 +1032,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>
+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;വെറുതെ കൊടുക്കുക&rdquo; അ
ല്ലെങ്കിൽ "
+"&ldquo;സൌജന്യമായി&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 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 ""
+"&ldquo;ഫ്രീ 
സോഫ്റ്റ്‍വെയറി&rdquo;നോടു 
സാമ്യമുള്ള (പക്ഷേ 
ഒരുപോലെയുള്ളതല്ല) അർത്ഥം 
വരുന്ന "
+"രീതിയിൽ മറ്റൊരു സംഘം 
&ldquo;ഓപ്പൺ സോഴ്സ്&rdquo; എന്ന പദം 
ഉപയോഗിക്കുന്നുണ്ടു്. 
ഞങ്ങൾക്കു് "
+"ഇഷ്ടമുള്ളതു് &ldquo;ഫ്രീ 
സോഫ്റ്റ്‍വെയർ&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 "
@@ -841,18 +1101,28 @@
 "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 ""
 "ഇതേ വാദങ്ങൾ മറ്റുപല 
പ്രായോഗിക സൃഷ്ടികൾക്കും 
ബാധകമാണു് &mdash; അതായതു്, 
വിദ്യാഭ്യാസ കൃതികളും "
 "റഫറൻസ് വർക്കുകളും പോലുള്ള, 
ഉപയോഗപ്രദമായ അറിവുകൾ 
ഉൾപ്പെടുന്ന സൃഷ്ടികൾ. <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/\";> "
@@ -863,30 +1133,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 ""
-"&ldquo;ഫ്രീ 
സോഫ്റ്റ്‍വെയറി&rdquo;നോടു 
സാമ്യമുള്ള (പക്ഷേ 
ഒരുപോലെയുള്ളതല്ല) അർത്ഥം 
വരുന്ന "
-"രീതിയിൽ മറ്റൊരു സംഘം 
&ldquo;ഓപ്പൺ സോഴ്സ്&rdquo; എന്ന പദം 
ഉപയോഗിക്കുന്നുണ്ടു്. 
ഞങ്ങൾക്കു് "
-"ഇഷ്ടമുള്ളതു് &ldquo;ഫ്രീ 
സോഫ്റ്റ്‍വെയർ&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."
@@ -895,7 +1145,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 "
@@ -910,7 +1160,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.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -922,7 +1172,7 @@
 "തകരാറുകൾ സ്വാതന്ത്ര്യം 
0-ത്തെ 
നിഷേധിക്കുന്നില്ലെന്നും, 
സ്വാതന്ത്ര്യം 1-ഉം 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.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -933,7 +1183,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.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
@@ -943,7 +1193,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 "
@@ -953,7 +1203,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 "
@@ -963,7 +1213,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 "
@@ -973,7 +1223,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 "
@@ -985,7 +1235,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.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -997,7 +1247,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 "
@@ -1010,7 +1260,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 "
@@ -1024,7 +1274,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 "
@@ -1036,7 +1286,7 @@
 "പ്രസ്താവിച്ച കാര്യം 
വിശദീകരിക്കുന്നു, താങ്കളുടെ 
പരിഷ്കരിച്ച പതിപ്പു് 
താങ്കളുടെ 
കംപ്യൂട്ടിങ്ങിനായി "
 "ഉപയോഗിക്കുന്നതു് 
സ്വാതന്ത്ര്യം 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.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
@@ -1046,7 +1296,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 "
@@ -1059,7 +1309,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 "
@@ -1069,7 +1319,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 "
@@ -1079,7 +1329,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">പതിപ്പു് 1.80</a>: 
സ്വാതന്ത്ര്യം 1 സൈദ്ധാന്തികം "
 "മാത്രമല്ല, 
പ്രായോഗികവുമാകണം; അതായതു്, 
ടിവോയൈസേഷൻ (tivoization) പാടില്ല."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1090,7 +1340,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 "
@@ -1102,7 +1352,7 @@
 "വ്യക്തമാക്കിയിട്ടില്ലാത്ത, 
അല്ലെങ്കിൽ ചില സ്ഥലങ്ങളിൽ 
പ്രസ്താവിച്ചിട്ടുണ്ടെങ്കിലും
 എല്ലായിടത്തും "
 "സാരാംശം 
സ്പഷ്ടമാക്കിയിട്ടില്ലാത്ത, 
വിഷയങ്ങളുടെ നാലു 
വിശദീകരണങ്ങൾ:"
 
-#. 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 "
@@ -1112,7 +1362,7 @@
 "ചെയ്യുന്നതെന്നതിനെ ഗണ്യമായ 
രീതിയിൽ നിയന്ത്രിക്കാൻ അ
നുമതിപത്രത്തിനു 
കഴിയുമെന്നു് "
 "അർത്ഥമാക്കുന്നില്ല."
 
-#. 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."
@@ -1120,15 +1370,15 @@
 "നിലവിലുള്ള മൊ‍ഡ്യൂളുകൾ 
കൂട്ടിച്ചേർക്കുന്നതിനുള്ള അ
വകാശം സൂചിപ്പിക്കുന്നതു് അ
നുചിതമായ അനുമതിപത്രത്തോടു "
 "കൂടിയ മൊഡ്യൂളുകളെയാണു്."
 
-#. 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 "
@@ -1138,7 +1388,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 "
@@ -1148,7 +1398,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 "
@@ -1158,7 +1408,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 "
@@ -1170,7 +1420,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.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1182,7 +1432,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 "
@@ -1194,7 +1444,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.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1204,7 +1454,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 "
@@ -1214,7 +1464,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 "
@@ -1226,7 +1476,7 @@
 "ആവശ്യപ്പെടുന്നുണ്ടെങ്കിൽ 
താങ്കൾ വിതരണം ചെയ്ത 
പതിപ്പുകളുടെ ഒരു പകർപ്പു് അ
യയ്ക്കാൻ താങ്കളോടു് ഒരു "
 "സ്വതന്ത്ര അനുമതിപത്രം 
ആവശ്യപ്പെട്ടേക്കാം എന്നു 
ശ്രദ്ധിക്കുക."
 
-#. 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 "
@@ -1244,11 +1494,11 @@
 "sw.html?root=www&amp;view=log\">സിവിഎസ്‍വെബ് 
ഇന്റർഫേസു</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 "
@@ -1285,6 +1535,7 @@
 "നിര്‍ദ്ദേശങ്ങളും അ
ഭിപ്രായങ്ങളും <a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
 "webmasters@gnu.org&gt;</a> എന്ന 
വിലാസത്തിലേയ്ക്കു് 
എഴുതാവുന്നതാണു്."
 
+# TODO: submitting -> contributing.
 # type: Content of: <div><p>
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
@@ -1293,14 +1544,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 ""
 "ഗ്നു താളുകളുടെ മലയാളം 
പരിഭാഷകള്‍ കൃത്യവും 
നിലവാരമുള്ളതുമാക്കാൻ 
ഞങ്ങള്‍ പരമാവധി 
ശ്രമിക്കുന്നുണ്ടു്. "
@@ -1311,12 +1568,18 @@
 "README.translations.html\">Translations README</a> നോക്കുക."
 
 #. type: Content of: <div><p>
+# | 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, 2021 Free Software "
-"Foundation, Inc. | സ്വതന്ത്ര 
സോഫ്റ്റ്‍വെയർ പ്രസ്ഥാനം, Inc."
+"പകർപ്പവകാശം &copy; 1996, 2002, 2004-2007, 2009-2019 
സ്വതന്ത്ര സോഫ്റ്റ്‍വെയർ 
പ്രസ്ഥാനം, "
+"Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -1340,6 +1603,16 @@
 msgid "Updated:"
 msgstr "പുതുക്കിയതു്:"
 
+#~ msgid "Open Source?"
+#~ msgstr "ഓപ്പൺ സോഴ്സ്?"
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software "
+#~ "Foundation, Inc. | സ്വതന്ത്ര 
സോഫ്റ്റ്‍വെയർ പ്രസ്ഥാനം, Inc."
+
 #~ msgid ""
 #~ "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
 #~ "free program must be available for commercial use, commercial "
@@ -1380,13 +1653,6 @@
 #~ msgstr "വിവിധ ആശയങ്ങൾ 
വ്യക്തമാക്കുന്നു"
 
 #~ msgid ""
-#~ "Copyright &copy; 1996, 2002, 2004-2007, 2009-2019 Free Software "
-#~ "Foundation, Inc."
-#~ msgstr ""
-#~ "പകർപ്പവകാശം &copy; 1996, 2002, 2004-2007, 2009-2019 
സ്വതന്ത്ര സോഫ്റ്റ്‍വെയർ "
-#~ "പ്രസ്ഥാനം, Inc."
-
-#~ msgid ""
 #~ "The rest of this page clarifies certain points about what makes specific "
 #~ "freedoms adequate or not."
 #~ msgstr ""

Index: free-sw.nb.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.nb.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- free-sw.nb.po       3 Feb 2021 13:03:03 -0000       1.21
+++ free-sw.nb.po       16 Jul 2021 10:02:24 -0000      1.22
@@ -10,7 +10,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"
@@ -21,7 +21,11 @@
 "Outdated-Since: 2002-02-13 01:26+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 "Hva er fri programvare? - GNU Prosjektet - Free Software Foundation"
 
 #. type: Attribute 'content' of: <meta>
@@ -46,41 +50,14 @@
 "Siden 1983 har vi utviklet det frie Unix-lignende operativsystemet GNU for "
 "at brukere skal få friheten til å dele og forbedre programvaren de bruker."
 
-#. 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 "Hva er fri programvare?"
 
-#. 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>
-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 ""
-
-#. 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,
@@ -108,7 +85,28 @@
 "«Fri programvare» handler om frihet, ikke om pris. For å forstå 
konseptet, "
 "må du tenke på «talefrihet», ikke «gratis øl»."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | 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.-] {+software, even to <a
+# | href=\"/philosophy/selling.html\">sell copies</a>.+}
+#, fuzzy
+#| msgid ""
+#| "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."
+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 ""
+"Du kan ha betalt penger for kopier av GNU programvare, eller du kan ha fått "
+"tak i kopier uten kostnad. Men uansett hvilken måte du fikk kopiene dine, "
+"har du alltid friheten til å kopiere og modifisere programvaren."
+
+#. 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 "
@@ -119,11 +117,140 @@
 "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>
+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>
+# | [-The-]{+<a href=\"#run-the-program\">The+} freedom to run the program as
+# | you [-wish, for any purpose (freedom 0).-] {+wish</a>+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr ""
+"Friheten til å kjøre programmet som du ønsker, uansett hensikt (frihet 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 ""
+"Friheten til å redistribuere kopier så du kan hjelpe din neste (frihet 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 ""
+
+#. 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 ""
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | [-&ldquo;Free software&rdquo; refers to the users' freedom to run, copy,
 # | distribute, study, change and improve the software.  More precisely, it
 # | refers to four kinds of freedom, for-]{+A program is free software if+}
@@ -142,13 +269,13 @@
 "distribuere, studere, forandre på og forbedre programvaren. Mer presist "
 "refererer det til fire typer frihet, for brukerne av programvaren:"
 
-#. 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 ""
 "Friheten til å kjøre programmet som du ønsker, uansett hensikt (frihet 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.
@@ -164,7 +291,7 @@
 "Friheten til å studere hvordan programmet virker, og tilpasse det til dine "
 "behov (frihet 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
@@ -175,7 +302,7 @@
 msgstr ""
 "Friheten til å redistribuere kopier så du kan hjelpe din neste (frihet 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
@@ -195,7 +322,7 @@
 "Friheten til å forbedre programmet, og gi det ut med dine forbedringer til "
 "offentlig eie, slik at hele samfunnet kan få utbytte (frihet 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 "
@@ -203,7 +330,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 "
@@ -214,7 +341,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, "
@@ -223,7 +354,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 "
@@ -236,7 +367,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 "
@@ -244,7 +375,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 "
@@ -255,39 +386,18 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | 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.-] {+software, even to <a
-# | href=\"/philosophy/selling.html\">sell copies</a>.+}
-#, fuzzy
-#| msgid ""
-#| "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."
-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 ""
-"Du kan ha betalt penger for kopier av GNU programvare, eller du kan ha fått "
-"tak i kopier uten kostnad. Men uansett hvilken måte du fikk kopiene dine, "
-"har du alltid friheten til å kopiere og modifisere programvaren."
-
-#. 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 as you [-wish, for any purpose (freedom
 # | 0).-] {+wish+}
 #, fuzzy
@@ -297,7 +407,7 @@
 msgstr ""
 "Friheten til å kjøre programmet som du ønsker, uansett hensikt (frihet 0)."
 
-#. 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 "
@@ -309,7 +419,7 @@
 "but you are not entitled to impose your purposes on her."
 msgstr ""
 
-#. 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 "
@@ -318,7 +428,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, "
@@ -329,18 +439,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>
 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 "
@@ -349,7 +459,7 @@
 "code&rdquo; is not real source code and does not count as source code."
 msgstr ""
 
-#. 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 "
@@ -361,7 +471,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 "
@@ -370,21 +480,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
@@ -395,7 +505,7 @@
 msgstr ""
 "Friheten til å redistribuere kopier så du kan hjelpe din neste (frihet 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
@@ -425,7 +535,7 @@
 "friheten til å gjøre dette betyr (bl.a) at du ikke må spørre om eller 
betale "
 "for tillatelse."
 
-#. 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 "
@@ -437,16 +547,16 @@
 "forandringene, skal du ikke være nødt til å underrette noen som helst, på 
"
 "noen som helst måte."
 
-#. 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 "
@@ -457,15 +567,16 @@
 "redistribute such forms should you find or develop a way to make them."
 msgstr ""
 
-#. 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
+# | [-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.
@@ -480,7 +591,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."
@@ -492,7 +603,7 @@
 "andre mennesker retten til sentrale friheter. Denne regelen er ikke i "
 "konflikt med de sentrale frihetene; den beskytter dem istedet."
 
-#. 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/"
@@ -513,11 +624,11 @@
 "beskrivelse om hvordan «fri programvare», «copylefted programvare» og 
andre "
 "kategorier og andre programvarekategorier er beslektet."
 
-#. 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
@@ -556,7 +667,7 @@
 "på den samme betingelsen. (Merk at en slik regel etterlater seg uansett "
 "valget om du vil legge programmet tilgjengelig eller ikke.)"
 
-#. 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 "
@@ -568,7 +679,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 "
@@ -578,20 +689,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</"
@@ -602,15 +714,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 ""
 "Av og til kan regjeringers <a id=\"exportcontrol\">eksport kontroll</a> "
 "regulasjoner og handelsanksjoner hindre deg i friheten til å distribuere "
@@ -620,7 +732,7 @@
 "måten vil restriksjonene ikke virke på aktiviterer og mennesker utenfor "
 "jurisdiksjonene til disse regjeringene."
 
-#. 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 "
@@ -630,11 +742,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
@@ -657,7 +769,7 @@
 "ikke gjør noe galt; hvis utvikleren av programvaren har makten til å fjerne 
"
 "lisensen, selv om du ikke har grunnlag, blir programvaren ufri."
 
-#. 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 "
@@ -666,17 +778,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-"
@@ -688,7 +800,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 "
@@ -696,11 +808,63 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition in Practice"
+msgstr ""
+
+#. type: Content of: <div><div><h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+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 ""
+
+#. type: Content of: <div><div><h4>
+msgid "Get help with free licenses"
+msgstr ""
+
+#. 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 "
+"licenses</a>.  If the license you are concerned with is not listed there, "
+"you can ask us about it by sending us email at <a href=\"mailto:";
+"licensing@gnu.org\">&lt;licensing@gnu.org&gt;</a>."
+msgstr ""
+
+#. 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 "
+"different free software licenses means increased work for users in "
+"understanding the licenses; we may be able to help you find an existing free "
+"software license that meets your needs."
+msgstr ""
+
+#. 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><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
@@ -739,74 +903,35 @@
 "philosophy/fs-translations.html\"> oversettelser av «fri programvare»</a> "
 "til flere språk."
 
-#. type: Content of: <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."
-msgstr ""
-
-#. type: Content of: <div><h4>
-msgid "Get help with free licenses"
-msgstr ""
-
-#. type: Content of: <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 "
-"licenses</a>.  If the license you are concerned with is not listed there, "
-"you can ask us about it by sending us email at <a href=\"mailto:";
-"licensing@gnu.org\">&lt;licensing@gnu.org&gt;</a>."
-msgstr ""
-
-#. type: Content of: <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 "
-"different free software licenses means increased work for users in "
-"understanding the licenses; we may be able to help you find an existing free "
-"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."
+"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 ""
 
-#. type: Content of: <div><h3>
+#. 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 "
 "effect part of the software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. 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=\"http://wikipedia.org";
+"educational works and reference works.  <a href=\"https://wikipedia.org";
 "\">Wikipedia</a> is the best-known example."
 msgstr ""
 
-#. 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/\";> "
@@ -814,30 +939,16 @@
 msgstr ""
 
 #. 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 ""
-
-#. 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 "
@@ -846,7 +957,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 "
@@ -854,42 +965,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 "
@@ -897,7 +1008,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 "
@@ -905,7 +1016,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 "
@@ -913,7 +1024,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 "
@@ -922,7 +1033,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 "
@@ -930,14 +1041,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 "
@@ -945,21 +1056,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 "
@@ -967,7 +1078,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 "
@@ -975,49 +1086,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 "
@@ -1025,7 +1136,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 "
@@ -1033,7 +1144,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 "
@@ -1041,21 +1152,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 "
@@ -1063,7 +1174,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 "
@@ -1074,11 +1185,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 "
@@ -1112,15 +1223,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 ""
 "Vennligst se <a href=\"/server/standards/README.translations.html"
@@ -1130,8 +1246,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, 1997, 1998, 1999 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1167,6 +1283,16 @@
 msgstr "Uppdaterad:"
 
 #, 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."
+#~ msgstr ""
+#~ "Vennligst se <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for informasjon om koordinering og "
+#~ "innsendelse  av oversettelser av denne siden."
+
+#, 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, "

Index: free-sw.nl.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.nl.po,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- free-sw.nl.po       30 May 2021 20:26:36 -0000      1.60
+++ free-sw.nl.po       16 Jul 2021 10:02:24 -0000      1.61
@@ -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: 2021-05-03 21:17+0200\n"
 "Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -16,11 +16,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.3\n"
 "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 "Wat is vrije software? - Het GNU-project - Free Software Foundation"
 
 #. type: Attribute 'content' of: <meta>
@@ -42,55 +47,14 @@
 "zodat computergebruikers de vrijheid hebben om de software die zij gebruiken "
 "te delen en te verbeteren."
 
-#. 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 "Wat is vrije software?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "De definitie van Vrije 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 ""
-"Heb je een vraag over vrijesoftwarelicenties die hier niet wordt beantwoord? "
-"Zie onze andere <a href=\"http://www.fsf.org/licensing\";>licentiepagina's</"
-"a> of neem contact op met het <i>Compliance Lab</i> van de FSF via <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 ""
-"De definitie van vrije software bepaalt de criteria waarmee je een programma "
-"kunt aanmerken als vrij. Zo nu en dan schaven we die definitie bij om iets "
-"te verduidelijken of subtiele problemen uit te sluiten. Zie het <a href="
-"\"#History\">historisch overzicht</a> hieronder met veranderingen die reeds "
-"zijn doorgevoerd."
-
-#. 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 bron&rdquo; is iets anders: de filosofie en achterliggende "
-"waarden zijn anders. De praktische definitie ervan is ook anders, maar bijna "
-"alle open-bron-programma's zijn ook vrij. We leggen het verschil uit in <a "
-"href=\"/philosophy/open-source-misses-the-point.html\"> Waarom &ldquo;open "
-"bron&rdquo; de essentie van vrije software niet begrijpt</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, "
@@ -112,7 +76,18 @@
 "bedoelen dat de software gratis is<a href=\"#tn1\" id=\"tn1-ref\" class="
 "\"transnote\">[1]</a>."
 
-#. 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 ""
+"Of je nu betaald hebt voor vrije software, of niet, je hebt altijd het recht "
+"om deze software te kopi&euml;ren en te veranderen zelfs om <a href=\"/"
+"philosophy/selling.html\">kopie&euml;n te verkopen</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,12 +106,198 @@
 "het programma; dit maakt het programma <a href=\"/philosophy/free-software-"
 "even-more-important.html\"> een instrument van onrechtvaardige macht</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 bron&rdquo; is iets anders: de filosofie en achterliggende "
+"waarden zijn anders. De praktische definitie ervan is ook anders, maar bijna "
+"alle open-bron-programma's zijn ook vrij. We leggen het verschil uit in <a "
+"href=\"/philosophy/open-source-misses-the-point.html\"> Waarom &ldquo;open "
+"bron&rdquo; de essentie van vrije software niet begrijpt</a>."
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Inhoudsopgave"
+
+#. 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 "De definitie van Vrije Software"
+
+# Nieuw
+#. 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 "De vier essenti&euml;le vrijheden"
+
+#. 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 "Het verschil tussen vrij en niet-vrij"
+
+# Nieuw
+#. 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 "De vrijheid om het programma te gebruiken zoals jij dat wilt"
+
 # Nieuw
-#. type: Content of: <div><h4>
+#. 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 "De vrijheid om de broncode te bestuderen en veranderen"
+
+# Nieuw
+#. 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 ""
+"De vrijheid om het programma op jouw manier te verspreiden: basisvereisten"
+
+#. 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 "Bepalingen met betrekking tot verspreiden"
+
+# type: Content of: <ul><li>
+#. type: Content of: <div><div><div><ul><li><ul><li>
+# | <a [-href=\"http://patron.fsf.org/\";>Corporate Patronage</a>-]
+# | {+href=\"#exportcontrol\">Export regulations</a>+}
+#, fuzzy
+#| msgid "<a href=\"http://patron.fsf.org/\";>Corporate Patronage</a>"
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr "<a href=\"http://patron.fsf.org/\";>Bedrijfssteun</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 "Contractgebaseerde licenties"
+
+#. 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 "Hoe we deze criteria interpreteren"
+
+#. 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 "Hulp verkrijgen met vrije licenties"
+
+#. 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 "De juiste terminologie"
+
+#. 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 ""
+"Heb je een vraag over vrijesoftwarelicenties die hier niet wordt beantwoord? "
+"Zie onze andere <a href=\"http://www.fsf.org/licensing\";>licentiepagina's</"
+"a> of neem contact op met het <i>Compliance Lab</i> van de FSF via <a href="
+"\"mailto:licensing@fsf.org\";>licensing@fsf.org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "De definitie van Vrije Software"
+
+#. 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 ""
+"De definitie van vrije software bepaalt de criteria waarmee je een programma "
+"kunt aanmerken als vrij. Zo nu en dan schaven we die definitie bij om iets "
+"te verduidelijken of subtiele problemen uit te sluiten. Zie het <a href="
+"\"#History\">historisch overzicht</a> hieronder met veranderingen die reeds "
+"zijn doorgevoerd."
+
+# Nieuw
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "De vier essenti&euml;le vrijheden"
 
-#. 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 +305,14 @@
 "Een programma is vrije software wanneer de gebruikers vier essenti&euml;le "
 "vrijheden hebben: <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 ""
 "De vrijheid om het programma te gebruiken zoals jij dat wilt, voor elk doel "
 "(vrijheid 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 "
@@ -161,13 +322,13 @@
 "aan te passen aan je behoeften (vrijheid 1). Beschikbaarheid van de broncode "
 "is noodzakelijk hiervoor."
 
-#. 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 ""
 "De vrijheid om het programma te verspreiden, zodat je anderen kan helpen "
 "(vrijheid 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 "
@@ -178,7 +339,7 @@
 "gemeenschap hier voordeel van heeft (vrijheid 3). Beschikbaarheid van de "
 "broncode is ook hiervoor noodzakelijk."
 
-#. 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 "
@@ -191,7 +352,7 @@
 "schieten in het vrij zijn, maar dit doen we niet: we beschouwen ze allemaal "
 "als net zo onethisch."
 
-#. 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 "
@@ -209,7 +370,11 @@
 "beide vrij zijn. Echter, als we A wijzigen zodat het B niet nodig heeft, "
 "hoeft alleen A vrij te zijn; B is dan niet meer 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 +387,7 @@
 "gebruik, -ontwikkeling en -distributie. Dit is van cruciaal belang&mdash; "
 "zonder mist vrije software zijn doel."
 
-#. 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 +409,7 @@
 "commerci&euml;le software is heel belangrijk. Betalen voor ondersteuning van "
 "vrije software vult een belangrijke behoefte."
 
-#. 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 "
@@ -256,7 +421,7 @@
 "vaststellen dat een programma met dergelijke restricties geen vrije software "
 "is."
 
-#. 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 "
@@ -272,22 +437,15 @@
 "of vereisen dat men betaalt, knaagt in wezen aan deze vier vrijheden en "
 "maakt het programma daardoor niet-vrij."
 
-#. 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 ""
-"Of je nu betaald hebt voor vrije software, of niet, je hebt altijd het recht "
-"om deze software te kopi&euml;ren en te veranderen zelfs om <a href=\"/"
-"philosophy/selling.html\">kopie&euml;n te verkopen</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 "Het verschil tussen vrij en niet-vrij"
 
-#. 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 "
@@ -298,11 +456,11 @@
 "programma te maken."
 
 # Nieuw
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "De vrijheid om het programma te gebruiken zoals jij dat wilt"
 
-#. 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 "
@@ -322,7 +480,7 @@
 "naar iemand anders dan mag die het ook voor eigen doeleinden gebruiken. Jij "
 "mag daarbij als distributeur geen beperkingen opleggen."
 
-#. 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 "
@@ -335,7 +493,7 @@
 "met de functionaliteit die het programma heeft, of het werkt in een bepaalde "
 "omgeving, of hoe nuttig het is voor wat je wil doen."
 
-#. 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, "
@@ -353,7 +511,7 @@
 "doordat vrijheden 1 en 3 hen in staat stelt om zelf nieuwe versies te maken "
 "en distribueren met daarin de gewenste functionaliteit."
 
-#. 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 "
@@ -364,11 +522,11 @@
 "een programma niet te gebruiken.&rdquo;"
 
 # Nieuw
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "De vrijheid om de broncode te bestuderen en veranderen"
 
-#. 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 "
@@ -382,7 +540,7 @@
 "software. Versleutelde &ldquo;broncode&rdquo; is geen echte broncode en telt "
 "hierin dus niet mee."
 
-#. 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 "
@@ -402,7 +560,7 @@
 "Er is onvoldoende vrijheid zonder dit recht. Oftewel, deze programma's zijn "
 "geen vrije software, ook al is de broncode waarvan het gemaakt is dat wel."
 
-#. 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 "
@@ -415,7 +573,7 @@
 "je, bijvoorbeeld, de auteursrechten van die code bezit, dan is die licentie "
 "t&eacute; beperkend en is het resultaat dus niet vrij."
 
-#. 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 "
@@ -425,7 +583,7 @@
 "veranderingen alleen zijn toegestaan als anderen die veranderingen als "
 "verbetering beschouwen, is dat geen vrijheid."
 
-#. 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 "
@@ -437,12 +595,12 @@
 "programma te wissen.&rdquo;"
 
 # Nieuw
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr ""
 "De vrijheid om het programma op jouw manier te verspreiden: basisvereisten"
 
-#. 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 "
@@ -457,7 +615,7 @@
 "niemand  toestemming hoeft te vragen of te betalen wanneer je deze dingen "
 "wil doen."
 
-#. 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 "
@@ -469,11 +627,25 @@
 "Als je de veranderingen vrijgeeft, ben je niet verplicht om dat aan iemand "
 "te melden."
 
-#. 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 ""
@@ -484,7 +656,7 @@
 "die niet toestaat dat veranderde versies niet vrij zijn is geen vrije "
 "licentie."
 
-#. 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 "
@@ -504,16 +676,31 @@
 "dergelijks te kunnen distribueren wanneer je een methode ontwikkelt of vindt "
 "om dit toch te doen."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "Auteursplicht"
 
 #
-#. 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."
@@ -525,7 +712,7 @@
 "andere mensen de basisvrijheden te ontzeggen. Deze regel beperkt de "
 "basisvrijheden niet, het beschermt ze juist."
 
-#. 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/"
@@ -546,11 +733,11 @@
 "&ldquo;auteursplichtige software&rdquo; en andere soorten software zich tot "
 "elkaar verhouden."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Bepalingen met betrekking tot verspreiden"
 
-#. 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 "
@@ -570,7 +757,7 @@
 "je bent toch al aan het wijzigen dus nog wat meer wijzigen kan er nog wel "
 "bij."
 
-#. 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 "
@@ -590,7 +777,7 @@
 "broncode aan je gebruikers moet vrijgeven van versies die je uitbrengt zijn "
 "ook acceptabel."
 
-#. 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 "
@@ -604,21 +791,42 @@
 "Hierdoor kun je het origineel niet vervangen. Dit is alleen acceptabel "
 "wanneer er een configuratiesysteem is wat dit mogelijk maakt."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Exportregels"
 
-#. 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 ""
 "Soms kunnen <a id=\"exportcontrol\">exportregels</a> en handelsboycotten van "
 "de overheid de vrijheid om op internationaal niveau software te verspreiden "
@@ -630,7 +838,7 @@
 "Vrijesoftwarelicenties mogen dus niet vereisen dat je je houdt aan "
 "exportbeperkingen."
 
-#. 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 "
@@ -647,11 +855,11 @@
 "verandering van exportwetten in de toekomst de vereiste realistisch maakt en "
 "dus de software niet-vrij zou maken."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Wettelijke overwegingen"
 
-#. 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 "
@@ -665,7 +873,7 @@
 "terugwerkende kracht beperkingen aan de voorwaarden kan toevoegen, zonder "
 "dat jij als gebruiker iets fout doet, dan is die software niet-vrij."
 
-#. 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 "
@@ -680,7 +888,7 @@
 "van niet-vrije programma's, als je die gebruikt. Dit maakt de licentie niet-"
 "vrij."
 
-#. 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."
@@ -688,11 +896,11 @@
 "Het is acceptabel als een vrije licentie aangeeft welke wetgeving van "
 "toepassing is, of waar rechtszaken moeten worden gehouden, of beide."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Contractgebaseerde licenties"
 
-#. 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-"
@@ -712,7 +920,7 @@
 "opleggen, wat betekent dat de kans groter is dat er onacceptabele "
 "beperkingen in zitten waardoor de software niet-vrij is."
 
-#. 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 "
@@ -725,47 +933,54 @@
 "genoemd als acceptabel, dan zullen we hierover na moeten denken maar de "
 "conclusie zal hoogstwaarschijnlijk zijn dat het niet-vrij is."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "De juiste terminologie"
-
-#. 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 ""
-"Wanneer gesproken wordt over vrije software is het raadzaam termen als "
-"&ldquo;gratis&rdquo; te vermijden, omdat deze de suggestie wekken dat vrije "
-"software altijd kosteloos is; dit is niet het geval.  Om termen als &ldquo;"
-"piraterij&rdquo; kan ook het best met een grote boog heen worden gezeild. "
-"Zie <a href=\"/philosophy/words-to-avoid.html\">termen die verwarring zaaien "
-"en beter vermeden kunnen worden</a>.  We hebben ook een lijst met <a href=\"/"
-"philosophy/fs-translations.html\">vertalingen van de term &ldquo;vrije "
-"software&rdquo;</a> in diverse talen."
+#. 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 "De definitie van Vrije Software"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Hoe we deze criteria interpreteren"
 
-#. 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 ""
 "Merk tenslotte op dat je goed moet nadenken over de criteria die hier aan "
 "vrije software worden gesteld. Om te beslissen of een licentie aan die "
@@ -777,11 +992,11 @@
 "uit zijn zullen we vaak die criteria aanpassen om zo in de toekomst "
 "makkelijker te kunnen bepalen of een licentie goed is of niet."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Hulp verkrijgen met vrije licenties"
 
-#. 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 "
@@ -794,7 +1009,7 @@
 "licenties</a>. Wanneer de licentie niet op de lijst voorkomt, vraag het ons "
 "dan via <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 "
@@ -808,7 +1023,7 @@
 "begrijpen; we kunnen je wellicht helpen een passende bestaande "
 "vrijesoftwarelicentie te vinden."
 
-#. 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 "
@@ -818,11 +1033,65 @@
 "kunnen wij je helpen ervoor te zorgen dat het echt vrije software blijft en "
 "diverse praktische problemen te vermijden."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "De juiste terminologie"
+
+#. 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 ""
+"Wanneer gesproken wordt over vrije software is het raadzaam termen als "
+"&ldquo;gratis&rdquo; te vermijden, omdat deze de suggestie wekken dat vrije "
+"software altijd kosteloos is; dit is niet het geval.  Om termen als &ldquo;"
+"piraterij&rdquo; kan ook het best met een grote boog heen worden gezeild. "
+"Zie <a href=\"/philosophy/words-to-avoid.html\">termen die verwarring zaaien "
+"en beter vermeden kunnen worden</a>.  We hebben ook een lijst met <a href=\"/"
+"philosophy/fs-translations.html\">vertalingen van de term &ldquo;vrije "
+"software&rdquo;</a> in diverse talen."
+
+#. 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 ""
+"Een andere groep gebruikt de term &ldquo;open bron&rdquo; (of &ldquo;open "
+"source&rdquo;) als iets wat wel lijkt op &ldquo;vrije software&rdquo; maar "
+"het niet is. Wij gebruiken liever de term &ldquo;vrije software&rdquo; omdat "
+"die onmiddellijk in verband wordt gebracht met vrijheid. Dat heb je niet met "
+"de term <a href= \"/philosophy/open-source-misses-the-point.html\">open "
+"bron</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Software en verder"
 
-#. 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 "
@@ -832,11 +1101,21 @@
 "zijn</a> om dezelfde redenen dat software vrij moet zijn. Ook omdat "
 "handleidingen feitelijk onderdeel zijn van het pakket."
 
-#. 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 ""
 "Hetzelfde gaat eigenlijk op voor allerlei soorten werken met een praktische "
@@ -844,7 +1123,7 @@
 "lesmateriaal en naslagwerken. <a href=\"http://wikipedia.org\";>Wikipedia</a> "
 "is daarvan het beste voorbeeld."
 
-#. 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/\";> "
@@ -855,30 +1134,10 @@
 "\">vrije cultuur</a>, die van toepassing kan zijn op allerlei dingen."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Open bron?"
-
-#. 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 ""
-"Een andere groep gebruikt de term &ldquo;open bron&rdquo; (of &ldquo;open "
-"source&rdquo;) als iets wat wel lijkt op &ldquo;vrije software&rdquo; maar "
-"het niet is. Wij gebruiken liever de term &ldquo;vrije software&rdquo; omdat "
-"die onmiddellijk in verband wordt gebracht met vrijheid. Dat heb je niet met "
-"de term <a href= \"/philosophy/open-source-misses-the-point.html\">open "
-"bron</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Geschiedenis"
 
-#. 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."
@@ -887,7 +1146,7 @@
 "lijst van substantiële wijzigingen, met daarbij verwijzingen naar wat "
 "precies is veranderd."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -900,7 +1159,7 @@
 "vrijheid om het programma uit te voeren betekent dat niets jou weerhoudt dat "
 "te doen."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -912,7 +1171,7 @@
 "dat vrijheid 0 de vrijheid is om het programma uit te voeren zoals je wenst "
 "en dat vrijheden 1 en 3 gebruikers in staat stelt het te verwijderen."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -923,7 +1182,7 @@
 "vrijheid om het programma uit te voeren betekent dat niets jou weerhoudt dat "
 "te doen."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -933,7 +1192,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Versie 1.141</a>: Verduidelijkt welke "
 "code vrij moet zijn."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -943,7 +1202,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Versie 1.135</a>: Vermeldt elke keer "
 "dat vrijheid 0 de vrijheid is om het programma uit te voeren zoals je wenst."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -953,7 +1212,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Versie 1.134</a>: Vrijheid 0 heeft niet "
 "te maken met de functionaliteit van een programma."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -964,7 +1223,7 @@
 "mag niet vereisen dat je akkoord gaat met een niet-vrije licentie van een "
 "ander programma."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -976,7 +1235,7 @@
 "de keuze van wetten en keuze van forum-specificaties zijn toegestaan. (Dit "
 "was altijd ons beleid.)"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -988,7 +1247,7 @@
 "is een echt probleem als de vereiste niet-triviaal is; anders is het alleen "
 "een potentieel probleem."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1001,7 +1260,7 @@
 "wijzigingen je hebt gemaakt. En wijzigingen zijn niet beperkt tot &ldquo;"
 "verbeteringen&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 "
@@ -1016,7 +1275,7 @@
 "<em>toestemmingen</em> geven voor gebruik van het werk door het werk "
 "tegelijkertijd op een andere manier te verspreiden."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1029,7 +1288,7 @@
 "dat het inhoudt dat je je gewijzigde versie daadwerkelijk kan gebruiken voor "
 "je computeractiviteiten."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1039,7 +1298,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Versie 1.92</a>: Verduidelijkt dat "
 "geobfusceerde broncode geen broncode is."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1052,7 +1311,7 @@
 "of verbeterde versie te verspreiden, niet het recht om deel te nemen in de "
 "ontwikkeling van iemand anders."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1062,7 +1321,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Versie 1.89</a>: Vrijheid 3 houdt het "
 "recht in om gewijzigde versies als vrije software uit te brengen."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1072,7 +1331,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Versie 1.80</a>: Vrijheid 1 moet "
 "praktisch zijn, niet slechts theoretisch; dus geen tivoisatie."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1084,7 +1343,7 @@
 "veranderingen aan de licentie met terugwerkende kracht onacceptabel zijn, "
 "zelfs als het niet is beschreven als complete vervanging."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1096,7 +1355,7 @@
 "van punten die niet expliciet genoeg zijn, of op sommige plekken vermeld "
 "zijn maar niet overal zo behandeld worden:"
 
-#. 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 "
@@ -1106,7 +1365,7 @@
 "aan de veranderde versies die men uitbrengt. Vrijheid 3 gaat ook over het "
 "uitbrengen van veranderde versies, niet alleen wijzigingen."
 
-#. 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."
@@ -1114,17 +1373,17 @@
 "Het recht om samen te voegen met bestaande modules gaat over modules met de "
 "juiste licentie."
 
-#. 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 "Vermeldt duidelijk de exportbeperkingen."
 
-#. 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 ""
 "Een wijziging in de licentie doorvoeren betekent ook het vervallen van de "
 "oude licentie."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1134,7 +1393,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Versie 1.57</a>: Sectie &quot;Software en "
 "verder&quot; toegevoegd."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1144,7 +1403,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Versie 1.46</a>: Verduidelijkt welk doel "
 "van belang is bij de vrijheid om het programma voor elk doel te gebruiken."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1154,7 +1413,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Versie 1.41</a>: Bewoordingen over "
 "contract-gebaseerde licenties verduidelijkt."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1166,7 +1425,7 @@
 "licentie jou moet toestaan om andere beschikbare vrije software te gebruiken "
 "om jouw wijzigingen te maken."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1178,7 +1437,7 @@
 "acceptabel is als een licentie vereist dat je de bron levert voor versies "
 "van software die publiekelijk gebruikt kunnen worden."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1190,7 +1449,7 @@
 "acceptabel is als een licentie vereist dat je jezelf kenbaar maakt als de "
 "auteur van wijzigingen. Andere kleine verduidelijkingen in de hele tekst."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1200,7 +1459,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Versie 1.23</a>: Potentiële problemen "
 "aangekaart die gerelateerd zijn aan contract-gebaseerde licenties."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1210,7 +1469,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Versie 1.16</a>: Uitgelegd waarom het "
 "verspreiden van binaire bestanden belangrijk is."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1222,7 +1481,7 @@
 "licentie kan vereisen dat je kopie&euml;n van versies die je verspreidt, "
 "zendt naar vorige ontwikkelaars op aanvraag."
 
-#. 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,11 +1498,11 @@
 "href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;view=log\">cvsweb-interface</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Voetnoot"
 
-#. 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 "
@@ -1293,14 +1552,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 ""
 "We doen ons best om goede vertalingen te maken maar staan altijd open voor "
@@ -1310,9 +1575,15 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. 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."
@@ -1339,6 +1610,21 @@
 msgid "Updated:"
 msgstr "Bijgewerkt:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Open bron?"
+
+#~ 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 ""
+#~ "We doen ons best om goede vertalingen te maken maar staan altijd open "
+#~ "voor verbeteringen. Suggesties, op- en aanmerkingen sturen aan: <a href="
+#~ "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>.</"
+#~ "p> <p>Zie <a href=\"/server/standards/README.translations.html\"> "
+#~ "Translations README</a> voor informatie over het onderhoud van "
+#~ "vertalingen op deze website."
+
 #~ msgid ""
 #~ "The rest of this page clarifies certain points about what makes specific "
 #~ "freedoms adequate or not."

Index: free-sw.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pl.po,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- free-sw.pl.po       19 Mar 2021 23:21:40 -0000      1.109
+++ free-sw.pl.po       16 Jul 2021 10:02:24 -0000      1.110
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.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: 2021-03-19 15:49-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <www-pl-trans@gnu.org>\n"
@@ -17,12 +17,17 @@
 "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: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 1.0.0-beta1\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 to Wolne Oprogramowanie? - Projekt GNU - Fundacja Wolnego Oprogramowania"
 
@@ -44,57 +49,14 @@
 "zapewnić użytkownikom komputerów swobodę wymiany i&nbsp;ulepszania "
 "oprogramowania, którego używają."
 
-#. 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 "Co to wolne oprogramowanie?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definicja Wolnego Oprogramowania"
-
-#. 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 ""
-"Macie pytanie o licencjach wolnego oprogramowania, na&nbsp;które nie "
-"znaleźliście tu odpowiedzi? Zobaczcie nasze <a href=\"http://www.fsf.org/";
-"licensing\">zasoby o licencjach</a> i, jeśli to konieczne, skontaktujcie 
się "
-"z&nbsp;FSF Compliance Lab pod&nbsp;adresem <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 ""
-"Definicja wolnego oprogramowania przedstawia jakie warunki muszą zostać "
-"spełnione aby&nbsp;konkretny program uznać za&nbsp;wolne oprogramowanie. "
-"Od&nbsp;czasu do&nbsp;czasu modyfikujemy tę definicję by wyjaśnić pewne "
-"subtelne kwestie. Zajrzyjcie do&nbsp;<a href=\"#History\">sekcji Historia</"
-"a>, aby&nbsp;zobaczyć zmiany w&nbsp;definicji wolnego oprogramowania."
-
-#. 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 ""
-"&bdquo;Open source&rdquo; jest czymś innym: ma bardzo odmienną filozofię "
-"na&nbsp;bazie odmiennych wartości. Praktyczna definicja jest też odmienna, "
-"ale&nbsp;prawie wszystkie programy open source są też wolnym "
-"oprogramowaniem. Objaśniamy różnicę w&nbsp;artykule <a 
href=\"/philosophy/"
-"open-source-misses-the-point.html\">Dlaczego otwartemu oprogramowaniu umyka "
-"idea Wolnego Oprogramowania</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, "
@@ -118,7 +80,24 @@
 "lub&nbsp;hiszpańskiego, [<em>libre software</em>] aby&nbsp;podkreślić, "
 "że&nbsp;nie chodzi o cenę."
 
-#. 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 ""
+"Wolne oprogramowanie&rdquo; nie oznacza &bdquo;niekomercyjne&rdquo;. Wolny "
+"program musi być dostępny do&nbsp;komercyjnego wykorzystywania, 
komercyjnego "
+"rozwijania i&nbsp;komercyjnego rozpowszechniania. Komercyjny rozwój wolnych "
+"programów nie jest już niczym niezwykłym; takie wolne komercyjne "
+"oprogramowanie jest bardzo ważne. Możliwe, że&nbsp;zapłaciliście 
za&nbsp;"
+"kopie wolnych programów, mogliście też otrzymać je bezpłatnie. 
Ale&nbsp;bez "
+"względu na&nbsp;to, w&nbsp;jaki sposób je otrzymaliście, zawsze macie "
+"wolność do&nbsp;kopiowania i&nbsp;modyfikowania programów, a&nbsp;nawet <a 
"
+"href=\"/philosophy/selling.html\">sprzedawania kopii</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 +115,196 @@
 "niewolny lub&nbsp;&bdquo;własnościowy&rdquo; [<em>ang. proprietary</em>] "
 "program jest narzędziem niesprawiedliwej władzy."
 
-#. 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 ""
+"&bdquo;Open source&rdquo; jest czymś innym: ma bardzo odmienną filozofię "
+"na&nbsp;bazie odmiennych wartości. Praktyczna definicja jest też odmienna, "
+"ale&nbsp;prawie wszystkie programy open source są też wolnym "
+"oprogramowaniem. Objaśniamy różnicę w&nbsp;artykule <a 
href=\"/philosophy/"
+"open-source-misses-the-point.html\">Dlaczego otwartemu oprogramowaniu umyka "
+"idea Wolnego Oprogramowania</a>."
+
+#. type: Content of: <div><div><div><h3>
+# | Table of [-C-]{+c+}ontents
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Spis treści"
+
+#. 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 "Definicja Wolnego Oprogramowania"
+
+#. 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 "Cztery niezbędne wolności"
+
+#. 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 "Wyjaśnianie granicy między wolnym a&nbsp;niewolnym"
+
+#. 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 ""
+"Wolność do&nbsp;uruchamiania programu jak chcecie, w&nbsp;dowolnym celu"
+
+#. 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 ""
+"Wolność do&nbsp;analizowania, jak działa program i&nbsp;zmnieniana go "
+"aby&nbsp;robił co i&nbsp;jak potrzebujecie"
+
+#. 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 "Wolność do&nbsp;rozpowszechniania kopii: podstawowe zasady"
+
+#. 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 "Reguły co do&nbsp;szczegółów tworzenia pakietu 
i&nbsp;rozprowadzania"
+
+#. 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\">Ofiarodawcy</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 "Licencje na&nbsp;bazie kontraktu"
+
+#. 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 "Jak interpretujemy te kryteria"
+
+#. 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 "Pomoc z&nbsp;wolnymi licencjami"
+
+#. 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 "Używanie właściwych określeń gdy mowa o wolnym oprogramowaniu"
+
+#. 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 ""
+"Macie pytanie o licencjach wolnego oprogramowania, na&nbsp;które nie "
+"znaleźliście tu odpowiedzi? Zobaczcie nasze <a href=\"http://www.fsf.org/";
+"licensing\">zasoby o licencjach</a> i, jeśli to konieczne, skontaktujcie 
się "
+"z&nbsp;FSF Compliance Lab pod&nbsp;adresem <a href=\"mailto:licensing@fsf.org";
+"\">licensing@fsf.org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Definicja Wolnego Oprogramowania"
+
+#. 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 ""
+"Definicja wolnego oprogramowania przedstawia jakie warunki muszą zostać "
+"spełnione aby&nbsp;konkretny program uznać za&nbsp;wolne oprogramowanie. "
+"Od&nbsp;czasu do&nbsp;czasu modyfikujemy tę definicję by wyjaśnić pewne "
+"subtelne kwestie. Zajrzyjcie do&nbsp;<a href=\"#History\">sekcji Historia</"
+"a>, aby&nbsp;zobaczyć zmiany w&nbsp;definicji wolnego oprogramowania."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "Cztery niezbędne wolności"
 
-#. 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>"
@@ -148,14 +312,14 @@
 "Program jest wolnym oprogramowaniem jeśli użytkownicy programu mają cztery 
"
 "niezbędne wolności: <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 ""
 "Wolność do&nbsp;uruchamiania programu jak chcecie, w&nbsp;dowolnym celu "
 "(wolność 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 "
@@ -165,13 +329,13 @@
 "aby&nbsp;robił co i&nbsp;jak potrzebujecie (wolność 1). Warunkiem 
koniecznym "
 "jest dostęp do&nbsp;kodu źródłowego."
 
-#. 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 ""
 "Wolność do&nbsp;rozpowszechniania kopii, byście mogli pomóc innym 
(wolność "
 "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 "
@@ -182,7 +346,7 @@
 "własnych ulepszeń, dzięki czemu może z&nbsp;nich skorzystać cała 
społeczność "
 "(wolność 3). Warunkiem koniecznym jest tu dostęp do&nbsp;kodu 
źródłowego."
 
-#. 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 "
@@ -194,7 +358,7 @@
 "sposoby rozprowadzania niewolnego oprogramowania, różniące się dystansem "
 "od&nbsp;w pełni wolnego, uważamy wszystkie za&nbsp;równie nieetyczne."
 
-#. 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 +377,11 @@
 "zmodyfikować A&nbsp;aby nie używał B, tylko A&nbsp;musi być wolnym; B nie 
"
 "jest częścią zamiaru."
 
-#. 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, "
@@ -227,7 +395,7 @@
 "podejście jest bardzo ważne &ndash; bez&nbsp;tego, wolne oprogramowanie nie 
"
 "mogłoby osiągnąć swoich celów."
 
-#. 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 "
@@ -249,7 +417,7 @@
 "takie wolne programy są bardzo ważne. Odpłane wsparcje dla wolnych 
programów "
 "wypełnia ważną lukę."
 
-#. 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 "
@@ -261,7 +429,7 @@
 "do&nbsp;sukcesu. Z&nbsp;tego musimy dojść do&nbsp;wniosku, że&nbsp;program 
"
 "z&nbsp;takimi ograniczeniami nie jest e się jako wolne oprogramowanie."
 
-#. 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,28 +447,15 @@
 "jest równoważne z&nbsp;nie wyrażaniem zgody na&nbsp;daną wolność&nbsp;"
 "&ndash; to sprawia, że&nbsp;program jest niewolny."
 
-#. 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 ""
-"Wolne oprogramowanie&rdquo; nie oznacza &bdquo;niekomercyjne&rdquo;. Wolny "
-"program musi być dostępny do&nbsp;komercyjnego wykorzystywania, 
komercyjnego "
-"rozwijania i&nbsp;komercyjnego rozpowszechniania. Komercyjny rozwój wolnych "
-"programów nie jest już niczym niezwykłym; takie wolne komercyjne "
-"oprogramowanie jest bardzo ważne. Możliwe, że&nbsp;zapłaciliście 
za&nbsp;"
-"kopie wolnych programów, mogliście też otrzymać je bezpłatnie. 
Ale&nbsp;bez "
-"względu na&nbsp;to, w&nbsp;jaki sposób je otrzymaliście, zawsze macie "
-"wolność do&nbsp;kopiowania i&nbsp;modyfikowania programów, a&nbsp;nawet <a 
"
-"href=\"/philosophy/selling.html\">sprzedawania kopii</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 "Wyjaśnianie granicy między wolnym a&nbsp;niewolnym"
 
-#. 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 "
@@ -309,12 +464,12 @@
 "Reszta artykułu wyjaśnia dokładniej jak daleko muszą pójść wolności, "
 "aby&nbsp;program był uważany jako wolny."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr ""
 "Wolność do&nbsp;uruchamiania programu jak chcecie, w&nbsp;dowolnym celu"
 
-#. 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 +490,7 @@
 "komuś innemu, to wówczas ta osoba może swobodnie korzystać z&nbsp;niego "
 "do&nbsp;własnych celów, a&nbsp;wy nie macie prawa narzucać mu swoich."
 
-#. 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 "
@@ -349,7 +504,7 @@
 "funkcjonował w&nbsp;danym środowisku, ani&nbsp;czy program robi to, co "
 "chcecie aby&nbsp;robił."
 
-#. 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, "
@@ -368,7 +523,7 @@
 "tworzyć i&nbsp;rozprowadzać zmodyfikowane wersje bez&nbsp;kodu sprawiają
cej "
 "niegodności."
 
-#. 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 "
@@ -376,13 +531,13 @@
 msgstr ""
 "&bdquo;Jak chcecie&rdquo; wlicza &bdquo;w ogóle&rdquo; jeśli tak chcecie."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr ""
 "Wolność do&nbsp;analizowania, jak działa program i&nbsp;zmnieniana go "
 "aby&nbsp;robił co i&nbsp;jak potrzebujecie"
 
-#. 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 "
@@ -397,7 +552,7 @@
 "źródłowy&rdquo; nie jest prawdziwym kodem źródłowym i&nbsp;nie liczy 
się "
 "jako taki."
 
-#. 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 "
@@ -418,7 +573,7 @@
 "praktycznym. Ta postać binarna nie jest wolnym oprogramowaniem nawet jeśli "
 "kod z&nbsp;którego jest kompilowana jest wolny."
 
-#. 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 +588,7 @@
 "autorskie do&nbsp;każdego dodawanego przez siebie kodu &ndash; wówczas jest 
"
 "zbyt restrykcyjna, by uznać ją za&nbsp;wolną."
 
-#. 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 "
@@ -443,7 +598,7 @@
 "wasze prawa dokonywania modyfikacji są ograniczone wyłącznie 
do&nbsp;zmian, "
 "które ktoś inny uzna za&nbsp;udoskonalenie, nie jest to wolny program."
 
-#. 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 "
@@ -453,11 +608,11 @@
 "aby&nbsp;zwrócił kontrolę systemowi po&nbsp;zrobieniu niczego, 
lub&nbsp;aby "
 "wywołał inny program. Więc&nbsp;wolność 1 dquo;uje"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "Wolność do&nbsp;rozpowszechniania kopii: podstawowe zasady"
 
-#. 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 "
@@ -472,7 +627,7 @@
 "tego wszystkiego oznacza (między innymi), że&nbsp;nie musicie prosić o "
 "pozwolenie ani&nbsp;płacić za&nbsp;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 "
@@ -485,11 +640,25 @@
 "dokonane modyfikacje, nie powinniście być zmuszeni do&nbsp;powiadamiania o "
 "tym kogokolwiek, w&nbsp;jakikolwiek sposób."
 
-#. 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 ""
@@ -500,7 +669,7 @@
 "licencja, która wymaga by zmodyfikowane wersje były niewolne, nie "
 "kwalifikuje się jako wolna."
 
-#. 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 "
@@ -520,15 +689,30 @@
 "mieć wolność do&nbsp;rozpowszechniania takich postaci, jeśli znajdziecie "
 "metodę ich utworzenia."
 
-#. 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."
@@ -541,7 +725,7 @@
 "ograniczeń odmawiając głównych swobód innym. Reguła ta nie jest 
sprzeczna "
 "z&nbsp;głównymi swobodami użytkowników, a&nbsp;raczej je chroni."
 
-#. 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 +746,11 @@
 "href=\"/philosophy/categories.html\">Kategorie wolnego i&nbsp;niewolnego "
 "oprogramowania</a>."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Reguły co do&nbsp;szczegółów tworzenia pakietu 
i&nbsp;rozprowadzania"
 
-#. 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 +771,7 @@
 "i&nbsp;tak robicie pewne zmiany w&nbsp;programie, kilka dodatkowych zmian "
 "nie powinno sprawić kłopotu."
 
-#. 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 "
@@ -607,7 +791,7 @@
 "Wymagania nakazujące udostępnienie kodu źródłowego użytkownikom "
 "upublicznionych przez Was wersji są również akceptowalne."
 
-#. 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,21 +807,42 @@
 "tylko jeśli jest prosty sposób wyznaczenia aliasu aby&nbsp;zmodyfikowana "
 "wersja mogła być wywoływana przez alias oryginalnej."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Przepisy eksportowe"
 
-#. 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 ""
 "Czasami rządowe <a id=\"exportcontrol\">przepisy kontroli eksportu</a> "
 "i&nbsp;sankcje handlowe mogą ograniczać waszą wolność rozpowszechniania "
@@ -650,7 +855,7 @@
 "nietrywialnym przepisom eksportowym jako warunek dla korzystania z&nbsp;"
 "którejkolwiek z&nbsp;podstawowych wolności."
 
-#. 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 "
@@ -667,11 +872,11 @@
 "zmiana w&nbsp;przepisach eksportu sprawią, że&nbsp;wymóg jest nietrywialny 
"
 "a&nbsp;oprogramowanie stanie się niewolne."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Zagadnienia prawne"
 
-#. 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 "
@@ -685,7 +890,7 @@
 "ograniczeń do&nbsp;warunków, nawet wówczas, gdy nie zrobiliście niczego, 
co "
 "by taki krok uzasadniało, to oprogramowanie nie jest wolne."
 
-#. 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 "
@@ -699,7 +904,7 @@
 "używa niewolne programy by to wymagało przestrzeganie warunków tych "
 "niewolnych programów; to jest oznaką niewolnej licencji."
 
-#. 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."
@@ -708,11 +913,11 @@
 "obowiązuje, lub&nbsp;gdzie powinien być złożony pozew sądowy, 
lub&nbsp;jedno "
 "i&nbsp;drugie."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Licencje na&nbsp;bazie kontraktu"
 
-#. 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-"
@@ -734,7 +939,7 @@
 "To znaczy, że&nbsp;istnieje wiele możliwych sposobów, w&nbsp;jakie taka "
 "licencja mogłaby być niedopuszczalnie restrykcyjna, niewolna."
 
-#. 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 "
@@ -749,48 +954,54 @@
 "musieli to przemyśleć i&nbsp;zapewne dojdziemy do&nbsp;wniosku, 
że&nbsp;nie "
 "jest wolna."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Używanie właściwych określeń gdy mowa o wolnym oprogramowaniu"
-
-#. 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 ""
-"Mówiąc o wolnym oprogramowaniu, najlepiej unikać określeń takich jak 
&bdquo;"
-"rozdawać&rdquo; czy&nbsp;&bdquo;bezpłatny&rdquo;, gdyż niejawnie sugerują 
"
-"one, że&nbsp;chodzi o cenę, a&nbsp;nie o wolność. Niektóre powszechnie "
-"używane określenia, jak &bdquo;piractwo&rdquo;, są wyrazem poglądów, "
-"których, mamy nadzieję, nie podzielacie. Zachęcamy do&nbsp;przeczytania "
-"omówienia zatytułowanego <a 
href=\"/philosophy/words-to-avoid.html\">&bdquo;"
-"Mylące słowa i&nbsp;sformułowania, których lepiej unikać&rdquo;</a>. 
Mamy "
-"też listę prawidłowych <a href=\"/philosophy/fs-translations.html"
-"\">tłumaczeń terminu &bdquo;free software&rdquo;</a> na&nbsp;różne 
języki."
+#. 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 "Definicja Wolnego Oprogramowania"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Jak interpretujemy te kryteria"
 
-#. 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 ""
 "Na&nbsp;koniec, warto zauważyć, że&nbsp;takie kryteria, jak ustanowione "
 "w&nbsp;tej definicji wolnego oprogramowania, wymagają uważnego namysłu "
@@ -807,11 +1018,11 @@
 "często uaktualniamy powyższe kryteria, by wyjaśnić, dlaczego pewne 
licencje "
 "kwalifikują się bądź&nbsp;nie."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Pomoc z&nbsp;wolnymi licencjami"
 
-#. 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 "
@@ -826,7 +1037,7 @@
 "wiadomość na&nbsp;adres <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 "
@@ -841,7 +1052,7 @@
 "uda nam się pomóc wam w&nbsp;znalezieniu istniejącej już licencji wolnego 
"
 "oprogramowania, która spełni wasze oczekiwania."
 
-#. 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 "
@@ -852,11 +1063,67 @@
 "że&nbsp;będzie to faktycznie licencja wolnego oprogramowania i&nbsp;"
 "unikniecie różnych problemów praktycznych."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Używanie właściwych określeń gdy mowa o wolnym oprogramowaniu"
+
+#. 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 ""
+"Mówiąc o wolnym oprogramowaniu, najlepiej unikać określeń takich jak 
&bdquo;"
+"rozdawać&rdquo; czy&nbsp;&bdquo;bezpłatny&rdquo;, gdyż niejawnie sugerują 
"
+"one, że&nbsp;chodzi o cenę, a&nbsp;nie o wolność. Niektóre powszechnie "
+"używane określenia, jak &bdquo;piractwo&rdquo;, są wyrazem poglądów, "
+"których, mamy nadzieję, nie podzielacie. Zachęcamy do&nbsp;przeczytania "
+"omówienia zatytułowanego <a 
href=\"/philosophy/words-to-avoid.html\">&bdquo;"
+"Mylące słowa i&nbsp;sformułowania, których lepiej unikać&rdquo;</a>. 
Mamy "
+"też listę prawidłowych <a href=\"/philosophy/fs-translations.html"
+"\">tłumaczeń terminu &bdquo;free software&rdquo;</a> na&nbsp;różne 
języki."
+
+#. 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 ""
+"Inna grupa używa terminu &bdquo;open source&rdquo; na&nbsp;oznaczenie 
czegoś "
+"zbliżonego (lecz nie identycznego) do&nbsp;&bdquo;wolnego "
+"oprogramowania&rdquo;. Wolimy określenie &bdquo;wolne oprogramowanie&rdquo;, 
"
+"gdyż od&nbsp;chwili, gdy tylko usłyszy się, o które znaczenie 
przymiotnika "
+"w&nbsp;nim chodzi, przywołuje ono na&nbsp;myśl wolność. Słowo &bdquo;"
+"open&rdquo; ani&nbsp;&bdquo;otwarte&rdquo; <a href=\"/philosophy/open-source-"
+"misses-the-point.html\"> nigdy nie wywołują takich skojarzeń</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Poza oprogramowaniem"
 
-#. 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 "
@@ -867,11 +1134,21 @@
 "musi być wolne, a&nbsp;także dlatego, że&nbsp;podręczniki są 
w&nbsp;istocie "
 "częścią oprogramowania."
 
-#. 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 ""
 "Te same argumenty są prawdziwe także w&nbsp;przypadku innych rodzajów 
dzieł "
@@ -879,7 +1156,7 @@
 "wiedzę, jak na&nbsp;przykład materiały edukacyjne i&nbsp;źródłowe. <a 
href="
 "\"http://wikipedia.org\";>Wikipedia</a> jest najbardziej znanym przykładem."
 
-#. 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/\";> "
@@ -891,31 +1168,10 @@
 "rodzaju."
 
 #. 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 ""
-"Inna grupa używa terminu &bdquo;open source&rdquo; na&nbsp;oznaczenie 
czegoś "
-"zbliżonego (lecz nie identycznego) do&nbsp;&bdquo;wolnego "
-"oprogramowania&rdquo;. Wolimy określenie &bdquo;wolne oprogramowanie&rdquo;, 
"
-"gdyż od&nbsp;chwili, gdy tylko usłyszy się, o które znaczenie 
przymiotnika "
-"w&nbsp;nim chodzi, przywołuje ono na&nbsp;myśl wolność. Słowo &bdquo;"
-"open&rdquo; ani&nbsp;&bdquo;otwarte&rdquo; <a href=\"/philosophy/open-source-"
-"misses-the-point.html\"> nigdy nie wywołują takich skojarzeń</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Historia"
 
-#. 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."
@@ -924,7 +1180,7 @@
 "Tutaj znajduje się lista znacznych modyfikacji wraz z&nbsp;odnośnikami, by "
 "zilustrować co dokładnie uległo zmianom."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -942,7 +1198,7 @@
 "dowolne niedogodności w&nbsp;kodzie nie negują wolności 0, oraz&nbsp;że "
 "wolności 1 i&nbsp;3 zezwalają użytkonikom na&nbsp;ich usunięcie."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -954,7 +1210,7 @@
 "dowolne niedogodności w&nbsp;kodzie nie negują wolności 0, oraz&nbsp;że "
 "wolności 1 i&nbsp;3 zezwalają użytkonikom na&nbsp;ich usunięcie."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -965,7 +1221,7 @@
 "że&nbsp;wolność do&nbsp;uruchamiania programu oznacza, że&nbsp;nic Was 
nie "
 "powstrzymuje aby&nbsp;go uruchomić."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -975,7 +1231,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Wyjaśnić jaki kod "
 "musi być wolny."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -986,7 +1242,7 @@
 "że&nbsp;wolność 0 jest aby&nbsp;uruchamiać program w&nbsp;sposób jaki 
się "
 "chce."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -996,7 +1252,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Wolność 0 nie jest "
 "kwestią funkcjonalności programu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1006,7 +1262,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Wersja 1.131</a>: Wolna licencja nie "
 "może wymagać dotrzymywania warunków niewolnej licencji innego programu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1018,7 +1274,7 @@
 "że&nbsp;wybór jurysdykcji prawa i&nbsp;miejsce składanie pozwów jest "
 "dozwolone. (Zawsze mieliśmy takie stanowisko.)"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1030,7 +1286,7 @@
 "eksportu jest problematyczny jeśli wymóg jest nietrywialny; w&nbsp;"
 "przeciwnym wypadku jest tylko potencjalnym problemem."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1042,7 +1298,7 @@
 "problemem jest prawo do&nbsp;robienia zmian, a&nbsp;nie jakich zmian się "
 "dokonuje. Zmiany nie są ograniczone do&nbsp;&bdquo;ulepszeń&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 "
@@ -1057,7 +1313,7 @@
 "<em>przyzwolenia</em> na&nbsp;używanie twórczości poprzez&nbsp;wydanie "
 "twórczości równolegle na&nbsp;inne sposoby."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 +1325,7 @@
 "w wolności 1. (już opisanej w&nbsp;wersji 1.80), że&nbsp;to wlicza "
 "uruchamianie zmodyfikowanej wersji programu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 +1335,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Wersja 1.92</a>: Wyjaśnienie, że&nbsp;"
 "zaciemniony kod nie kwalifikuje się jako kod źródłowy."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 +1348,7 @@
 "bądź&nbsp;usprawnionych przez was wersji, a&nbsp;nie prawo do&nbsp;"
 "uczestniczenia w&nbsp;rozwoju czyjegoś projektu "
 
-#. type: Content of: <ul><li>
+#. type: Content 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 +1358,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Wersja 1.89</a>: Wolność 3 zawiera prawo 
"
 "do&nbsp;udostępniania zmodyfikowanej wersji jako wolnego oprogramowania."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 +1368,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Wersja1.80</a>: Wolność 1 musi być "
 "praktyczna, nie tylko teoretyczna; na&nbsp;przykład tiwoizacja."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 +1380,7 @@
 "wszystkie wsteczne zmiany w&nbsp;licencji są nie do&nbsp;zaakceptowania, "
 "nawet jeśli nie jest to całkowita zmiana licencji."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 +1392,7 @@
 "odnośnie nie dość wyraźnych, lub&nbsp;podniesionych w&nbsp;niektórych "
 "miejscach lecz&nbsp;nie wszędzie odzwierciedlonych stwierdzeń:"
 
-#. 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 +1403,7 @@
 "wolność do&nbsp;dystrybucji zmodyfikowanych wersji, nie tylko dokonanych "
 "zmian."
 
-#. 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,16 +1411,16 @@
 "Prawo do&nbsp;włączania istniejących modułów odnosi się do&nbsp;tych, 
które "
 "są odpowiednio licencjonowane."
 
-#. 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 "Wyraźne podsumowanie dotyczące kontroli eksportu."
 
-#. 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 ""
 "Wprowadzenie zmiany w&nbsp;licencji powoduje odwołanie starej licencji."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1174,7 +1430,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Wersja 1.57</a>: Dodanie sekcji &quot;"
 "Poza oprogramowaniem&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 "
@@ -1185,7 +1441,7 @@
 "są istotne w&nbsp;wolności do&nbsp;uruchamiania programu w&nbsp;dowolnym "
 "celu."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1195,7 +1451,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Wersja 1.41</a>: Wyjaśnienie treści "
 "dotyczącej licencji opartych o umowy."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1207,7 +1463,7 @@
 "wolna licencja musi pozwalać wam na&nbsp;wykorzystanie innego dostępnego "
 "wolnego oprogramowania w&nbsp;celu stworzenia waszej modyfikacji."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1219,7 +1475,7 @@
 "to, że&nbsp;dopuszczalne jest, gdy licencja nakazuje wam dostarczenie kodu "
 "źródłowego wersji programu, który udostępniacie do&nbsp;publicznego 
użytku."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1231,7 +1487,7 @@
 "to, że&nbsp;dopuszczalne jest, gdy licencja nakazuje wam wskazanie swojej "
 "osoby jako autora modyfikacji. Inne mniejsze wyjaśnienia."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1241,7 +1497,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Wersja 1.23</a>: Zwrócenie uwagi na&nbsp;"
 "potencjalne problemy związane z&nbsp;licencjami opartymi na&nbsp;umowach."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1251,7 +1507,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Wersja 1.16</a>: Wyjaśnienie dlaczego "
 "rozpowszechnianie postaci binarnej programu jest istotne."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1263,7 +1519,7 @@
 "wolna licencja może wymagać od&nbsp;Was wysłania kopi wersji którą "
 "rozpowszechniacie poprzednim autorom, jeśli o to poproszą."
 
-#. 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 "
@@ -1281,11 +1537,11 @@
 "\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;view=log\">interfejs cvsweb</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Przypis"
 
-#. 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 "
@@ -1327,14 +1583,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 ""
 "Staramy się, aby&nbsp;tłumaczenia były wierne i&nbsp;wysokiej jakości, "
@@ -1347,9 +1609,15 @@
 "tłumaczeń</a>."
 
 #. 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, Free Software Foundation, "
 "Inc."
@@ -1376,3 +1644,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Aktualizowane:"
+
+#~ msgid "Open Source?"
+#~ msgstr "Open Source?"

Index: free-sw.pot
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pot,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- free-sw.pot 3 Feb 2021 13:03:03 -0000       1.73
+++ free-sw.pot 16 Jul 2021 10:02:24 -0000      1.74
@@ -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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-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>
@@ -33,29 +33,41 @@
 "use."
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+msgid "What is Free Software?"
 msgstr ""
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
+#. 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, "
+"copy, distribute, study, change and improve the software</b>.  Thus, "
+"&ldquo;free software&rdquo; is a matter of liberty, not price.  To "
+"understand the concept, you should think of &ldquo;free&rdquo; as in "
+"&ldquo;free speech,&rdquo; not as in &ldquo;free beer&rdquo;.  We sometimes "
+"call it &ldquo;libre software,&rdquo; borrowing the French or Spanish word "
+"for &ldquo;free&rdquo; as in freedom, to show we do not mean the software is "
+"gratis."
 msgstr ""
 
-#. type: Content of: <div><blockquote><p>
+#. 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>."
+"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 ""
 
 #. 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."
+"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 program, we call it "
+"a &ldquo;nonfree&rdquo; or &ldquo;proprietary&rdquo; program.  The nonfree "
+"program controls the users, and the developer controls the program; this "
+"makes the program <a "
+"href=\"/philosophy/free-software-even-more-important.html\"> an instrument "
+"of unjust power</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
@@ -67,57 +79,135 @@
 "&ldquo;Open Source&rdquo; misses the point of Free Software</a>."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><h3>
+msgid "Table of contents"
+msgstr ""
+
+#. type: Content of: <div><div><div><ul><li>
+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 ""
-"&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, "
-"&ldquo;free software&rdquo; is a matter of liberty, not price.  To "
-"understand the concept, you should think of &ldquo;free&rdquo; as in "
-"&ldquo;free speech,&rdquo; not as in &ldquo;free beer&rdquo;.  We sometimes "
-"call it &ldquo;libre software,&rdquo; borrowing the French or Spanish word "
-"for &ldquo;free&rdquo; as in freedom, to show we do not mean the software is "
-"gratis."
+"<a href=\"#make-changes\">The freedom to study the source code and make "
+"changes</a>"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><ul><li><ul><li>
 msgid ""
-"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 program, we call it "
-"a &ldquo;nonfree&rdquo; or &ldquo;proprietary&rdquo; program.  The nonfree "
-"program controls the users, and the developer controls the program; this "
-"makes the program <a "
-"href=\"/philosophy/free-software-even-more-important.html\"> an instrument "
-"of unjust power</a>."
+"<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><h4>
+#. 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>
+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>
 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 ""
 
-#. 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 "
 "precondition for this."
 msgstr ""
 
-#. 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 ""
 
-#. 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 "
@@ -125,7 +215,7 @@
 "this."
 msgstr ""
 
-#. 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 "
@@ -133,7 +223,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 "
@@ -144,7 +234,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, "
@@ -153,7 +247,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 "
@@ -166,7 +260,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 "
@@ -174,7 +268,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 "
@@ -185,30 +279,22 @@
 "program nonfree."
 msgstr ""
 
-#. 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 ""
-
-#. 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 "
@@ -220,7 +306,7 @@
 "but you are not entitled to impose your purposes on her."
 msgstr ""
 
-#. 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 "
@@ -229,7 +315,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 "
@@ -240,18 +326,18 @@
 "modified versions 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>
 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 "
@@ -260,7 +346,7 @@
 "code&rdquo; is not real source code and does not count as source code."
 msgstr ""
 
-#. 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 "
@@ -272,7 +358,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 "
@@ -281,25 +367,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>
 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 "
@@ -308,7 +394,7 @@
 "have to ask or pay for permission to do so."
 msgstr ""
 
-#. 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 "
@@ -316,17 +402,17 @@
 "anyone in particular, or in any particular way."
 msgstr ""
 
-#. 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\">copyleft</a> license.  However, a license "
+"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 "
@@ -337,21 +423,21 @@
 "redistribute such forms should you find or develop a way to make them."
 msgstr ""
 
-#. 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>
 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."
 msgstr ""
 
-#. 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 "
@@ -363,11 +449,11 @@
 "software&rdquo; and other categories of software relate to each other."
 msgstr ""
 
-#. 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 "
@@ -379,7 +465,7 @@
 "changes to the program, so you won't have trouble making a few more."
 msgstr ""
 
-#. 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 "
@@ -391,7 +477,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 "
@@ -401,24 +487,24 @@
 "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>
 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 ""
 
-#. 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 "
@@ -428,11 +514,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>
 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 "
@@ -441,7 +527,7 @@
 "the software is not free."
 msgstr ""
 
-#. 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 "
@@ -450,17 +536,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 "
@@ -472,7 +558,7 @@
 "such a license could 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 "
@@ -480,46 +566,34 @@
 "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"
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition in Practice"
 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 ""
-
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><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."
+"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 ""
 
-#. 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 "
@@ -528,7 +602,7 @@
 "href=\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</a>."
 msgstr ""
 
-#. 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 "
@@ -537,33 +611,58 @@
 "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>
+#. 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 ""
+
+#. type: Content of: <div><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; never refers to freedom."
+msgstr ""
+
+#. 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 "
 "effect part of the software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. 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=\"http://wikipedia.org\";>Wikipedia</a> is the best-known example."
+"href=\"https://wikipedia.org\";>Wikipedia</a> is the best-known example."
 msgstr ""
 
-#. 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/\";> "
@@ -571,31 +670,16 @@
 msgstr ""
 
 #. 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 ""
-
-#. 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
 "
@@ -605,7 +689,7 @@
 "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
 "
@@ -613,7 +697,7 @@
 "freedom 0, and that freedoms 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
 "
@@ -621,14 +705,14 @@
 "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
 "
@@ -636,14 +720,14 @@
 "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
 "
@@ -651,7 +735,7 @@
 "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
 "
@@ -659,7 +743,7 @@
 "specifications are allowed.  (This 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
 "
@@ -667,7 +751,7 @@
 "requirement is nontrivial; otherwise it 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
 "
@@ -676,7 +760,7 @@
 "&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
 "
@@ -686,7 +770,7 @@
 "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
 "
@@ -695,14 +779,14 @@
 "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
 "
@@ -711,7 +795,7 @@
 "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
 "
@@ -719,7 +803,7 @@
 "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
 "
@@ -727,7 +811,7 @@
 "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
 "
@@ -735,7 +819,7 @@
 "unacceptable, even if it's not 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
 "
@@ -743,35 +827,35 @@
 "some places but not reflected 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
 "
@@ -779,14 +863,14 @@
 "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
 "
@@ -794,7 +878,7 @@
 "free software to create your 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
 "
@@ -802,7 +886,7 @@
 "source for versions of 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
 "
@@ -811,21 +895,21 @@
 "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
 "
@@ -833,7 +917,7 @@
 "versions you distribute to 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 "
@@ -844,11 +928,11 @@
 "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 "
@@ -881,7 +965,7 @@
 #
 #.         &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>. 
@@ -889,13 +973,14 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
 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 ""
 
 #. type: Content of: <div><p>

Index: free-sw.pt-br.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pt-br.po,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- free-sw.pt-br.po    3 May 2021 14:42:22 -0000       1.74
+++ free-sw.pt-br.po    16 Jul 2021 10:02:24 -0000      1.75
@@ -12,7 +12,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-05-03 10:15-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -20,11 +20,14 @@
 "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: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
 #. type: Content of: <title>
-msgid "What is 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 "O que é o software livre? - Projeto GNU - Free Software Foundation"
 
 #. type: Attribute 'content' of: <meta>
@@ -45,57 +48,13 @@
 "que usuários de computador possam ter a liberdade de compartilhar e melhorar 
"
 "o software que usam."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "What is free software?"
+msgid "What is Free Software?"
 msgstr "O que é o software livre?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "A Definição de Software Livre"
-
-#. 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 ""
-"Tem alguma dúvida sobre licenciamento de software livre não respondida 
aqui? "
-"Veja nossos outros <a href=\"http://www.fsf.org/licensing\";>recursos de "
-"licenciamento</a> e, se necessário, contate o laboratório de conformidade 
da "
-"FSF em <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 definição de software livre apresenta os critérios utilizados para 
definir "
-"se um programa de computador em particular se qualifica como software livre "
-"ou não. De tempos em tempos nós revisamos essa definição, para 
esclarecê-la "
-"ou para resolver questões mais sutis. Veja a <a href=\"#History\">seção "
-"Histórico</a> abaixo para uma lista de mudanças que afetam a definição de 
"
-"software livre."
-
-#. 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 ""
-"“Código aberto” (ou <i>open source</i>) é algo diferente: tem uma 
filosofia "
-"muito diferente baseada em valores diferentes. Sua definição prática 
também "
-"é diferente, mas quase todos os programas de código aberto são de fato "
-"livres. Nós explicamos a diferença em <a href=\"/philosophy/open-source-"
-"misses-the-point.html\">Por que o “Código Aberto” não compartilha dos "
-"objetivos do Software Livre</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, "
@@ -116,7 +75,20 @@
 "emprestado a palavra em francês ou espanhol para “livre”, para reforçar 
o "
 "entendimento de que não nos referimos a software como grátis."
 
-#. 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 ""
+"Você pode ter pago dinheiro por suas cópias de software livre, ou você 
pode "
+"tê-las obtido a custo zero, mas independentemente de como você conseguiu "
+"suas cópias, você sempre deve ter a liberdade para copiar e mudar o "
+"software, ou mesmo para <a href=\"/philosophy/selling.html\">vender cópias</"
+"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 +106,170 @@
 "não livre é “privativo” e, portanto, <a 
href=\"/philosophy/free-software-"
 "even-more-important.html\">um 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 ""
+"“Código aberto” (ou <i>open source</i>) é algo diferente: tem uma 
filosofia "
+"muito diferente baseada em valores diferentes. Sua definição prática 
também "
+"é diferente, mas quase todos os programas de código aberto são de fato "
+"livres. Nós explicamos a diferença em <a href=\"/philosophy/open-source-"
+"misses-the-point.html\">Por que o “Código Aberto” não compartilha dos "
+"objetivos do Software Livre</a>."
+
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Conteúdo"
+
+#. 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 "A Definição de Software Livre"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "The four essential freedoms"
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr "As quatro liberdades essenciais"
+
+#. 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>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr "Esclarecendo a fronteira entre livre e não livre"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "A liberdade de executar o programa como você desejar"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "A liberdade de estudar o código-fonte e fazer alterações"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "A liberdade de redistribuir se assim desejar: 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>
+#, fuzzy
+#| msgid "Rules about packaging and distribution details"
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr "Regras sobre detalhes de empacotamento e distribuição"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "<a href=\"#contributor\" id=\"TOCcontributor\">Contributors</a>"
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr "<a href=\"#contributor\" id=\"TOCcontributor\">Colaboradores</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>
+#, fuzzy
+#| msgid "Contract-based licenses"
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr "Licenças baseadas em contratos"
+
+#. 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>
+#, fuzzy
+#| msgid "How we interpret these criteria"
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr "Como nós interpretamos esses critérios"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "Get help with free licenses"
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr "Consiga ajuda com licenças livres"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "Use as palavras corretas ao falar sobre software livre"
+
+#. 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>
+#, fuzzy
+#| msgid "<a href=\"#other\" id=\"TOCother\">Other</a>"
+msgid "<a href=\"#History\">History</a>"
+msgstr "<a href=\"#other\" id=\"TOCother\">Outros</a>"
+
+#. 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 ""
+"Tem alguma dúvida sobre licenciamento de software livre não respondida 
aqui? "
+"Veja nossos outros <a href=\"http://www.fsf.org/licensing\";>recursos de "
+"licenciamento</a> e, se necessário, contate o laboratório de conformidade 
da "
+"FSF em <a href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "A Definição de Software Livre"
+
+#. 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 definição de software livre apresenta os critérios utilizados para 
definir "
+"se um programa de computador em particular se qualifica como software livre "
+"ou não. De tempos em tempos nós revisamos essa definição, para 
esclarecê-la "
+"ou para resolver questões mais sutis. Veja a <a href=\"#History\">seção "
+"Histórico</a> abaixo para uma lista de mudanças que afetam a definição de 
"
+"software livre."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "As quatro liberdades essenciais"
 
-#. 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>"
@@ -146,14 +277,14 @@
 "Um programa é software livre se os usuários possuem as quatro liberdades "
 "essenciais: <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 ""
 "A liberdade de executar o programa como você desejar, para qualquer "
 "propósito (liberdade 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 "
@@ -163,13 +294,13 @@
 "necessidades (liberdade 1). Para tanto, acesso ao código-fonte é um pré-"
 "requisito."
 
-#. 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 ""
 "A liberdade de redistribuir cópias de modo que você possa ajudar outros "
 "(liberdade 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 "
@@ -181,7 +312,7 @@
 "beneficiar de suas mudanças. Para tanto, acesso ao código-fonte é um pré-"
 "requisito."
 
-#. 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 "
@@ -193,7 +324,7 @@
 "distinguir vários esquemas de distribuição não livres em termos de eles "
 "falham em serem livres, consideramos todos eles igualmente antiéticos."
 
-#. 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 "
@@ -212,7 +343,11 @@
 "forma que ele não use B, apenas A precisa ser livre; B não é pertinente "
 "àquele planejamento."
 
-#. 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, "
@@ -225,7 +360,7 @@
 "distribuição comercial. Essa política é de fundamental importância – 
sem "
 "ela, o software livre não poderia atingir seus 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 "
@@ -247,7 +382,7 @@
 "livre comercial é muito importante. O suporte profissional pago para "
 "software livre atende a uma necessidade importante."
 
-#. 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 "
@@ -259,7 +394,7 @@
 "obstruiria seu caminho para o sucesso. Devemos concluir que um programa "
 "licenciado com tais restrições não se qualifica como software livre."
 
-#. 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 "
@@ -277,24 +412,13 @@
 "equivale a não conceder as liberdades em questão e, portanto, torna o "
 "programa não livre."
 
-#. 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 ""
-"Você pode ter pago dinheiro por suas cópias de software livre, ou você 
pode "
-"tê-las obtido a custo zero, mas independentemente de como você conseguiu "
-"suas cópias, você sempre deve ter a liberdade para copiar e mudar o "
-"software, ou mesmo para <a href=\"/philosophy/selling.html\">vender cópias</"
-"a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr "Esclarecendo a fronteira entre livre e não livre"
 
-#. 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 "
@@ -304,11 +428,11 @@
 "liberdades precisam ser estendidas, em várias questões, para um programa 
ser "
 "livre."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "A liberdade de executar o programa como você desejar"
 
-#. 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 "
@@ -329,7 +453,7 @@
 "será livre para executá-lo com os propósitos dela, mas você não é 
intitulado "
 "a impor seus propósitos sobre ela."
 
-#. 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 +467,7 @@
 "em qualquer ambiente dado ou se ele é útil para alguma atividade "
 "computacional específica."
 
-#. 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, "
@@ -362,7 +486,7 @@
 "usuários e comunidades façam e distribuam versões modificadas sem o 
código "
 "arbitrário de incômodo."
 
-#. 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 "
@@ -372,11 +496,11 @@
 "você deseja. Portanto, não há necessidade de uma outra “liberdade para 
não "
 "executar um programa”."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "A liberdade de estudar o código-fonte e fazer alterações"
 
-#. 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 "
@@ -390,7 +514,7 @@
 "condição necessária para o software livre. Código-fonte “obscurecido” 
não é "
 "código-fonte real e não conta como código-fonte."
 
-#. 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 "
@@ -410,7 +534,7 @@
 "binários não são software livre mesmo que o código-fonte a partir do qual 
"
 "foram compilados seja livre."
 
-#. 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 "
@@ -424,7 +548,7 @@
 "seja o detentor dos direitos autorais de qualquer código que adicionar — "
 "então essa licença é muito restritiva para ser qualificada como livre."
 
-#. 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 "
@@ -435,7 +559,7 @@
 "fundamentalmente, a mudanças que outra pessoa considere um aperfeiçoamento, 
"
 "o programa não é livre."
 
-#. 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 "
@@ -445,11 +569,11 @@
 "retorne após não fazer nada, ou fazê-lo invocar algum outro programa. "
 "Portanto, a liberdade 1 inclui a “liberdade de excluir o programa”."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "A liberdade de redistribuir se assim desejar: requisitos básicos"
 
-#. 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 "
@@ -463,7 +587,7 @@
 "qualquer lugar</a>. Ser livre para fazer tudo isso significa (entre outras "
 "coisas) que você não deve ter que pedir ou pagar pela permissão para 
fazê-lo."
 
-#. 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 "
@@ -475,11 +599,18 @@
 "Se publicar suas modificações, você não deve ser obrigado a avisar 
ninguém "
 "em particular, ou de qualquer modo em particular."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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 ""
@@ -489,7 +620,7 @@
 "\"/copyleft/copyleft.html\">copyleft</a>. No entanto, a licença que requer "
 "que modificações sejam não livres não se qualifica como uma licença 
livre."
 
-#. 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,15 +639,23 @@
 "este recurso), mas deve ser concedida a liberdade de se redistribuir nessas "
 "formas caso seja desenvolvido um meio de criá-las."
 
-#. 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>
+#, 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."
@@ -529,7 +668,7 @@
 "pessoas. Essa regra não entra em conflito com as liberdade centrais; na "
 "verdade, ela as protege."
 
-#. 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/"
@@ -549,11 +688,11 @@
 "uma descrição de como “software livre” e “copylefted software” e 
outras "
 "categorias de software se relacionam umas com as outras."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Regras sobre detalhes de empacotamento e distribuição"
 
-#. 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 "
@@ -574,7 +713,7 @@
 "fazendo outras modificações ao programa, não terá muitos problemas em 
fazer "
 "algumas a mais."
 
-#. 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 "
@@ -594,7 +733,7 @@
 "fonte para os usuários para versões que você fez públicas também são "
 "aceitáveis."
 
-#. 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 "
@@ -610,21 +749,32 @@
 "requerimento é aceitável apenas quando existe uma maneira de especificar um 
"
 "nome substituto, de modo que o programa modificado possa ser invocado."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Regulamentações de exportação"
 
-#. 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>
+#, 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 ""
 "Algumas vezes, as <a id=\"exportcontrol\">regulamentações de controle de "
 "exportação</a> governamentais e sanções comerciais podem reprimir sua "
@@ -637,7 +787,7 @@
 "qualquer regulamentações não triviais de exportação como uma condição 
para "
 "exercer qualquer das liberdades essenciais."
 
-#. 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 "
@@ -654,11 +804,11 @@
 "lei de exportação poderia tornar os requerimentos em não triviais e, "
 "portanto, tornar o software não livre."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Considerações legais"
 
-#. 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 "
@@ -672,7 +822,7 @@
 "retroativamente a seus termos, sem que você faça nada errado para dar um "
 "motivo, o software não é livre."
 
-#. 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 "
@@ -686,7 +836,7 @@
 "que roda programas não livres isso resultaria em exigir conformidade com as "
 "licenças daqueles programas não livres; isso faz da licença não livre."
 
-#. 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."
@@ -694,11 +844,11 @@
 "É aceitável para uma licença livre especificar a lei de qual jurisdição 
se "
 "aplica, ou onde a litigância deve ser feita, ou ambos."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Licenças baseadas em contratos"
 
-#. 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-"
@@ -719,7 +869,7 @@
 "significa que existem muitas maneiras nas quais tal licença pode ser "
 "inaceitavelmente restritiva e não livre."
 
-#. 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 "
@@ -732,47 +882,42 @@
 "teremos que pensar sobre isso, e provavelmente iremos concluir que ela é 
não "
 "livre."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Use as palavras corretas ao falar sobre software livre"
-
-#. 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 ""
-"Quando falamos sobre software livre, é melhor evitar termos como “dado” 
ou "
-"“de graça”, porque estes termos implicam que a questão é o preço, 
não a "
-"liberdade. Alguns termos comuns como “pirataria” englobam opiniões que 
nós "
-"esperamos que você não endosse. Veja <a href=\"/philosophy/words-to-avoid."
-"html\">Palavras e Termos Confusos que é Melhor Evitar</a> para uma 
discussão "
-"desses termos. Nós também temos uma lista de <a href=\"/philosophy/fs-"
-"translations.html\">traduções apropriadas de “free software”</a> em 
várias "
-"línguas."
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "A Definição de Software Livre"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Como nós interpretamos esses critérios"
 
-#. 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 ""
 "Finalmente, note que os critérios como aqueles exprimidos nessa definição 
de "
 "software livre requerem cuidadosa deliberação quanto a sua interpretação. 
"
@@ -787,11 +932,11 @@
 "frequentemente atualizamos estes critérios para tornar mais fácil 
determinar "
 "se uma certa licença se qualifica ou não."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Consiga ajuda com licenças livres"
 
-#. 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 "
@@ -806,7 +951,7 @@
 "e-mail para <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 "
@@ -821,7 +966,7 @@
 "podemos ser capazes de ajudá-lo a encontrar uma licença de software livre "
 "existente que atenda às suas necessidades."
 
-#. 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 "
@@ -831,11 +976,58 @@
 "nossa ajuda você pode ter certeza de que a licença realmente é uma 
licença "
 "de software livre e evitar vários problemas práticos."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Use as palavras corretas ao falar sobre software livre"
+
+#. 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 ""
+"Quando falamos sobre software livre, é melhor evitar termos como “dado” 
ou "
+"“de graça”, porque estes termos implicam que a questão é o preço, 
não a "
+"liberdade. Alguns termos comuns como “pirataria” englobam opiniões que 
nós "
+"esperamos que você não endosse. Veja <a href=\"/philosophy/words-to-avoid."
+"html\">Palavras e Termos Confusos que é Melhor Evitar</a> para uma 
discussão "
+"desses termos. Nós também temos uma lista de <a href=\"/philosophy/fs-"
+"translations.html\">traduções apropriadas de “free software”</a> em 
várias "
+"línguas."
+
+#. type: Content of: <div><div><p>
+#, 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 ""
+"Outro grupo usa o termo “código aberto” (do inglês <em>open 
source</em>) com "
+"um significado parecido (mas não idêntico) ao de “software livre”. Nós 
"
+"preferimos o termo “software livre” porque, uma vez que você tenha 
ouvido "
+"que ele se refere à liberdade ao invés do preço, ele traz à mente a "
+"liberdade. A palavra “aberto”  <a 
href=\"/philosophy/open-source-misses-the-"
+"point.html\">nunca se refere à liberdade</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Além do 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 "
@@ -845,11 +1037,17 @@
 "a> pelas mesmas razões que software deve ser livre, e porque manuais são, "
 "com efeito, parte do software."
 
-#. 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 "
+#| "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 ""
 "Os mesmos argumentos também fazem sentido para outros tipos de trabalhos de "
@@ -857,7 +1055,7 @@
 "educativas e de referência. A <a 
href=\"http://wikipedia.org\";>Wikipédia</a> "
 "é o exemplo mais conhecido."
 
-#. 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/\";> "
@@ -868,30 +1066,10 @@
 "org/\">obras culturais livres</a>, aplicável a qualquer tipo de obra."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Código Aberto?"
-
-#. 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 ""
-"Outro grupo usa o termo “código aberto” (do inglês <em>open 
source</em>) com "
-"um significado parecido (mas não idêntico) ao de “software livre”. Nós 
"
-"preferimos o termo “software livre” porque, uma vez que você tenha 
ouvido "
-"que ele se refere à liberdade ao invés do preço, ele traz à mente a "
-"liberdade. A palavra “aberto”  <a 
href=\"/philosophy/open-source-misses-the-"
-"point.html\">nunca se refere à liberdade</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Histórico"
 
-#. 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."
@@ -900,7 +1078,7 @@
 "uma lista de mudanças substanciais, juntamente com links para mostrar "
 "exatamente o que foi modificado."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -915,7 +1093,7 @@
 "programa e na liberdade de excluí-lo, portanto, não há necessidade de "
 "declarar esses requisitos separados."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -927,7 +1105,7 @@
 "aborrecimentos arbitrários no código não negam a liberdade 0 e que as "
 "liberdades 1 e 3 permitem que os usuários os removam."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -938,7 +1116,7 @@
 "liberdade de executar o programa significa que nada impede você de executá-"
 "lo."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -948,7 +1126,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Versão 1.141</a>: Esclarece qual 
código "
 "precisa ser livre."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -958,7 +1136,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Versão 1.135</a>: Informa toda 
situação "
 "em que liberdade 0 é a liberdade de executar o programa desejado."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -968,7 +1146,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Versão 1.134</a>: liberdade 0 não é 
uma "
 "questão de funcionalidade do programa."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -978,7 +1156,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Versão 1.131</a>: Uma licença livre "
 "pode não exigir conformidade com uma licença não livre de um outro 
programa."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -990,7 +1168,7 @@
 "explicitamente que a escolha da lei e escolha de especificação do foro são 
"
 "permitidas. (Essa sempre foi nossa política.)"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1002,7 +1180,7 @@
 "controle de exportação é um problema rela se o requerimento for não 
trivial; "
 "do contrário, ele é apenas um problema potencial."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1014,7 +1192,7 @@
 "problema é os limites do seu direito de modificar, e não quais 
modificações "
 "você fez. E modificações não estão limitadas a “melhorias”"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1029,7 +1207,7 @@
 "adicionais de uso do trabalho ao liberar o trabalho de outra maneira, em "
 "paralelo."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1041,7 +1219,7 @@
 "afirmação da liberdade 1, a ideia (já discutida na versão 1.80) de que 
ela "
 "inclui realmente o ato de usar versões modificadas para seus interesses."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1051,7 +1229,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Versão 1.92</a>: Esclarece que código "
 "obscurecido não qualifica como código-fonte."
 
-#. type: Content of: <ul><li>
+#. type: Content 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,7 +1242,7 @@
 "suas versões aperfeiçoadas, não o direito de participar no desenvolvimento 
"
 "do projeto de outra pessoa."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1074,7 +1252,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Versão 1.89</a>: A liberdade 3 inclui o "
 "direito de liberar versões modificadas como software livre."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1084,7 +1262,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Versão 1.80</a>: A liberdade 1 deve ser "
 "prática, não somente teórica, i.e., sem tivoização."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1096,7 +1274,7 @@
 "mudanças retroativas a uma licença são inaceitáveis, mesmo que ela não 
seja "
 "descrita como uma substituição total."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1108,7 +1286,7 @@
 "sobre pontos não suficientemente explícitos, ou expostos em alguns lugares "
 "mas não refletidos em todos os lugares:"
 
-#. 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 "
@@ -1118,7 +1296,7 @@
 "tipo de versões modificadas você pode liberar. A liberdade 3 inclui "
 "distribuir versões modificadas, não somente mudanças."
 
-#. 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."
@@ -1126,17 +1304,17 @@
 "O direito de agregar módulos existentes se refere àqueles que são "
 "adequadamente licenciados."
 
-#. 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 ""
 "Explicitamente expõe a conclusão do argumento sobre o controle de "
 "exportações."
 
-#. 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 "Impor uma mudança de licença constitui revogar uma licença antiga."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1146,7 +1324,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Versão 1.57</a>: Adiciona a seção 
“Além "
 "do 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.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
@@ -1157,7 +1335,7 @@
 "quem é importante na liberdade de executar o programa para qualquer "
 "propósito."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1167,7 +1345,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Versão 1.41</a>: Esclarece a redação "
 "sobre licenças baseadas em contratos."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1179,7 +1357,7 @@
 "livre deve permitir que você use software livre disponível para criar suas "
 "modificações."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1191,7 +1369,7 @@
 "uma licença requeira que você forneça o código-fonte para versões do "
 "software que você colocou em uso público."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1203,7 +1381,7 @@
 "uma licença requeira que você se identifique como o autor de 
modificações. "
 "Outros esclarecimentos menores por todos texto."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1213,7 +1391,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Versão 1.23</a>: Discute problemas "
 "potenciais relacionados a licenças baseadas em contratos."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1223,7 +1401,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Versão 1.16</a>: Explica por que a "
 "distribuição de binários é 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 "
@@ -1235,7 +1413,7 @@
 "livre pode requerer que você mande uma cópia das versões que você 
distribui "
 "para desenvolvedores antigos ao ser requisitado."
 
-#. 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 "
@@ -1253,11 +1431,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 "Nota de rodapé"
 
-#. 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 "
@@ -1305,14 +1483,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 ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -1320,13 +1498,17 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
+#, 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."
@@ -1355,6 +1537,9 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Código Aberto?"
+
 #~ msgid "Clarifying the line at various points"
 #~ msgstr "Esclarecendo a linha em vários pontos"
 

Index: free-sw.ro-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ro-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- free-sw.ro-diff.html        31 May 2021 09:06:21 -0000      1.4
+++ free-sw.ro-diff.html        16 Jul 2021 10:02:24 -0000      1.5
@@ -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,
@@ -163,21 +248,17 @@
 
 <span class="removed"><del><strong>&lt;p&gt;The</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;p&gt;
-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;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 freedom to run the program as you wish&lt;/h4&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 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
@@ -197,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
@@ -208,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
@@ -246,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
@@ -273,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;
@@ -289,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
@@ -314,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,
@@ -349,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
@@ -373,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
@@ -397,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
@@ -418,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
@@ -431,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
@@ -447,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
@@ -471,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;,
@@ -483,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;
 
@@ -493,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
@@ -502,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;
@@ -646,8 +771,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
@@ -655,10 +781,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
@@ -676,13 +803,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;
 
@@ -703,7 +830,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-2019</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-2019</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"
@@ -714,7 +841,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/31 09:06:21 $
+$Date: 2021/07/16 10:02:24 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: free-sw.ro.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ro.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- free-sw.ro.po       31 May 2021 09:06:21 -0000      1.28
+++ free-sw.ro.po       16 Jul 2021 10:02:24 -0000      1.29
@@ -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: 2019-05-17 19:15+0200\n"
 "Last-Translator: Denis Cherean <denis.cherean@gmail.com>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -19,7 +19,11 @@
 "X-Generator: Poedit 2.2.2\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 ""
 "Definiția software-ului liber - Proiectul GNU - Fundația pentru Software "
 "Liber"
@@ -42,55 +46,14 @@
 "utilizatorii de calculatoare să poată avea libertatea de a împărtăși 
și "
 "îmbunătăți software-ul pe care îl folosesc."
 
-#. 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 "Ce este software-ul liber?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definiția software-ului liber"
-
-#. 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 ""
-"Aveți o întrebare despre licențierea software-ului liber care nu are 
răspuns "
-"aici? Vedeți și celelalte <a href=\"http://www.fsf.org/licensing\";> resurse 
"
-"pe tema licenței</a>, și dacă necesar contactați FSF Compliance Lab la <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 ""
-"Definiția software-ului liber prezintă criteriul acord căruia un anume "
-"program e clasificat drept software liber. Din când în când revizuim 
această "
-"definitie, pentru a clarifica sau a rezolva discuții pe tema aceasta. 
Vedeți "
-"<a href=\"#History\">Secția de istorie</a> mai jos pentru a lista de "
-"modificări care afectează definiția software-ului liber."
-
-#. 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 ""
-"„Open source” e ceva diferit: are o filosofie bazată pe alte valori. "
-"Definiția ei practică e de asemenea diferită, dar aproape toate programele 
"
-"open source sunt de fapt libere. Noi explicăm diferența în <a href=\"/"
-"philosophy/open-source-misses-the-point.html\"> De ce „Open Source” nu "
-"împlinește același țel că și Software-ul Liber</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, "
@@ -111,7 +74,30 @@
 "împrumutând cuvîntul francez sau spaniol pentru liber, ca în libertate, "
 "pentru a arăta că nu ne referim că software-ul e gratis ."
 
-#. 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 ""
+"Astfel, se poate întâmpla să plătiți pentru a dobândi copii ale unor "
+"programe GNU, ori, la fel de bine, puteți obține copii fără a plăti 
pentru "
+"ele. Indiferent de modul în care obțineți programele, veți avea 
libertatea "
+"de a le copia și modifica, și chiar de a vinde copii ale acestora."
+
+#. 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 "
@@ -129,11 +115,181 @@
 "programul; acest fapt transformând programul într-un <a href=\"/philosophy/"
 "free-software-even-more-important.html\"> instrument injust de putere</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 ""
+"„Open source” e ceva diferit: are o filosofie bazată pe alte valori. "
+"Definiția ei practică e de asemenea diferită, dar aproape toate programele 
"
+"open source sunt de fapt libere. Noi explicăm diferența în <a href=\"/"
+"philosophy/open-source-misses-the-point.html\"> De ce „Open Source” nu "
+"împlinește același țel că și Software-ul Liber</a>."
+
+#. 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 "Definiția software-ului liber"
+
+#. 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 "Cele patru libertăți esențiale"
+
+#. 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 "Libertatea de a utiliza programul după cum doriți"
+
+#. 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 "Libertatea de a studia codul sursă și de a face schimbări"
+
+#. 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 "Libertatea de a redistribui copii, așa cum doriți: cerințe 
elementare"
+
+#. 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 "Reguli privind împachetarea și distribuirea de detalii"
+
+#. 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 "Licențe bazate pe contract"
+
+#. 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 "Cum interpretăm noi aceste criterii"
+
+#. 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 "Cereți ajutor cu licențele libere"
+
+#. 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 ""
+"Folosiți cuvintele potrivite atunci când vorbiți despre software-ul liber"
+
+#. 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 ""
+"Aveți o întrebare despre licențierea software-ului liber care nu are 
răspuns "
+"aici? Vedeți și celelalte <a href=\"http://www.fsf.org/licensing\";> resurse 
"
+"pe tema licenței</a>, și dacă necesar contactați FSF Compliance Lab la <a 
"
+"href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Definiția software-ului liber"
+
+#. 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 ""
+"Definiția software-ului liber prezintă criteriul acord căruia un anume "
+"program e clasificat drept software liber. Din când în când revizuim 
această "
+"definitie, pentru a clarifica sau a rezolva discuții pe tema aceasta. 
Vedeți "
+"<a href=\"#History\">Secția de istorie</a> mai jos pentru a lista de "
+"modificări care afectează definiția software-ului liber."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "Cele patru libertăți esențiale"
 
-#. 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>"
@@ -143,14 +299,14 @@
 "e vorba de patru forme de libertate a utilizatorilor săi: <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 ""
 "Libertatea de a utiliza programul dupa cum doriți, în orice scop 
(libertatea "
 "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 "
@@ -160,13 +316,13 @@
 "nevoilor proprii (libertatea 1). Accesul la codul-sursă este o precondiție "
 "pentru aceasta."
 
-#. 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 ""
 "Libertatea de a redistribui copii, în scopul ajutorării aproapelui tău "
 "(libertatea 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 "
@@ -177,7 +333,7 @@
 "dispoziția publicului, în folosul întregii societăți (libertatea 3). 
Accesul "
 "la codul-sursă este o precondiție pentru aceasta."
 
-#. 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 "
@@ -189,7 +345,7 @@
 "diverse methode de distribuire nelibere care nu ating țelul de software "
 "liber, le considerăm pe toate neetice."
 
-#. 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 "
@@ -209,7 +365,11 @@
 "ca acesta să nu folosească programul B, doar A trebuie să fie liber; "
 "programul B nu este relevant acestui plan."
 
-#. 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, "
@@ -218,7 +378,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 "
@@ -231,7 +391,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 "
@@ -239,7 +399,7 @@
 "does not qualify as free software."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | A free program must offer the four freedoms to any {+would-be+} user that
 # | obtains a copy of the software, [-provided the user-] {+who+} has complied
 # | thus far with the conditions of the free license covering the
@@ -272,45 +432,22 @@
 "neacordare libertăților sus menționate, și astfel programul este 
considerat "
 "neliber."
 
-#. 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>."
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
-"Astfel, se poate întâmpla să plătiți pentru a dobândi copii ale unor "
-"programe GNU, ori, la fel de bine, puteți obține copii fără a plăti 
pentru "
-"ele. Indiferent de modul în care obțineți programele, veți avea 
libertatea "
-"de a le copia și modifica, și chiar de a vinde copii ale acestora."
 
-#. 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 "Libertatea de a utiliza programul după cum doriți"
 
-#. 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 "
@@ -331,7 +468,7 @@
 "ea liberă să îl utilizeze în folosul scopurilor ei, dar dvs. nu aveți "
 "dreptul să va impuneți scopurile dvs. asupra acestei persoane."
 
-#. 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 +481,7 @@
 "funcționalitatea programului, dacă este capabil technic de a funcționa 
într-"
 "un domeniu dat, sau dacă este folositor pentru o activitate anume."
 
-#. 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 +492,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 "Libertatea de a studia codul sursă și de a face schimbări"
 
-#. 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 +531,7 @@
 "califica un program ca „liber”. Codul sursă „obfuscat” nu poate fi "
 "considerat drept cod sursă real."
 
-#. 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 "
@@ -413,7 +550,7 @@
 "Aceste fișiere binare nu sunt software liber chiar dacă codul sursă din 
care "
 "sunt compilate este liber."
 
-#. 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 "
@@ -428,7 +565,7 @@
 "care îl adăugați &mdash; atunci această licență este prea restrictivă 
pentru "
 "a putea fi numită liberă."
 
-#. 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 "
@@ -439,18 +576,18 @@
 "modificări pe care altcineva le consideră o îmbunătățire, atunci 
programul "
 "nu este liber."
 
-#. 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 "Libertatea de a redistribui copii, așa cum doriți: cerințe 
elementare"
 
-#. 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 "
@@ -464,7 +601,7 @@
 "lucruri înseamnă (printre altele) că nu e necesar să cereți sau să 
plătiți "
 "pentru a primi permisiune în acest scop."
 
-#. 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 "
@@ -477,11 +614,25 @@
 "aceste modificări, trebuie să nu fiți obligat să notificați pe cineva 
în mod "
 "special, sub nici o formă."
 
-#. 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 ""
@@ -492,7 +643,7 @@
 "necesită că versiunile modificate să fie considerate software neliber nu "
 "poate fi clasificată drept o licență liberă."
 
-#. 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 "
@@ -512,15 +663,30 @@
 "se acordă dreptul de a le distribui și sub aceste forme (în caz că 
găsiți "
 "sau dezvoltați o metodă prin care să le produceți)."
 
-#. 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."
@@ -532,7 +698,7 @@
 "adăuga limitări libertăților fundamentale ale altor utilizatori. Această 
"
 "regulă nu contravine libertăților fundamentale, ci le protejează."
 
-#. 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/"
@@ -554,11 +720,11 @@
 "liber</a> pentru a vedea relațiile și diferențele dintre „software-ul "
 "liber”, „software-ul sub copyleft” și alte categorii de software."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Reguli privind împachetarea și distribuirea de detalii"
 
-#. 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 "
@@ -578,7 +744,7 @@
 "modificărilor dvs, acestea sunt acceptabile, dvs. modificați programul 
deja, "
 "nu ar trebuie să va încurce câteva modificări în 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 "
@@ -598,7 +764,7 @@
 "versiunea sau nu.) Reguli care necesită publicarea codului sursă alături 
de "
 "versiunile pe care pe publicați sunt de asemenea acceptabile."
 
-#. 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 "
@@ -615,21 +781,42 @@
 "alias adecvat, care vă permite să specificați numele programului original 
ca "
 "un alias pentru versiunea modificată."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Reglementări privind exportul"
 
-#. 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 ""
 "Uneori <a id=\"exportcontrol\">reglementările vamale</a> și sancțiuni "
 "comerciale internaționale vă pot limita libertatea de a distribui în lume "
@@ -641,7 +828,7 @@
 "trebuie să necesite supunerea față de reglementările de export 
nontriviale "
 "ca o condiție de exercitare a oricăror libertăți esențiale."
 
-#. 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 "
@@ -658,11 +845,11 @@
 "schimbare ulterioară a legislației în materie de export ar putea face "
 "cerința netrivială și, astfel, face software-ul neliber."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Considerații juridice"
 
-#. 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 "
@@ -675,7 +862,7 @@
 "are puterea de a revoca licența fără a-și întemeia această decizie pe "
 "comiterea unei anumite fapte de către utilizator, software-ul nu este liber."
 
-#. 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 "
@@ -690,7 +877,7 @@
 "respectarea licențelor acestor programe nelibere; care face că licența să 
"
 "fie neliberă."
 
-#. 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."
@@ -699,11 +886,11 @@
 "jurisdicției este aplicabilă, sau în cazul în care trebuiesc făcute 
litigii "
 "(conflicte), sau ambele."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Licențe bazate pe contract"
 
-#. 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-"
@@ -724,7 +911,7 @@
 "restricții posibile.  Asta înseamnă că există multe modalități 
posibile ca o "
 "astfel de licență ar putea fi inacceptabil de restrictivă și neliberă."
 
-#. 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 "
@@ -738,49 +925,54 @@
 "gândim această temă, și probabil am ajunge la concluzia că această este 
"
 "nelibera."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr ""
-"Folosiți cuvintele potrivite atunci când vorbiți despre software-ul liber"
-
-#. 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 ""
-"Discutând despre software-ul liber, este indicat să evitați termeni precum 
"
-"„gratuit” sau „pe gratis”, întrucât acești termeni pot conduce la 
ideea că "
-"principala caracteristică a softului liber ar fi prețul, și nu libertatea "
-"sa. Alți termeni uzuali ca „piraterie” reprezintă expresia unor opinii 
pe "
-"care sperăm că nu le imbratișați. Citiți articolul <a 
href=\"/philosophy/"
-"words-to-avoid.html\">Termeni vagi sau înșelători și expresii care ar 
trebui "
-"evitate</a> pentru o analiză a acestor termeni. De asemenea avem o listă "
-"adecvată cu <a href=\"/philosophy/fs-translations.html\">traduceri ale "
-"conceptului de „software liber”</a> în mai multe limbi."
+#. 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 "Definiția software-ului liber"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Cum interpretăm noi aceste criterii"
 
-#. 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 ""
 "În fine, trebuie observat că acele condiții enumerate in definiția 
software-"
 "ului liber necesită o analiză atentă pentru a se constata întrunirea lor. 
"
@@ -795,11 +987,11 @@
 "unei situații noi, adeseori trebuie să actualizăm criteriile după care "
 "decidem dacă anumite licențe sunt, sau nu, licențe libere."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Cereți ajutor cu licențele libere"
 
-#. 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 "
@@ -813,7 +1005,7 @@
 "acolo, ne puteți întreba printr-un e-mail trimis la <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 "
@@ -827,7 +1019,7 @@
 "aceste licențe; s-ar putea să vă putem ajuta în a găsi o licență 
existentă "
 "care va întrunește nevoile."
 
-#. 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 "
@@ -837,11 +1029,67 @@
 "cu ajutorul nostru puteți stabili că aceea licență este o licență 
pentru "
 "software liber și puteți evita anumite probleme practice."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+"Folosiți cuvintele potrivite atunci când vorbiți despre software-ul liber"
+
+#. 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 ""
+"Discutând despre software-ul liber, este indicat să evitați termeni precum 
"
+"„gratuit” sau „pe gratis”, întrucât acești termeni pot conduce la 
ideea că "
+"principala caracteristică a softului liber ar fi prețul, și nu libertatea "
+"sa. Alți termeni uzuali ca „piraterie” reprezintă expresia unor opinii 
pe "
+"care sperăm că nu le imbratișați. Citiți articolul <a 
href=\"/philosophy/"
+"words-to-avoid.html\">Termeni vagi sau înșelători și expresii care ar 
trebui "
+"evitate</a> pentru o analiză a acestor termeni. De asemenea avem o listă "
+"adecvată cu <a href=\"/philosophy/fs-translations.html\">traduceri ale "
+"conceptului de „software liber”</a> în mai multe limbi."
+
+#. 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 alt grup utilizează noțiunea de „open source (sursă deschisă)” 
pentru a "
+"face referire la ceva similar (dar nu identic) „software-ului liber”. Noi 
"
+"preferăm „software liber”  deoarece, odată ce s-a înțeles că este 
vorba de "
+"libertate și nu de preț, conceptul stimulează gândirea liberă. Cuvântul 
"
+"„deschis” <a href=\"/philosophy/open-source-misses-the-point.html\">nu se 
"
+"referă la liberatate</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Mai mult decât 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 "
@@ -851,11 +1099,21 @@
 "libere</a>, pentru aceeleasi motive pentru care software-ul ar trebui să fie 
"
 "liber, și pentru că manualele sunt de fapt o parte din software."
 
-#. 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 ""
 "Aceeleasi argumente sunt rezonabile și pentru alt fel de lucrări cu 
caracter "
@@ -863,7 +1121,7 @@
 "cum ar fi lucrări educaționale și lucrări de referință. <a 
href=\"http://";
 "wikipedia.org\">Wikipedia</a> este cel mai bine cunoscut exemplu."
 
-#. 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/\";> "
@@ -875,30 +1133,10 @@
 "lucrare."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Sursă deschisă?"
-
-#. 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 alt grup utilizează noțiunea de „open source (sursă deschisă)” 
pentru a "
-"face referire la ceva similar (dar nu identic) „software-ului liber”. Noi 
"
-"preferăm „software liber”  deoarece, odată ce s-a înțeles că este 
vorba de "
-"libertate și nu de preț, conceptul stimulează gândirea liberă. Cuvântul 
"
-"„deschis” <a href=\"/philosophy/open-source-misses-the-point.html\">nu se 
"
-"referă la liberatate</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Istorie"
 
-#. 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."
@@ -907,7 +1145,7 @@
 "lista cu modificări semnificative, precum și link-uri care va arată exact 
ce "
 "a fost modificat."
 
-#. 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.162&amp;r2=1.163\";>Version
 # | 1.163</a>: Clarify that-]
@@ -937,7 +1175,7 @@
 "din partea utilizatorilor pentru a-și putea exercită aceste libertăți 
este "
 "egal cu negarea acestor libertăți utilizatorilor."
 
-#. 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-]
@@ -960,7 +1198,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Versiunea 1.135</a>: Spune că liberatea 
"
 "0 este libertatea de a executa programul așa cum doriț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.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -971,7 +1209,7 @@
 "libertatea de a executa un program înseamnă că nimic nu vă oprește din a 
"
 "executa programul."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -981,7 +1219,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Versiunea 1.141</a>: Clarifică care cod 
"
 "trebuie să fie liber."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -991,7 +1229,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Versiunea 1.135</a>: Spune că liberatea 
"
 "0 este libertatea de a executa programul așa cum doriț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.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
@@ -1001,7 +1239,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Versiunea 1.134</a>: Libertatea 0 nu "
 "este legată de funcționalitatea unui 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.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
@@ -1011,7 +1249,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Versiunea 1.131</a>: O licență 
gratuită "
 "poate să nu necesite conformitatea cu o licență negratuită a altui 
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.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1023,7 +1261,7 @@
 "si a unor specificatii unui Forum sunt permise.  (Aceasta a fost întotdeauna 
"
 "politica noastră.)"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1035,7 +1273,7 @@
 "control al exportului este o problema reală doar dacă cerința nu este "
 "trivială;  în caz contrar, este doar o potențială 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 "
@@ -1047,7 +1285,7 @@
 "problema e numărul de limitări care previn modificările, nu pe ce au fost "
 "făcut modificările. Și modificările nu se rezumă doar la 
„îmbunătățiri”"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1062,7 +1300,7 @@
 "adițională pentru folosirea lucrării prin publicarea lucrării într-un 
alt "
 "mod în paralel."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1075,7 +1313,7 @@
 "că acesta include într-adevăr versiunea modificată pentru rularea "
 "programului."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1085,7 +1323,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Versiunea 1.92</a>: Codul obfuscat nu "
 "poate fi considerat cod sursă."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1098,7 +1336,7 @@
 "modificată sau îmbunătățită, și nu dreptul de a participa în 
proiectul "
 "altcuiva."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1108,7 +1346,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Versiunea 1.89</a>: Libertatea 3 include "
 "dreptul de a publica versiuni modificate drept software liber."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1120,7 +1358,7 @@
 "(metode care restricționează executarea unei versiuni modificate a 
software-"
 "ului)."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 +1369,7 @@
 "root=www&amp;r1=1.76&amp;r2=1.77\">Versiunea 1.77</a>: Clarifica faptul ca "
 "toate schimbarile retroactive ale licentei sunt inacceptabile."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1143,7 +1381,7 @@
 "unor puncte neexplicate îndeajuns, sau menționate în unele locuri dar "
 "neimplementate peste tot:"
 
-#. 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 "
@@ -1153,7 +1391,7 @@
 "versiunilor modificate pe care le puteți publică. Libertatea 3 include "
 "distribuirea versiunilor modificate, nu doar a unor schimbări."
 
-#. 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."
@@ -1161,16 +1399,16 @@
 "Dreptul de a contopi în module existente se referă la cei care sunt "
 "corespunzător licențiați."
 
-#. 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 "Menționează explicit concluzia referitoare la controlul exportului."
 
-#. 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 ""
 "Impunerea unei schimbări de licență constituie revocare licenței 
anterioare."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1180,7 +1418,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Versiunea 1.57</a>: Secția &quot;Mai mult 
"
 "decât software&quot; a fost adăugată."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1190,7 +1428,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Versiunea 1.46</a>: Clarifică scopul cui "
 "e important în libertatea de a executa programul în orice scop."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1200,7 +1438,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Versiunea 1.41</a>: Clarifică exprimarea "
 "legată de licențele pe baza unui contract."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1212,7 +1450,7 @@
 "licență liberă trebuie să vă permită să utilizați software liber 
pentru a va "
 "crea modificările."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1224,7 +1462,7 @@
 "este acceptabil ca o licență să solicite sursele versiunilor software-ului 
"
 "liber pe care dvs. îl publicaț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.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1236,7 +1474,7 @@
 "este acceptabil pentru o licență să necesite să va identificați că 
autorul "
 "modificărilor dvs. Alte clarificări minore răspândite prin text."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1246,7 +1484,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Versiunea 1.23</a>: Adresează potențiale 
"
 "probleme legate de licențele pe baza de contract."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1256,7 +1494,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Versiunea 1.16</a>: Explică de ce "
 "distribuirea fișierelor binare e importantă."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1268,7 +1506,7 @@
 "o licență liberă ar putea necesita trimiterea unei copii a versiunii dvs. "
 "programatorilor anteriori, la cererea acestora."
 
-#. 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 "
@@ -1286,11 +1524,11 @@
 "pagini cu ajutorul <a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/";
 "philosophy/free-sw.html?root=www&amp;view=log\">interfeței web cvs</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Notă de subsol"
 
-#. 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,35 +1569,39 @@
 #.         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 ""
-"Muncim din greu și facem tot ceea ce ne stă în putință să punem la "
-"dispoziție traduceri exacte, de o calitate bună.  Cu toate acestea, nu "
-"suntem perfecți. Vă rugăm să ne trimiteți comentariile și sugestiile 
dvs. "
-"generale în această privință la <a href=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>.</p>\n"
-"<p>Pentru informații despre coordonarea și trimiterea de traduceri pentru "
-"paginile noastre, consultați <a 
href=\"/server/standards/README.translations."
-"html\">ghidul de traduceri</a>."
+"Puteți vizita <a href=\"/server/standards/README.translations.html\">README-"
+"ul despre traduceri</a> pentru informații despre coordonarea și trimiterea "
+"traducerilor pentru acest articol."
 
 #. 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."
@@ -1387,6 +1629,23 @@
 msgid "Updated:"
 msgstr "Actualizată:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Sursă deschisă?"
+
+#~ 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 ""
+#~ "Muncim din greu și facem tot ceea ce ne stă în putință să punem la "
+#~ "dispoziție traduceri exacte, de o calitate bună.  Cu toate acestea, nu "
+#~ "suntem perfecți. Vă rugăm să ne trimiteți comentariile și sugestiile 
dvs. "
+#~ "generale în această privință la <a 
href=\"mailto:web-translators@gnu.org";
+#~ "\">&lt;web-translators@gnu.org&gt;</a>.</p>\n"
+#~ "<p>Pentru informații despre coordonarea și trimiterea de traduceri 
pentru "
+#~ "paginile noastre, consultați <a href=\"/server/standards/README."
+#~ "translations.html\">ghidul de traduceri</a>."
+
 #~ msgid ""
 #~ "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
 #~ "free program must be available for commercial use, commercial "

Index: free-sw.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ru.po,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- free-sw.ru.po       4 Feb 2021 07:30:22 -0000       1.121
+++ free-sw.ru.po       16 Jul 2021 10:02:24 -0000      1.122
@@ -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: 2021-02-03 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -16,10 +16,15 @@
 "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"
 
 # 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 ""
 "Что такое свободная программа? - Проект GNU - 
Фонд свободного программного "
 "обеспечения"
@@ -45,61 +50,16 @@
 "программами, которыми они пользуются, и 
улучшать их."
 
 # 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 "Что такое свободная программа?"
 
-# type: Content of: <h2>
-#. 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: <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 ""
-"Определение свободной программы содержит 
критерии того, является ли "
-"конкретная компьютерная программа 
свободной. Время от времени мы "
-"пересматриваем это определение, чтобы 
пояснить его или разрешить тонкие "
-"вопросы. Список изменений, затрагивающих 
определение свободной программы, "
-"см. в <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;Открытый исходный текст&rdquo; 
представляет собой нечто другое: у "
-"него совсем другая философия, основанная 
на других ценностях. Его "
-"практическое определение тоже другое, но 
почти все программы с открытым "
-"исходным текстом на деле свободны. Р
азницу мы объясняем в статье <a href=\"/"
-"philosophy/open-source-misses-the-point.html\">Почему 
&ldquo;открытый "
-"исходный текст&rdquo; не передает понятия 
&ldquo;свободная программа&rdquo;</"
-"a>."
-
 # type: Content of: <p>
 # English-specific note on 'libre software' is omitted -- ineiev.
-#. 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, "
@@ -119,7 +79,20 @@
 "в том смысле, который заключается в 
выражении &ldquo;вольная речь&rdquo;, а "
 "не &ldquo;бесплатное пиво&rdquo;."
 
-#. 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 ""
+"Может быть, вы заплатили деньги за то, 
чтобы получить свободную программу, а "
+"может быть, она вам досталась бесплатно. 
Но независимо от того, как вы "
+"получили свои копии, вы всегда вольны 
копировать и изменять программу и даже "
+"<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 "
@@ -137,11 +110,194 @@
 "программу; это делает программу <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;Открытый исходный текст&rdquo; 
представляет собой нечто другое: у "
+"него совсем другая философия, основанная 
на других ценностях. Его "
+"практическое определение тоже другое, но 
почти все программы с открытым "
+"исходным текстом на деле свободны. Р
азницу мы объясняем в статье <a href=\"/"
+"philosophy/open-source-misses-the-point.html\">Почему 
&ldquo;открытый "
+"исходный текст&rdquo; не передает понятия 
&ldquo;свободная программа&rdquo;</"
+"a>."
+
+#. 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: <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 "Определение свободной программы"
+
+#. 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>
+# | [-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 "Уточнение границ свободного и 
несвободного"
+
+# 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 "Свобода выполнять программу как вам 
угодно"
+
+#. 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: <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 "Свобода передавать копии, если вам 
угодно: основные требования"
+
+#. 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>
+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 "Лицензии на основе контрактов"
+
+#. 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: <h2>
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Определение свободной программы"
+
+# 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 ""
+"Определение свободной программы содержит 
критерии того, является ли "
+"конкретная компьютерная программа 
свободной. Время от времени мы "
+"пересматриваем это определение, чтобы 
пояснить его или разрешить тонкие "
+"вопросы. Список изменений, затрагивающих 
определение свободной программы, "
+"см. в <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>"
@@ -150,13 +306,13 @@
 "<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 "Свобода выполнять программу как вам 
угодно в любых целях (свобода 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 "
@@ -167,12 +323,12 @@
 "доступ к исходному тексту."
 
 # 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 "Свобода передавать копии, чтобы 
помочь другим (свобода 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 "
@@ -183,7 +339,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 "
@@ -196,7 +352,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 "
@@ -215,7 +371,11 @@
 "если мы планируем изменить А так, чтобы в 
ней не применялась Б, то свободной "
 "нужно быть только программе А; Б на эти 
планы никак не влияет."
 
-#. 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, "
@@ -229,7 +389,7 @@
 "правило фундаментально важно&nbsp;&mdash; без 
этого свободные программы не "
 "могли бы достичь своих целей."
 
-#. 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 "
@@ -251,7 +411,7 @@
 "свободные программы очень важны. 
Оплачиваемая профессиональная поддержка "
 "свободных программ обслуживает важные 
нужды."
 
-#. 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 "
@@ -264,7 +424,7 @@
 "сделать вывод, что программа, 
лицензированная с такими ограничениями, не 
"
 "является свободной."
 
-#. 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 "
@@ -283,24 +443,15 @@
 "непредоставлению соответствующих свобод 
и таким образом, это делает "
 "программу несвободной."
 
-# 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 ""
-"Может быть, вы заплатили деньги за то, 
чтобы получить свободную программу, а "
-"может быть, она вам досталась бесплатно. 
Но независимо от того, как вы "
-"получили свои копии, вы всегда вольны 
копировать и изменять программу и даже "
-"<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>
+# | 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 "Уточнение границ свободного и 
несвободного"
 
-#. 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 "
@@ -311,12 +462,12 @@
 "была свободна."
 
 # 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 "Свобода выполнять программу как вам 
угодно"
 
 # 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 "
@@ -336,7 +487,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 "
@@ -350,7 +501,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, "
@@ -370,7 +521,7 @@
 "и распространять измененные версии без 
той части программы, которая создает "
 "неудобства."
 
-#. 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 "
@@ -380,12 +531,12 @@
 "вообще никак&rdquo;, если это вам и угодно. 
Так что в отдельной &ldquo;"
 "свободе не выполнять программу&rdquo; необх
одимости нет."
 
-#. 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: <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 "
@@ -402,7 +553,7 @@
 "заменой."
 
 # 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 "
@@ -424,7 +575,7 @@
 "которых они получены, свободны."
 
 # 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 "
@@ -439,7 +590,7 @@
 "&mdash; то лицензия слишком ограничительна, 
чтобы считаться свободной."
 
 # 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 "
@@ -449,7 +600,7 @@
 "право изменять программу по существу 
ограничено лишь изменениями, которые "
 "кто-то другой считает улучшениями, то эта 
программа не свободна."
 
-#. 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 "
@@ -461,12 +612,12 @@
 "программу&rdquo;."
 
 # 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 "Свобода передавать копии, если вам 
угодно: основные требования"
 
 # 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 "
@@ -481,7 +632,7 @@
 "разрешения на эти действия или платить за 
него."
 
 # 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 "
@@ -494,11 +645,25 @@
 "извещать об этом кого-то конкретно или 
каким-то конкретным способом."
 
 # 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 ""
@@ -510,7 +675,7 @@
 "считаться свободной."
 
 # 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 "
@@ -529,16 +694,31 @@
 "быть вольны распространять программу в 
таком виде, если вы найдете или "
 "разработаете способ такого 
преобразования."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "Авторское лево"
 
 # 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."
@@ -551,7 +731,7 @@
 "правило не противоречит центральным 
свободам, а защищает их."
 
 # 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/"
@@ -572,12 +752,12 @@
 "разновидности программ, см. в <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: <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 "
@@ -599,7 +779,7 @@
 "затруднит внести еще немного."
 
 # 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 "
@@ -620,7 +800,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 "
@@ -637,22 +817,43 @@
 "вам задать имя первоначальной программы 
как перенаправление на измененную "
 "версию."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Контроль экспорта"
 
 # 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 ""
 "Иногда государственный <a 
id=\"exportcontrol\">контроль экспорта</a> и "
 "торговые санкции могут ограничить вашу 
свободу передавать копии программ на "
@@ -663,7 +864,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 "
@@ -681,12 +882,12 @@
 "сделать это требование нетривиальным и 
тем самым обратить программу в "
 "несвободную."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Юридические соображения"
 
 # 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 "
@@ -700,7 +901,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 "
@@ -715,7 +916,7 @@
 "потребовало бы соблюдения лицензий этих 
несвободных программ; тем самым "
 "лицензия стала бы лицензией несвободных 
программ."
 
-#. 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."
@@ -723,12 +924,12 @@
 "Для лицензии свободных программ 
допустимо указывать, закон какой 
юрисдикции "
 "применим, где должны проходить 
разбирательства или и то, и другое."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Лицензии на основе контрактов"
 
 # 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-"
@@ -750,7 +951,7 @@
 "несвободной."
 
 # 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 "
@@ -763,50 +964,56 @@
 "упомянут здесь как правомерный, нам 
придется подумать об этом, и мы, "
 "вероятно, придем к заключению, что она не 
свободна."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Говоря о свободных программах, 
выбирайте слова"
-
-# 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 ""
-"Когда речь идет о свободных программах, 
лучше всего избегать употребления "
-"таких терминов, как &ldquo;раздавать&rdquo; или 
&ldquo;бесплатные&rdquo;, "
-"потому что эти термины подразумевают, что 
дело в стоимости, а не в свободе. "
-"Некоторые общепринятые термины, например 
&ldquo;пиратство&rdquo;, несут в "
-"себе точку зрения, которую вы, как мы 
надеемся, не одобряете. Эти термины "
-"обсуждаются на странице <a 
href=\"/philosophy/words-to-avoid.html"
-"\">Запутывающие слова и выражения, которых 
стоит избегать</a>. У нас есть "
-"также список верных <a 
href=\"/philosophy/fs-translations.html\">переводов "
-"выражения &ldquo;свободные программы&rdquo;</a> 
на разные языки."
+# 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 "Определение свободной программы"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Как мы трактуем эти критерии"
 
 # 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 ""
 "Наконец, обратите внимание, что критерии, 
подобные тем, что приняты в этом "
 "определении свободной программы, требуют 
аккуратного осмысления при "
@@ -821,12 +1028,12 @@
 "проще понять, почему определенные 
лицензии удовлетворяют или не "
 "удовлетворяют им."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Консультации по лицензиям свободных 
программ"
 
 # 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 "
@@ -841,7 +1048,7 @@
 "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 "
@@ -857,7 +1064,7 @@
 "подойдет."
 
 # 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 "
@@ -868,13 +1075,71 @@
 "лицензией свободных программ и не несет в 
себе различных практических "
 "проблем."
 
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Говоря о свободных программах, 
выбирайте слова"
+
+# 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 ""
+"Когда речь идет о свободных программах, 
лучше всего избегать употребления "
+"таких терминов, как &ldquo;раздавать&rdquo; или 
&ldquo;бесплатные&rdquo;, "
+"потому что эти термины подразумевают, что 
дело в стоимости, а не в свободе. "
+"Некоторые общепринятые термины, например 
&ldquo;пиратство&rdquo;, несут в "
+"себе точку зрения, которую вы, как мы 
надеемся, не одобряете. Эти термины "
+"обсуждаются на странице <a 
href=\"/philosophy/words-to-avoid.html"
+"\">Запутывающие слова и выражения, которых 
стоит избегать</a>. У нас есть "
+"также список верных <a 
href=\"/philosophy/fs-translations.html\">переводов "
+"выражения &ldquo;свободные программы&rdquo;</a> 
на разные языки."
+
+# 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 ""
+"Другая группа употребляет термин 
&ldquo;открытый исходный текст&rdquo; для "
+"обозначения близкого (но не 
тождественного) &ldquo;свободным "
+"программам&rdquo; понятия. Мы предпочитаем 
термин &ldquo;свободная "
+"программа&rdquo;, потому что, как только вы 
услышали, что он относится к "
+"свободе, а не к стоимости, он станет 
напоминать о свободе. Слово &ldquo;"
+"открытый&rdquo; <a 
href=\"/philosophy/open-source-misses-the-point.html\">не "
+"имеет никакого отношения к свободе</a>."
+
 # type: Content of: <h2>
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Кроме программ"
 
 # 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 "
@@ -885,11 +1150,21 @@
 "а также потому, что руководства 
фактически являются частью программ."
 
 # 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 ""
 "Те же самые аргументы имеют смысл для 
других разновидностей прикладных "
@@ -898,7 +1173,7 @@
 "wikipedia.org\">Википедия</a>&nbsp;&mdash; наиболее 
известный пример."
 
 # 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/\";> "
@@ -911,34 +1186,11 @@
 
 # type: Content of: <h2>
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Открытый исходный текст?"
-
-# 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 ""
-"Другая группа употребляет термин 
&ldquo;открытый исходный текст&rdquo; для "
-"обозначения близкого (но не 
тождественного) &ldquo;свободным "
-"программам&rdquo; понятия. Мы предпочитаем 
термин &ldquo;свободная "
-"программа&rdquo;, потому что, как только вы 
услышали, что он относится к "
-"свободе, а не к стоимости, он станет 
напоминать о свободе. Слово &ldquo;"
-"открытый&rdquo; <a 
href=\"/philosophy/open-source-misses-the-point.html\">не "
-"имеет никакого отношения к свободе</a>."
-
-# type: Content of: <h2>
-#. type: Content of: <h3>
 msgid "History"
 msgstr "История"
 
 # 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."
@@ -948,7 +1200,7 @@
 "на страницы, где в точности показано, что 
изменилось."
 
 # 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 "
@@ -964,7 +1216,7 @@
 "выдвигать это как отдельные требования."
 
 # 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 "
@@ -977,7 +1229,7 @@
 "свободы&nbsp;1 и&nbsp;3 позволяют пользователям 
устранять их."
 
 # 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 "
@@ -988,7 +1240,7 @@
 "свобода выполнять программу означает, что 
вам ничто не мешает ее запустить."
 
 # 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 "
@@ -999,7 +1251,7 @@
 "программы должны быть свободны."
 
 # 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 "
@@ -1011,7 +1263,7 @@
 "угодно."
 
 # 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 "
@@ -1022,7 +1274,7 @@
 "с функциональностью программы."
 
 # 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 "
@@ -1034,7 +1286,7 @@
 "программы."
 
 # 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 "
@@ -1046,7 +1298,7 @@
 "выбор форума и юрисдикции допустимы (это 
всегда было нашим правилом). "
 
 # 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 "
@@ -1059,7 +1311,7 @@
 "нетривиально; в противном случае это 
только потенциальная проблема."
 
 # 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 "
@@ -1072,7 +1324,7 @@
 "И модификации не ограничены 
&ldquo;улучшениями&rdquo;."
 
 # 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 "
@@ -1088,7 +1340,7 @@
 "параллельно другим образом."
 
 # 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 "
@@ -1102,7 +1354,7 @@
 "своих вычислений."
 
 # 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 "
@@ -1113,7 +1365,7 @@
 "запутанный текст не считается исходным 
текстом."
 
 # 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 "
@@ -1127,7 +1379,7 @@
 "проекте по разработке."
 
 # 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 "
@@ -1138,7 +1390,7 @@
 "выпускать измененные версии как 
свободные программы."
 
 # 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 "
@@ -1149,7 +1401,7 @@
 "практической, а не только теоретической; 
т.&nbsp;е. никакой тивоизации."
 
 # 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 "
@@ -1162,7 +1414,7 @@
 "полная смена лицензии."
 
 # 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 "
@@ -1175,7 +1427,7 @@
 "местах, но не были отражены везде:"
 
 # 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 "
@@ -1186,7 +1438,7 @@
 "распространение измененных версий, а не 
просто изменений."
 
 # 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."
@@ -1195,17 +1447,17 @@
 "лицензией."
 
 # 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 "Явно высказано заключение по вопросу 
экспортного контроля."
 
 # 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 "Внесение изменений в лицензию 
означает отзыв прежней лицензии."
 
 # 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 "
@@ -1216,7 +1468,7 @@
 "Кроме программ&quot;."
 
 # 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 "
@@ -1227,7 +1479,7 @@
 "имеют значение, когда речь идет о свободе 
выполнять программу в любых целях."
 
 # 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 "
@@ -1238,7 +1490,7 @@
 "утверждений о лицензиях, основанных на 
контрактах."
 
 # 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 "
@@ -1251,7 +1503,7 @@
 "свободными программами для создания своих
 модификаций."
 
 # 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 "
@@ -1264,7 +1516,7 @@
 "которые вы передаете в общественное 
пользование."
 
 # 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 "
@@ -1277,7 +1529,7 @@
 "Другие незначительные пояснения по всему 
тексту."
 
 # 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 "
@@ -1288,7 +1540,7 @@
 "потенциальные проблемы, связанные с 
лицензиями, основанными на контрактах."
 
 # 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 "
@@ -1299,7 +1551,7 @@
 "распространение в двоичном виде важно."
 
 # 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 "
@@ -1312,7 +1564,7 @@
 "распространяете, предыдущим 
разработчикам по запросу."
 
 # 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 "
@@ -1331,11 +1583,11 @@
 "root=www&amp;view=log\">системы cvsweb</a>."
 
 # type: Content of: <h4>
-#. 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 "
@@ -1376,14 +1628,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 ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -1394,9 +1652,15 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. 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."
@@ -1423,6 +1687,10 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+# type: Content of: <h2>
+#~ msgid "Open Source?"
+#~ msgstr "Открытый исходный текст?"
+
 #~ msgid "Clarifying the line at various points"
 #~ msgstr "Пояснение позиции в различных 
аспектах"
 

Index: free-sw.sk.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sk.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- free-sw.sk.po       30 May 2021 16:29:02 -0000      1.73
+++ free-sw.sk.po       16 Jul 2021 10:02:24 -0000      1.74
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.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: 2009-09-27 17:27+0200\n"
 "Last-Translator: Dominik Smatana <dominik@fsf.sk>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -21,7 +21,11 @@
 "Outdated-Since: 2011-08-04 04:25-0300\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 "Čo je Slobodný softvér? - Projekt GNU - Nadácia pre slobodný 
softvér"
 
 #. type: Attribute 'content' of: <meta>
@@ -42,61 +46,14 @@
 "cieľom poskytnúť užívateľom výpočtovej techniky slobodu zdieľať a 
zlepšovať "
 "softvér, ktorý používajú."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr "Čo je Slobodný softvér?"
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definícia slobodného softvéru"
-
-#. 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 it to be considered-] {+qualifies as+}
-# | free software.  From time to time we revise this definition{+,+} to
-# | clarify [-it.  If you would like-] {+it or+} to [-review the changes we've
-# | made, please see-] {+resolve questions about subtle issues.  See+} the <a
-# | href=\"#History\">History section</a> below for [-more information.-] {+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.  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 ""
-"Táto definícia bola vytvorená s cieľom jasne ukázať, aké podmienky 
musí "
-"príslušný softvér spĺňať, aby mohol byť považovaný za slobodný.  Z 
času na "
-"čas túto definíciu aktualizujeme, ak je potrebné niečo upresniť alebo "
-"bližšie objasniť.  Ak vás zaujíma, aké zmeny boli vykonané, pozrite si 
"
-"prosím <a href=\"#History\">históriu</a> na spodu pre bližšie 
informácie."
-
-#. 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 "Čo je Slobodný softvér?"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 # | [-<q>Free software</q>-]{+&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
@@ -129,7 +86,41 @@
 "speech</cite> (sloboda prejavu) a nie ako <cite>free beer</cite> (pivo "
 "zadarmo)."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+# | [-<q>Free software</q> does not mean <q>non-commercial.</q> 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 ""
+#| "<q>Free software</q> does not mean <q>non-commercial.</q> 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 ""
+"„Slobodný softvér“ neznamená „nekomerčný“. Slobodný program 
musí byť k "
+"dispozícii aj na komerčné použitie, komerčný vývoj a komerčné 
sírenie.  "
+"Komerčný vývoj slobodného softvéru už nie je ničím výnimočným; 
takýto "
+"slobodný komerčný softvér je veľmi dôležitý.  Za získanie kópie 
slobodného "
+"softvéru ste mohli buď zaplatiť, alebo ste ho mohli získať bezplatne. 
Avšak "
+"nezávisle na spôsobe, akým ste svoju kópiu získali, máte vždy 
zaručenú "
+"slobodu tento ďalej šíriť, upravovať alebo dokonca <a 
href=\"/philosophy/"
+"selling.html\">predávať</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 "
@@ -140,11 +131,161 @@
 "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 "Definícia slobodného softvéru"
+
+#. 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 "Sloboda spúšťať program, a to za akýmkoľvek účelom (sloboda 
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 "Sloboda voľne šíriť kópie a pomáhať tak svojmu okoliu (sloboda 
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 "Definícia slobodného softvéru"
+
+#. 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 it to be considered-] {+qualifies as+}
+# | free software.  From time to time we revise this definition{+,+} to
+# | clarify [-it.  If you would like-] {+it or+} to [-review the changes we've
+# | made, please see-] {+resolve questions about subtle issues.  See+} the <a
+# | href=\"#History\">History section</a> below for [-more information.-] {+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.  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 ""
+"Táto definícia bola vytvorená s cieľom jasne ukázať, aké podmienky 
musí "
+"príslušný softvér spĺňať, aby mohol byť považovaný za slobodný.  Z 
času na "
+"čas túto definíciu aktualizujeme, ak je potrebné niečo upresniť alebo "
+"bližšie objasniť.  Ak vás zaujíma, aké zmeny boli vykonané, pozrite si 
"
+"prosím <a href=\"#History\">históriu</a> na spodu pre bližšie 
informácie."
+
+#. 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 means that-] {+free software if+} the program's users have the four
@@ -163,7 +304,7 @@
 "Presnejšie povedané, znamená to, že užívatelia softvéru majú štyri 
základné "
 "slobody:"
 
-#. 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
@@ -172,7 +313,7 @@
 "The freedom to run the program as you wish, for any purpose (freedom 0)."
 msgstr "Sloboda spúšťať program, a to za akýmkoľvek účelom (sloboda 
0)."
 
-#. 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.
@@ -190,7 +331,7 @@
 "prispôsobovať ho tak svojim požiadavkám (sloboda 1). Prístup k 
zdrojovému "
 "kódu je k tomu nevyhnutnou podmienkou."
 
-#. 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 +341,7 @@
 msgid "The freedom to redistribute copies so you can help others (freedom 2)."
 msgstr "Sloboda voľne šíriť kópie a pomáhať tak svojmu okoliu (sloboda 
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 (and-] modified versions [-in general)-] to [-the
 # | public, so that-] {+others (freedom 3).  By doing this you can give+} the
@@ -223,7 +364,7 @@
 "prínosom pre celú spoločnosť (sloboda 3).  Prístup k zdrojovému kódu 
je k "
 "tomu nevyhnutnou podmienkou."
 
-#. 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 "
@@ -231,7 +372,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 "
@@ -242,7 +383,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, "
@@ -251,7 +396,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 "
@@ -264,7 +409,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 "
@@ -272,7 +417,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 "
@@ -283,52 +428,18 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-# | [-<q>Free software</q> does not mean <q>non-commercial.</q> 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 ""
-#| "<q>Free software</q> does not mean <q>non-commercial.</q> 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 ""
-"„Slobodný softvér“ neznamená „nekomerčný“. Slobodný program 
musí byť k "
-"dispozícii aj na komerčné použitie, komerčný vývoj a komerčné 
sírenie.  "
-"Komerčný vývoj slobodného softvéru už nie je ničím výnimočným; 
takýto "
-"slobodný komerčný softvér je veľmi dôležitý.  Za získanie kópie 
slobodného "
-"softvéru ste mohli buď zaplatiť, alebo ste ho mohli získať bezplatne. 
Avšak "
-"nezávisle na spôsobe, akým ste svoju kópiu získali, máte vždy 
zaručenú "
-"slobodu tento ďalej šíriť, upravovať alebo dokonca <a 
href=\"/philosophy/"
-"selling.html\">predávať</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
@@ -336,7 +447,7 @@
 msgid "The freedom to run the program as you wish"
 msgstr "Sloboda spúšťať program, a to za akýmkoľvek účelom (sloboda 
0)."
 
-#. 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
@@ -375,7 +486,7 @@
 "má potom slobodu používať ho výhradne podľa svojho vlastného úmyslu, 
tj. vy "
 "nemáte nárok vnucovať mu vaše vlastné úmysly."
 
-#. 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 "
@@ -384,7 +495,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, "
@@ -395,18 +506,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
@@ -432,7 +543,7 @@
 "je voľná dostupnosť zdrojových kódov nevyhnutnou podmienkou slobodného "
 "softvéru."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | 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 else's modified versions but refuse to run yours &mdash; a
@@ -467,7 +578,7 @@
 "&mdash; sloboda 1 sa stáva skôr teoretickou fikciou ako skutočnou slobodou 
v "
 "praxi.  To je nedostačujúce."
 
-#. 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 a suitably[---]{+ +}licensed existing [-module, such as-]
@@ -495,7 +606,7 @@
 "pridávate, potom je takáto licencia príliš obmedzujúca na to, aby mohla 
byť "
 "považovaná za slobodnú."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Whether a change constitutes an improvement is a subjective matter.  If
 # | your [-modifications are-] {+right to modify a program is+} limited, in
 # | substance, to changes that someone else considers an improvement, that
@@ -514,14 +625,14 @@
 "subjektívneho názoru.  Ak vám je umožnené vykonávať len také zmeny, 
ktoré "
 "niekto iný musí posúdiť a uznať ako vylepšenia, to nie je sloboda."
 
-#. 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
@@ -531,7 +642,7 @@
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "Sloboda voľne šíriť kópie a pomáhať tak svojmu okoliu (sloboda 
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
@@ -561,7 +672,7 @@
 "dovolené robiť uvedené veci znamná (okrem iného), že si nemusíte od 
nikoho "
 "pýtať povolenie, alebo za takéto povolenie niekomu platiť."
 
-#. 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 "
@@ -574,16 +685,16 @@
 "tiež nesmie byť vyžadované, aby ste o tom niekoho museli informovať "
 "akýmkoľvek spôsobom."
 
-#. 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 "
@@ -602,15 +713,15 @@
 "takúto možnosť nepodporujú), musí vám byť však zaručená sloboda 
šíriť kópie "
 "v takej forme, aby bolo možné daný program spúšťať."
 
-#. 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, [-copyleft-] {+<a
-# | href=\"/copyleft/copyleft.html\">copyleft</a>+} (very simply stated) is
+# | 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.
@@ -625,7 +736,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."
@@ -637,7 +748,7 @@
 "obmedzenia, ktoré by ľuďom odopierali základné slobody.  Toto pravidlo "
 "nijako neobmedzuje základné slobody, naopak, chráni ich."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | In the GNU project, we use [-<q><a
 # | href=\"/copyleft/copyleft.html\">copyleft</a></q>-] {+copyleft+} to
 # | protect [-these-] {+the four+} freedoms legally for everyone.  [-But <a
@@ -686,11 +797,11 @@
 "<q>slobodný softvér,</q> <q>copyleftovaný softvér</q> a iné druhy 
softvéru "
 "navzájom súvisia."
 
-#. 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
@@ -747,7 +858,7 @@
 "ak ste sa ju začali šíriť ďalej alebo ste sa uviedli ako autor takýchto 
"
 "modifikácií."
 
-#. 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 "
@@ -759,7 +870,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 "
@@ -769,20 +880,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</"
@@ -795,15 +907,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 ""
 "Niekedy môžu vládne <a id=\"exportcontrol\">nariadenia obmedzujúce 
export</"
 "a> alebo iné obchodné sankcie obmedziť vašu slobodu šíriť kópie 
programov v "
@@ -814,7 +926,7 @@
 "slobodného softvéru teda nesmú vyžadovať podriadenie sa žiadnym 
nariadeniam "
 "obmedzujúcim export ako podmienku pre žiadnu so základných slobô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 "
@@ -824,11 +936,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 [-change-]
@@ -854,7 +966,7 @@
 "alebo dodatočne meniť jej znenie bez toho, aby ste mu vy porušovaním jej "
 "podmienok k tomu dávali dôvod, takýto softvér nie je slobodný."
 
-#. 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 "
@@ -863,17 +975,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-"
@@ -894,7 +1006,7 @@
 "preto väčšia pravdepodobnosť, že takáto licencia bude príliš 
obmedzujúca, "
 "aby mohla byť uznaná ako slobodná."
 
-#. 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 "
@@ -907,69 +1019,54 @@
 "oprávnený, budeme sa ňou musieť podrobnejšie zaoberať, ale 
pravdepodobne "
 "nebude uznaná ako slobodná."
 
-#. 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
-# | [-<q>give away</q>-] {+&ldquo;give away&rdquo;+} or [-<q>for free,</q>-]
-# | {+&ldquo;for free,&rdquo;+} because those terms imply that the issue is
-# | about price, not freedom.  Some common terms such as [-<q>piracy</q>-]
-# | {+&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 [-<q>free
-# | software</q></a>-] {+&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 "
-#| "<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 ""
-"Keď hovoríme o slobodnom softvéri, mali by sme sa vyhýbať pojmom ako "
-"„darovať“ alebo „dať zadarmo“, pretože tieto pojmy navodzujú 
dojem, že sa "
-"jedná o cenu softvéru a nie o jeho slobodu.  Niektoré bežne používané 
pojmy "
-"ako napr. „pirátstvo“ predstavujú názory, ktoré, dúfame, 
neschvaľujete .  "
-"Pozrite si zoznam <a href=\"/philosophy/words-to-avoid.html\">zavádzajúcich 
"
-"slov a výrazov, ktorým sa odporúčame vyhnúť,</a> kde nájdete bližšie 
"
-"vysvetlenie a diskusiu k tejto problematike.  Máme tiež zoznam <a href=\"/"
-"philosophy/fs-translations.html\">prekladov výrazu „slobodný 
softvér“</a> do "
-"rôznych jazykov."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Definícia slobodného softvéru"
 
-#. 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 ""
 "Na záver ešte poznamenajme, že kritéria, ktoré sme uviedli vyššie v 
tejto "
 "definícii slobodného softvéru, vyžadujú veľmi opatrné uvažovanie pri 
ich "
@@ -985,11 +1082,11 @@
 "problému, zaktualizujeme tieto kritéria, aby bolo možné jednoduchšie "
 "porozumieť, prečo daná licencia bola schválená, príp. odmietnutá."
 
-#. 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 "
@@ -1003,7 +1100,7 @@
 "uvedená, môžete sa skúsiť spýtať priamo nás na  <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
@@ -1029,7 +1126,7 @@
 "danej licencii; je možné, že vám budeme vedieť pomôcť nájsť nejakú 
už "
 "existujúcu licenciu slobodného softvéru, ktorá by spĺňala vaše 
potreby."
 
-#. 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 "
@@ -1039,11 +1136,86 @@
 "využitím našej pomoci si zabezpečíte, že vaša nová licencia bude 
skutočne "
 "slobodná a vyhnete sa rôznym praktickým problémom."
 
-#. 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
+# | [-<q>give away</q>-] {+&ldquo;give away&rdquo;+} or [-<q>for free,</q>-]
+# | {+&ldquo;for free,&rdquo;+} because those terms imply that the issue is
+# | about price, not freedom.  Some common terms such as [-<q>piracy</q>-]
+# | {+&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 [-<q>free
+# | software</q></a>-] {+&ldquo;free software&rdquo;</a>+} into various
+# | languages.
+#, 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 ""
+"Keď hovoríme o slobodnom softvéri, mali by sme sa vyhýbať pojmom ako "
+"„darovať“ alebo „dať zadarmo“, pretože tieto pojmy navodzujú 
dojem, že sa "
+"jedná o cenu softvéru a nie o jeho slobodu.  Niektoré bežne používané 
pojmy "
+"ako napr. „pirátstvo“ predstavujú názory, ktoré, dúfame, 
neschvaľujete .  "
+"Pozrite si zoznam <a href=\"/philosophy/words-to-avoid.html\">zavádzajúcich 
"
+"slov a výrazov, ktorým sa odporúčame vyhnúť,</a> kde nájdete bližšie 
"
+"vysvetlenie a diskusiu k tejto problematike.  Máme tiež zoznam <a href=\"/"
+"philosophy/fs-translations.html\">prekladov výrazu „slobodný 
softvér“</a> do "
+"rôznych jazykov."
+
+#. 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 ""
+"Iná skupina ľudí začala používať pojem „open souce“ (otvorený 
zdroj), ktorým "
+"označuje niečo blízke (ale nie totožné) „slobodnému softvéru“. My "
+"uprednostňujeme názov „slobodný softvér“, pretože ten okamžite 
vyvoláva "
+"myšlienku slobody.  Pojem „otvorený“ <a href=\"/philosophy/open-source-"
+"misses-the-point.html\">nijako nepoukazuje na slobodu</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Okrem softvéru"
 
-#. 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 "
@@ -1053,11 +1225,21 @@
 "a> z rovnakých dôvodov, prečo musí byť aj samotný softvér slobodný, a 
"
 "pretože dokumentácia je v podstate súčasťou softvéru."
 
-#. 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 ""
 "Rovnaké argumenty je možné použiť aj pri iných druhoch diel s 
praktickým "
@@ -1065,7 +1247,7 @@
 "napr. rôzne študijné práce alebo referáty.  <a 
href=\"http://wikipedia.org";
 "\">Wikipedia</a> je najznámejším príkladom."
 
-#. 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/\";> "
@@ -1076,44 +1258,10 @@
 "\">slobodných kultúrnych diel</a> aplikovateľnú na akékoľvek druhy 
diel."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Open Source?"
-
-#. 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 ""
-"Iná skupina ľudí začala používať pojem „open souce“ (otvorený 
zdroj), ktorým "
-"označuje niečo blízke (ale nie totožné) „slobodnému softvéru“. My "
-"uprednostňujeme názov „slobodný softvér“, pretože ten okamžite 
vyvoláva "
-"myšlienku slobody.  Pojem „otvorený“ <a href=\"/philosophy/open-source-"
-"misses-the-point.html\">nijako nepoukazuje na slobodu</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "História"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | From time to time we revise this Free Software [-Definition to clarify
 # | it.-] {+Definition.+}  Here [-we provide a-] {+is the+} list of [-those
 # | modifications,-] {+substantive changes,+} along with links to
@@ -1133,7 +1281,7 @@
 "objasnenia.  Tu vám ponúkame zoznam takýchto úprav vrátane odkazov na "
 "podrobné detaily vykonaných zmien, aby ich mal možnosť každý 
skontrolovať."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1142,7 +1290,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 "
@@ -1150,42 +1298,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 "
@@ -1193,7 +1341,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 "
@@ -1201,7 +1349,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 "
@@ -1209,7 +1357,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 "
@@ -1218,7 +1366,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 "
@@ -1226,14 +1374,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 "
@@ -1241,14 +1389,14 @@
 "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 "
@@ -1258,7 +1406,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Verzia 1.80</a>: Sloboda 1 musí byť "
 "praktická, nielen teoretická; napr. žiadna tivoizácia."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1270,7 +1418,7 @@
 "vykonané zmeny v licencii sú neakceptovateľné, a to aj v prípade, ak nie 
sú "
 "popísané ako kompletná náhrada."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1282,7 +1430,7 @@
 "ktoré neboli dostatočne jasné, alebo boli niekde uvedené ale neboli nikde 
"
 "spomenuté:"
 
-#. 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 "
@@ -1292,7 +1440,7 @@
 "druhy upravených verzií môžete ďalej šíriť.  Sloboda 3 zahŕňa 
voľné šírenie "
 "akýchkoľvek upravených verzií, nielen zmien."
 
-#. 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."
@@ -1300,16 +1448,16 @@
 "Právo zlučovať navzájom existujúce moduly sa vzťahuje na také, ktoré 
sú "
 "vhodne licencované."
 
-#. 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 "Jasné vyjadrenie záveru týkajúceho sa problému kontrolovaného 
exportu."
 
-#. 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 ""
 "Zavedenie nejakej zmeny do licencie predstavuje zrušenie pôvodnej licencie."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1319,7 +1467,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Verzia 1.57</a>: Pridaná časť 
&quot;Okrem "
 "softvéru&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 "
@@ -1329,7 +1477,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Verzia 1.46</a>: Objasnenie, koho zámer "
 "je dôležitý v slobode spúšťať program za akýmkoľvek účelom."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1339,7 +1487,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Verzia 1.41</a>: Objasnená formulácia "
 "týkajúca sa zmluvne založených licencií."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1351,7 +1499,7 @@
 "licencia vám musí povoľovať používanie iného slobodného softvéru na "
 "vytváranie vašich vlastných ú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 "
@@ -1363,7 +1511,7 @@
 "akceptovateľné, aby licencia od vás vyžadovala poskytnutie zdrojových 
kódov "
 "pre verzie softvéru, ktoré ste zverejnili."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1375,7 +1523,7 @@
 "akceptovateľné, aby od vás licencia vyžadovala identifikovať sa ako 
autor "
 "upravenej verzie.  Iné drobné objasnenia v texte."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1385,7 +1533,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Verzia 1.23</a>: Uvedenie možných "
 "problémov pri používaní zmluvne založených licencií."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1395,7 +1543,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Verzia 1.16</a>: Vysvetlenie, prečo je "
 "distribúcia binárnych formátov dôležitá."
 
-#. 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.10&amp;r2=1.11\";>Version
 # | 1.11</a>: Note that a free license may require you to send a copy of
@@ -1418,7 +1566,7 @@
 "licencia od vás môže vyžadovať zaslanie kópie verzie, ktorú šírite, "
 "pôvodnému autorovi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | There are gaps in the version numbers {+shown above+} because there are
 # | [-many-] other changes {+in this page+} that do not affect the
 # | [-substance-] {+definition or its interpretations.  For instance, the list
@@ -1454,11 +1602,11 @@
 "gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log\">cvsweb "
 "rozhrania</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 "
@@ -1491,6 +1639,7 @@
 "chyby a možné vylepšenia na <a 
href=\"mailto:webmasters@gnu.org\";>&lt;mailto:";
 "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
@@ -1498,15 +1647,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 ""
 "Ak chcete pomôcť s prekladom tejto stránky (príp. s jeho úpravou), "
@@ -1514,15 +1671,15 @@
 "\">informácie pre prekladateľov</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-] {+2009-2019, 2021+} Free
+# | Copyright &copy; 1996, 2002, 2004-2007, [-2009-] {+2009-2021+} Free
 # | Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 2002, 2004-2007, 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."
 
@@ -1546,6 +1703,19 @@
 msgid "Updated:"
 msgstr "Aktualizované:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Open Source?"
+
+#, 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."
+#~ msgstr ""
+#~ "Ak chcete pomôcť s prekladom tejto stránky (príp. s jeho úpravou), "
+#~ "prečítajte si prosím <a 
href=\"/server/standards/README.translations.html"
+#~ "\">informácie pre prekladateľov</a>."
+
 #~ msgid ""
 #~ "Free software is a matter of the users' freedom to run, copy, distribute, "
 #~ "study, change and improve the software.  More precisely, it means that "

Index: free-sw.sq.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sq.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- free-sw.sq.po       31 May 2021 11:30:28 -0000      1.28
+++ free-sw.sq.po       16 Jul 2021 10:02:24 -0000      1.29
@@ -6,7 +6,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-04-01 10:25+0300\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: \n"
@@ -14,10 +14,13 @@
 "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.4.2\n"
 
 #. type: Content of: <title>
-msgid "What is 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 ""
 "Ç’është software-i i lirë? - Projekti GNU - Free Software Foundation 
(FSF)"
 
@@ -39,57 +42,13 @@
 "Unix-in, që përdoruesit e kompjuterit të jenë të lirë të shkëmbejnë 
dhe të "
 "përmirësojnë software-in që përdorin."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "What is free software?"
+msgid "What is Free Software?"
 msgstr "Ç’është software-i  i lirë?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Përkufizimi i Software-it të Lirë"
-
-#. 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 ""
-"Keni një pyetje rreth licencimesh software-i të lirë që nuk ka përgjigje 
"
-"këtu? Shihni <a href=\"http://www.fsf.org/licensing\";>burime të tjera tonat 
"
-"mbi licencime</a> dhe, në qoftë e nevojshme, lidhuni me FSF Compliance Lab "
-"te <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 ""
-"Përkufizimi i software-it të lirë përfaqëson kriterin nëse një program 
"
-"software i caktuar duhet konsideruar software i lirë.  Kohë pas kohe, ne e "
-"rishikojmë këtë përkufizim, për ta qartësuar ose për të zgjidhur 
pyetje dhe "
-"probleme të holla.  Për një listë të ndryshimeve që prekin 
përkufizimin e "
-"software-it të lirë, shihni <a href=\"#History\">ndarjen Historik</a> më "
-"poshtë."
-
-#. 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 ""
-"“Burimi i hapur” është diçka e ndryshme: ka një filozofi shumë të 
ndryshme "
-"të bazuar në vlera të tjera.  Edhe përkufizimi praktik i tij është i "
-"ndryshëm, por thuajse krejt programet me burim të hapur janë në fakt të "
-"lirë.  Dallimin e shpjegojmë te <a 
href=\"/philosophy/open-source-misses-the-"
-"point.html\"> Pse “Burimi i Hapur” Nuk e Rrok Thelbin e Software-it të 
Lirë</"
-"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, "
@@ -109,7 +68,19 @@
 "huazuar fjalën frënge os spanjolle përr “i lirë” si te liria, për 
të treguar "
 "se nuk nënkuptojmë se është falas."
 
-#. 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 ""
+"Mund të keni paguar para për të pasur kopje të software-it të lirë, ose 
mund "
+"t’i keni marrë kopjet falas.  Por pavarësisht se si i siguruat kopjet 
tuaja, "
+"gëzoni përherë lirinë për ta kopjuar dhe ndryshuar software-in, madje 
edhe "
+"për <a href=\"/philosophy/selling.html\">të shitur kopje të tij</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 "
@@ -127,11 +98,166 @@
 "href=\"/philosophy/free-software-even-more-important.html\"> instrument "
 "pushteti të padrejtë mbi tjetrin</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 ""
+"“Burimi i hapur” është diçka e ndryshme: ka një filozofi shumë të 
ndryshme "
+"të bazuar në vlera të tjera.  Edhe përkufizimi praktik i tij është i "
+"ndryshëm, por thuajse krejt programet me burim të hapur janë në fakt të "
+"lirë.  Dallimin e shpjegojmë te <a 
href=\"/philosophy/open-source-misses-the-"
+"point.html\"> Pse “Burimi i Hapur” Nuk e Rrok Thelbin e Software-it të 
Lirë</"
+"a>."
+
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "Tryeza e Lëndës"
+
+#. 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 "Përkufizimi i Software-it të Lirë"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "The four essential freedoms"
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr "Katër liritë thelbësore"
+
+#. 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>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr "Qartësim i vijës ndarëse mes të lirit dhe jo të lirit"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "Lirinë për ta xhiruar programin si të doni"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "Lirinë për të studiuar kodin burim dhe për të bërë ndryshime"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "Lirinë për ta rishpërndarë, nëse doni: kushte të domosdoshme"
+
+#. 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>
+#, fuzzy
+#| msgid "Rules about packaging and distribution details"
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr "Rregulla mbi paketimin dhe hollësi shpërndarjeje"
+
+#. 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>
+#, fuzzy
+#| msgid "Contract-based licenses"
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr "Licenca me bazë kontrata"
+
+#. 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>
+#, fuzzy
+#| msgid "How we interpret these criteria"
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr "Si i interpretojmë këto kritere"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "Get help with free licenses"
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr "Merrni ndihmë rreth licencash të lira"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "Përdorni fjalët e duhura kur flisni mbi software-in e lirë"
+
+#. 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 ""
+"Keni një pyetje rreth licencimesh software-i të lirë që nuk ka përgjigje 
"
+"këtu? Shihni <a href=\"http://www.fsf.org/licensing\";>burime të tjera tonat 
"
+"mbi licencime</a> dhe, në qoftë e nevojshme, lidhuni me FSF Compliance Lab "
+"te <a href=\"mailto:licensing@fsf.org\";>licensing@fsf.org</a>."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Përkufizimi i Software-it të Lirë"
+
+#. 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 ""
+"Përkufizimi i software-it të lirë përfaqëson kriterin nëse një program 
"
+"software i caktuar duhet konsideruar software i lirë.  Kohë pas kohe, ne e "
+"rishikojmë këtë përkufizim, për ta qartësuar ose për të zgjidhur 
pyetje dhe "
+"probleme të holla.  Për një listë të ndryshimeve që prekin 
përkufizimin e "
+"software-it të lirë, shihni <a href=\"#History\">ndarjen Historik</a> më "
+"poshtë."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "Katër liritë thelbësore"
 
-#. 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>"
@@ -139,13 +265,13 @@
 "Një program është software i lirë nëse përdoruesit e programit 
gëzojnë mbi "
 "të katër liritë thelbësore: <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 ""
 "Liria për ta xhiruar programin si të doni, për çfarëdo qëllimi (liria 
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,13 +281,13 @@
 "kështu të punojë si doni ju (liria 1). Hyrja në kodin burim është 
parakusht "
 "për këtë."
 
-#. 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 ""
 "Lirinë për të rishpërndarë kopje, që kështu të mund t’i vini në 
ndihmë të "
 "tjerëve (liria 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 "
@@ -173,7 +299,7 @@
 "përfitojë nga ndryshimet tuaja.  Hyrja në kodin burim është parakusht 
për "
 "këtë."
 
-#. 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 "
@@ -185,7 +311,7 @@
 "dallojmë skema të ndryshme shpërndarjeje jo të lirë lidhur me sa thellë 
"
 "s’janë të lira, i konsiderojmë të tëra njësoj joetike."
 
-#. 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 "
@@ -203,7 +329,11 @@
 "dy, A-ja dhe B-ja janë të lirë.  Por nëse kemi në plan ta ndryshojmë 
A-në që "
 "të mos e përdorë B-në, vetëm A-ja na duhet i lirë; mund ta shpërfillim 
B-në."
 
-#. 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, "
@@ -216,7 +346,7 @@
 "dhe shpërndarje komerciale.  Ky rregull është i një rëndësie 
themelore&mdash;"
 "pa të, software-i i lirë s’do të mund të arrinte synimet e veta."
 
-#. 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 "
@@ -239,7 +369,7 @@
 "Asistenca profesionale, me pagesë për software-in e lirë përmbush një 
nevojë "
 "të rëndësishme."
 
-#. 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 +382,7 @@
 "i licencuar me kufizime të tilla nuk kualifikohet si <em>software</em> i "
 "lirë."
 
-#. 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 "
@@ -270,23 +400,13 @@
 "ngjashme, për t’i ushtruar ato, është thuajse njësoj me mosakordimin e "
 "lirive në fjalë, dhe duke e bërë kështu programin jo të lirë."
 
-#. 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 ""
-"Mund të keni paguar para për të pasur kopje të software-it të lirë, ose 
mund "
-"t’i keni marrë kopjet falas.  Por pavarësisht se si i siguruat kopjet 
tuaja, "
-"gëzoni përherë lirinë për ta kopjuar dhe ndryshuar software-in, madje 
edhe "
-"për <a href=\"/philosophy/selling.html\">të shitur kopje të tij</a>."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr "Qartësim i vijës ndarëse mes të lirit dhe jo të lirit"
 
-#. 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 "
@@ -296,11 +416,11 @@
 "lypset të shtrihen liritë e ndryshme, lidhur me probleme të ndryshme, që 
një "
 "program të jetë i lirë."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "Lirinë për ta xhiruar programin si të doni"
 
-#. 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 "
@@ -320,7 +440,7 @@
 "shpërndani dikujt tjetër, ai është mandej i lirë ta përdorë për 
qëllimet e "
 "tija, por ju s’keni ndonjë tagër të impononi qëllimet tuaja mbi të."
 
-#. 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 "
@@ -333,7 +453,7 @@
 "ka programi, nëse është apo jo teknikisht i aftë të funksionojë në 
çfarëdo "
 "mjedisi të dhënë, apo nëse është apo jo i dobishëm për atë që doni 
të bëni."
 
-#. 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, "
@@ -351,7 +471,7 @@
 "liritë 1 dhe 3 u lejojnë përdoruesve dhe bashkësive të krijojnë dhe "
 "shpërndajnë versione të ndryshuara pa kod arbitrar ndotës."
 
-#. 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 "
@@ -361,11 +481,11 @@
 "kjo është ajo që dëshironi.  Ndaj s’ka nevojë për një “lirinë 
për të mos e "
 "xhiruar një program” më vete."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "Lirinë për të studiuar kodin burim dhe për të bërë ndryshime"
 
-#. 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 "
@@ -379,7 +499,7 @@
 "software-in e lirë.  “Kodi burim” i errësuar s’është kod burim i 
njëmendtë "
 "dhe nuk vlen si kod burim."
 
-#. 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 "
@@ -399,7 +519,7 @@
 "një realitet praktik.  Këta dyorë s’janë software i lirë, edhe pse 
kodi "
 "burim prej nga u përpiluan është i lirë."
 
-#. 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,7 +534,7 @@
 "që të jeni i zoti i të drejtave të kopjimit të çdo kodi që shtoni 
&mdash; "
 "atëherë licenca është shumë kufizuese për t’u cilësuar si e lirë."
 
-#. 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 "
@@ -425,7 +545,7 @@
 "ndryshime që përmirësime i konsideron dikush tjetër, ai program 
s’është i "
 "lirë."
 
-#. 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 "
@@ -436,11 +556,11 @@
 "Në këtë mënyrë, liria 1 përfshin &ldquo;lirinë për të fshirë 
programin."
 "&rdquo;"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "Lirinë për ta rishpërndarë, nëse doni: kushte të domosdoshme"
 
-#. 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 "
@@ -454,7 +574,7 @@
 "i lirë për të bërë këto do të thotë (mes të tjerash) që nuk ju 
duhet të "
 "kërkoni apo paguani ndonjë leje për të bërë ashtu."
 
-#. 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 "
@@ -466,11 +586,18 @@
 "ato ekzistojnë.  Nëse i bëni publike ndryshimet tuaja, s’duhet t’ju 
duhet të "
 "njoftoni dikë veçanërisht, apo në çfarëdo mënyre të veçantë."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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 ""
@@ -482,7 +609,7 @@
 "që kërkon që versionet e modifikuar të jenë jo të lirë , nuk 
cilësohet "
 "licencë e lirë."
 
-#. 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 "
@@ -501,15 +628,23 @@
 "veçori), s’ka gjë, por duhet të gëzoni lirinë për rishpërndarje 
formash të "
 "tilla, nëse gjeni ose zhvilloni një rrugë për t’i krijuar ato."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "Copyleft-i"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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."
@@ -521,7 +656,7 @@
 "kufizime për t’u mohuar të tjerëve liritë qendrore.  Ky rregull nuk ka "
 "përplasje me liritë qendrore; në fakt i mbron ato."
 
-#. 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/"
@@ -541,11 +676,11 @@
 "nën copyleft” dhe të tjera kategori software-i, shihni <a 
href=\"/philosophy/"
 "categories.html\">Kategori Software-i të Lirë</a>."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Rregulla mbi paketimin dhe hollësi shpërndarjeje"
 
-#. 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 "
@@ -566,7 +701,7 @@
 "ndryshimet tuaja, ato janë të pranueshme; jeni duke bërë tashmë 
ndryshime në "
 "program, ndaj s’do ta keni problem të bëni edhe ca të tjera."
 
-#. 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 "
@@ -587,7 +722,7 @@
 "Janë të pranueshme edhe rregullat që kërkojnë hedhjen në qarkullim për 
"
 "përdoruesit të kodit burim për versione që i kaloni në përdorim publik."
 
-#. 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 "
@@ -605,21 +740,32 @@
 "lejon të caktoni emrin origjinal të programit si një alias për versionin 
e "
 "modifikuar."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Rregulla eksporti"
 
-#. 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>
+#, 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 ""
 "Ka raste kur <a id=\"exportcontrol\">rregulloret e kontrollit të 
eksporteve</"
 "a> dhe sanksionet tregtare qeveritare mund ta ngushtojnë lirinë tuaj për "
@@ -632,7 +778,7 @@
 "rregulloresh jotriviale eksporti, si kusht për ushtrimin e cilësdo prej "
 "lirive thelbësore."
 
-#. 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 "
@@ -649,11 +795,11 @@
 "ligjin e eksportit mund ta bëjë domosdoshmërinë jotriviale, duke e bërë 
"
 "kështu jo të lirë software-in."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Konsiderata ligjore"
 
-#. 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 "
@@ -666,7 +812,7 @@
 "it ka fuqinë ta shfuqizojë licencën, ose të shtojë në kushtet e saj 
kufizime "
 "pas dasme, pa bërë ju diçka që t’i japë shkak, software-i është jo i 
lirë."
 
-#. 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 "
@@ -680,7 +826,7 @@
 "përdoruesi që xhiron programe jo të lira do të kërkonte pajtueshmëri me 
"
 "liccencat e këtyre programeve jo të lira;kjo e bën licencën jo të lirë."
 
-#. 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."
@@ -689,11 +835,11 @@
 "juridiksionit e prek, ose se ku duhen trajtuar mosmarrëveshjet, ose që të "
 "dyja."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Licenca me bazë kontrata"
 
-#. 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-"
@@ -715,7 +861,7 @@
 "mundshme që një licencë e tillë të jetë kufizuese dhe jo e lirë, aq sa 
për "
 "të mos u pranuar më."
 
-#. 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 "
@@ -728,48 +874,42 @@
 "cila s’është përmendur këtu si e ligjshme, do të na duhet të 
mendohemi për "
 "të, dhe gjasat janë që do të dalim me përfundimin se është jo e lirë."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Përdorni fjalët e duhura kur flisni mbi software-in e lirë"
-
-#. 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 ""
-"Kur flitet rreth software-it të lirë, është mirë të shmangen terma të 
tillë "
-"si “dhënë falas” ose “falas”, ngaqë këto terma nënkuptojnë se 
punë këtu "
-"është te çmimi, jo te liria.  Disa terma të rëndomtë, të tillë si 
“pirateri” "
-"trupëzojnë opinione që shpresojmë se nuk do t’i bëni tuajt.  Për një 
"
-"diskutim të këtyre termave, shihni <a 
href=\"/philosophy/words-to-avoid.html"
-"\">Fjalë Që Duhen Shmangur (ose Përdorur me Kujdes) Ngaqë Janë Me Spec 
ose "
-"Ngatërruese</a>.  Kemi gjithashtu edhe një listë <a href=\"/philosophy/fs-"
-"translations.html\">përkthimesh të përshtatshme të “free 
software”</a> në "
-"gjuhë të ndryshme."
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Përkufizimi i Software-it të Lirë"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Si i interpretojmë këto kritere"
 
-#. 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 ""
 "Së fundi, vini re që kritere si ato të pohuara në këtë përkufizim të "
 "software-it të lirë kërkojnë përsiatje të kujdesshme për interpretimin 
e "
@@ -784,11 +924,11 @@
 "problemi të ri, shpesh i përditësojmë këto kushte për ta bërë më të 
lehtë të "
 "shihet pse licenca të caktuara kualifikohen ose jo."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Merrni ndihmë rreth licencash të lira"
 
-#. 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 "
@@ -802,7 +942,7 @@
 "atje, mund të na pyesni rreth saj duke na dërguar një email te <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 "
@@ -817,7 +957,7 @@
 "ndihmonin të gjenit një licencë ekzistuese Software-i të Lirë që i 
plotëson "
 "nevojat tuaja."
 
-#. 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 "
@@ -827,11 +967,58 @@
 "ndihmon tonë mund të sigurohet që licenca të jetë vërtet licencë 
Software-i "
 "të Lirë dhe të shmangë probleme të ndryshme praktike."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Përdorni fjalët e duhura kur flisni mbi software-in e lirë"
+
+#. 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 ""
+"Kur flitet rreth software-it të lirë, është mirë të shmangen terma të 
tillë "
+"si “dhënë falas” ose “falas”, ngaqë këto terma nënkuptojnë se 
punë këtu "
+"është te çmimi, jo te liria.  Disa terma të rëndomtë, të tillë si 
“pirateri” "
+"trupëzojnë opinione që shpresojmë se nuk do t’i bëni tuajt.  Për një 
"
+"diskutim të këtyre termave, shihni <a 
href=\"/philosophy/words-to-avoid.html"
+"\">Fjalë Që Duhen Shmangur (ose Përdorur me Kujdes) Ngaqë Janë Me Spec 
ose "
+"Ngatërruese</a>.  Kemi gjithashtu edhe një listë <a href=\"/philosophy/fs-"
+"translations.html\">përkthimesh të përshtatshme të “free 
software”</a> në "
+"gjuhë të ndryshme."
+
+#. type: Content of: <div><div><p>
+#, 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 ""
+"Një grup tjetër përdor termin “burim i hapët” për të nënkuptuar 
diçka të "
+"afërt (por jo identike) me “software-in e lirë”.  Ne parapëlqejmë 
termin "
+"“software i lirë”, ngaqë pasi të dëgjoni si i referohet lirisë, dhe 
jo "
+"çmimit, ju sjell në mendje lirinë. Fjala “i hapët” <a 
href=\"/philosophy/"
+"open-source-misses-the-point.html\"> nuk i referohet kurrë lirisë</a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Tej Software-it"
 
-#. 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 "
@@ -841,11 +1028,17 @@
 "të lirë</a>, për të njëjtat arsye që software-i duhet të jetë i 
lirë, dhe "
 "ngaqë doracakët janë në fakt pjesë e software-it."
 
-#. 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 "
+#| "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 ""
 "Të njëjtët argumente vlejnë për lloje të tjera veprash të përdorimit 
praktik "
@@ -853,7 +1046,7 @@
 "vepra edukative apo vepra referimi.  <a href=\"http://wikipedia.org";
 "\">Wikipedia</a> është shembulli më i mirënjohur."
 
-#. 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/\";> "
@@ -864,29 +1057,10 @@
 "org/\"> veprash kulturore të lira</a> i zbatueshëm mbi çfarëdo lloji 
veprash."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Burim i Hapur?"
-
-#. 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 ""
-"Një grup tjetër përdor termin “burim i hapët” për të nënkuptuar 
diçka të "
-"afërt (por jo identike) me “software-in e lirë”.  Ne parapëlqejmë 
termin "
-"“software i lirë”, ngaqë pasi të dëgjoni si i referohet lirisë, dhe 
jo "
-"çmimit, ju sjell në mendje lirinë. Fjala “i hapët” <a 
href=\"/philosophy/"
-"open-source-misses-the-point.html\"> nuk i referohet kurrë lirisë</a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Historik"
 
-#. 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."
@@ -895,7 +1069,7 @@
 "e ndryshimeve thelbësore, tok me lidhje për të parë saktësisht se 
ç’kemi "
 "ndryshuar."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -909,7 +1083,7 @@
 "katër liritë nënkuptojnë lirinë për të mos e xhiruar programin dhe 
lirinë "
 "për ta fshirë, që të mos duhet për t’i pohuar si domosdoshmëri më 
vete."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -921,7 +1095,7 @@
 "arbitrare në kod nuk mohojnë lirinë 0, dhe se liritë 1 dhe 3 bëjnë të 
mundur "
 "që përdoruesit t’i heqin ato."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -932,7 +1106,7 @@
 "të xhiruar programin do të thotë se asgjë s’mund t’ju ndalojë për 
ta bërë të "
 "xhirojë."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -942,7 +1116,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Qartëson se cili kod 
"
 "lypset të jetë i lirë."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -952,7 +1126,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Të thuhet çdo herë 
"
 "që liria 0 është liria për të xhiruar programin si të doni."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -962,7 +1136,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Liria 0 s’ka lidhje 
"
 "me funksionin e programit."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -973,7 +1147,7 @@
 "s’duhet të kërkojë pajtueshmëri me një licencë jo të lirë të një 
programi "
 "tjetër."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -985,7 +1159,7 @@
 "se lejohet zgjedhja e ligjit dhe zgjedhja e specifikimeve të forumit.  (Ky "
 "ka qenë përherë rregulli ynë.)"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -997,7 +1171,7 @@
 "nga kontrolle eksportesh është vërtet problem nëse kërkesa s’është 
triviale; "
 "përndryshe është vetëm një problem potencial."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1009,7 +1183,7 @@
 "janë kufizimet mbi të drejtën tuaj për të modifikuar, jo mbi çfarë "
 "modifikimesh keni bërë.  Dhe modifikimet nuk kufizohen te 
“përmirësime”"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1024,7 +1198,7 @@
 "em> shtesë për përdorimin e veprës duke e hedhur veprën në qarkullim "
 "paralelisht në një mënyrë tjetër."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1037,7 +1211,7 @@
 "përfshin përdorimin përnjëmend të versionit tuaj të ndryshuar për 
punët "
 "tuaja në kompjuter."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1047,7 +1221,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Sqarim se kodi i "
 "errësuar s’kualifikohet si kod burim."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1060,7 +1234,7 @@
 "ose të përmirësuar, jo ndonjë të drejtë për të marrë pjesë në 
projektin e "
 "dikujt tjetër."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1071,7 +1245,7 @@
 "drejtë për të hedhur në qarkullim si software i lirë të versioneve të "
 "modifikuara."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1081,7 +1255,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Liria 1 duhet të jetë "
 "praktike, jo teorike; thënë ndryshe, jo tivo-izim."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1093,7 +1267,7 @@
 "ndryshimet me prapaveprim te licenca janë të papranueshme, edhe pse "
 "s’përshkruhet si një zëvendësim i plotë."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1104,7 +1278,7 @@
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Katër sqarime pikash jo 
"
 "aq eksplicite sa duhet, ose pohuar diku, por pa u pasqyruar kudo:"
 
-#. 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 "
@@ -1114,7 +1288,7 @@
 "versionesh të modifikuara mund të hidhni në qarkullim.  Liria 3 përfshin "
 "shpërndarjen e versioneve të modifikuar, jo thjesht të ndryshimeve."
 
-#. 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."
@@ -1122,16 +1296,16 @@
 "E drejta për të përzierë module ekzistues iu referohet atyre që janë 
të "
 "licencuar në mënyrë të përshtatshme."
 
-#. 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 "Poho shprehimisht përfundimin e pikës mbi kontrolle eksporti."
 
-#. 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 ""
 "Imponimi i një ndryshimi licence përbën shfuqizim të licencës së 
vjetër."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1141,7 +1315,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Shtim i ndarjes “Tej "
 "Software-it”."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1151,7 +1325,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Sqarim se cili synim "
 "është domethënës te liria për ta xhiruar programin për çfarëdo 
qëllimi."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1161,7 +1335,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Qartësim i shprehjes "
 "rreth licencash me bazë kontrata."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1173,7 +1347,7 @@
 "e lirë duhet t’ju lejojë përdorimin e tjetër software të lirë të 
gatshëm për "
 "të krijuar modifikimet tuaja."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1185,7 +1359,7 @@
 "pranueshme për një licencë të kërkojë të jepni burimin për versione 
të "
 "software-it që kaloni në përdorim publik."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1197,7 +1371,7 @@
 "pranueshme për një licencë të kërkojë të identifikoni veten si autor i 
"
 "ndryshimeve.  Të tjera qartësime të vockla nëpër tekst."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1207,7 +1381,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Trajton probleme të "
 "mundshme të lidhura me licenca të bazuara në kontrata."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1217,7 +1391,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Shpjegohet pse "
 "shpërndarja e dyorëve është e rëndësishme."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1229,7 +1403,7 @@
 "licencë e lirë mund të lypë që t’u dërgoni autorëve të mëparshëm 
një kopje "
 "të versioneve që shpërndani, nëse jua kërkojnë."
 
-#. 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,11 +1421,11 @@
 "\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;view=log\">ndërfaqes cvsweb</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Poshtëshënim"
 
-#. 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 "
@@ -1285,6 +1459,7 @@
 "të dërgohen te <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
@@ -1292,14 +1467,19 @@
 #.         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 "
+#| "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 ""
 "Përpiqemi fort dhe bëjmë sa mundemi për të ofruar përkthime me cilësi 
të "
@@ -1311,9 +1491,13 @@
 "standards/README.translations.html\">README për përkthimet</a>."
 
 #. type: Content of: <div><p>
+#, 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 ""
 "Të drejta kopjimi &copy; 1996, 2002, 2004-2007, 2009-2019, 2021 Free "
 "Software Foundation, Inc."
@@ -1337,3 +1521,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+#~ msgid "Open Source?"
+#~ msgstr "Burim i Hapur?"

Index: free-sw.sr-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sr-diff.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- free-sw.sr-diff.html        31 May 2021 09:06:21 -0000      1.14
+++ free-sw.sr-diff.html        16 Jul 2021 10:02:24 -0000      1.15
@@ -11,8 +11,11 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
-&lt;title&gt;What is free software?
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</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;
 <span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
 .note { margin-left: 6%; margin-right: 6%; }
@@ -22,14 +25,13 @@
 --&gt;&lt;/style&gt;</em></ins></span>
 &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;div class="article"&gt;
-&lt;h3&gt;The Free Software Definition&lt;/h3&gt;</em></ins></span>
+<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;
 
 &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?
@@ -38,11 +40,9 @@
 at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
 &lt;/blockquote&gt;
 
-<span class="removed"><del><strong>&lt;h3&gt;The Free Software 
Definition&lt;/h3&gt;
+&lt;h3&gt;The</strong></del></span> Free <span 
class="removed"><del><strong>Software Definition&lt;/h3&gt;
 
-&lt;blockquote&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
+&lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
 particular software program qualifies as free software.  From time to
@@ -51,18 +51,11 @@
 below for a list of changes that affect the definition of free
 software.
 &lt;/p&gt;
-<span class="removed"><del><strong>&lt;/blockquote&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&gt;</em></ins></span>
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>Software?&lt;/h2&gt;
+&lt;div class="thin"&gt;&lt;/div&gt;
 
+&lt;div class="article"&gt;
+&lt;div 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
@@ -77,6 +70,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
@@ -87,8 +88,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: <span class="inserted"><ins><em>&lt;a 
href="#f1"&gt;[1]&lt;/a&gt;</em></ins></span>
@@ -127,6 +198,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,
@@ -143,44 +217,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
@@ -200,6 +274,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
@@ -211,9 +287,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
@@ -249,13 +325,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
@@ -276,7 +355,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;
@@ -292,12 +371,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
@@ -317,7 +398,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,
@@ -352,10 +435,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
@@ -376,7 +461,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
@@ -400,7 +487,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
@@ -421,7 +510,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
@@ -434,10 +523,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
@@ -450,7 +544,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
@@ -474,7 +570,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;,
@@ -486,7 +603,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;
 
@@ -496,7 +613,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
@@ -505,8 +622,9 @@
 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;
-<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;hr class="column-limit" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;h3 id="History"&gt;History&lt;/h3&gt;
 
@@ -647,19 +765,21 @@
 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;
 
-<span class="inserted"><ins><em>&lt;h3 
style="font-size:1em"&gt;Footnote&lt;/h3&gt;
+&lt;h3 class="footnote"&gt;Footnote&lt;/h3&gt;
 &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
 the freedom to run the program needed to be mentioned explicitly.
 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;</em></ins></span>
+&lt;/ol&gt;
+&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
@@ -677,13 +797,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;
 
@@ -704,7 +824,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-2017</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-2017</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"
@@ -715,7 +835,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/31 09:06:21 $
+$Date: 2021/07/16 10:02:24 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: free-sw.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sr.po,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- free-sw.sr.po       31 May 2021 09:06:21 -0000      1.80
+++ free-sw.sr.po       16 Jul 2021 10:02:24 -0000      1.81
@@ -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: 2017-10-06 14:34+0200\n"
 "Last-Translator: Борисав Живановић 
<borisavzivanovic@gmail.com>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -20,7 +20,9 @@
 "X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <title>
-msgid "What is 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 ""
 "Шта је слободни софтвер? — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
@@ -42,57 +44,12 @@
 "корисницима рачунара пружили слободу 
дељења и побољшавања софтвера који "
 "користе."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+#, 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>."
-
-# | [-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><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;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,
@@ -102,7 +59,7 @@
 # | {+beer&rdquo;.  We sometimes call it &ldquo;libre software,&rdquo;
 # | borrowing the French or Spanish word for &ldquo;free&rdquo; as in freedom,
 # | to show we do not mean the software is gratis.+}
-#. 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, "
@@ -120,7 +77,25 @@
 "енглеског ми понекад позајмљујемо 
француску или шпанску реч како би људи "
 "схватили да не говоримо о новцу."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
+#, 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,7 +113,159 @@
 
"\"/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 ""
+
+#. type: Content of: <div><div><div><h3>
+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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>
+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>
+#, 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>
+#, 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>
+#, 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>
+#, 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 "Дефиниција слободног софтвера"
+
+# | [-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><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 "Четири основне слободе"
 
@@ -147,7 +274,7 @@
 # | it refers to four kinds of freedom, for-] {+free software if+} the
 # | {+program's+} users [-of-] {+have+} the [-software:-] {+four essential
 # | freedoms:+}
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "A program is free software if the program's users have the four essential "
@@ -158,7 +285,7 @@
 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 ""
@@ -168,7 +295,7 @@
 # | 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.
-#. 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 "
@@ -178,7 +305,7 @@
 "потребама (слобода број 1). Предуслов за 
ово јесте обезбеђивање приступа "
 "изворном коду."
 
-#. 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 "
@@ -193,7 +320,7 @@
 # | that-] {+others (freedom 3).  By doing this you can give+} the whole
 # | community [-benefits (freedom 3).-] {+a chance to benefit from your
 # | changes.+}  Access to the source code is a precondition for this.
-#. 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 "
@@ -204,7 +331,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 "
@@ -216,7 +343,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 "
@@ -233,7 +360,11 @@
 "морамо судити на основу тога да ли су А и Б 
слободни. Уколико планирамо да "
 "изменимо А тако да не користи Б само А мора 
бити слободан; Б није релевантан."
 
-#. 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 +373,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 +386,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 +394,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,40 +405,22 @@
 "program nonfree."
 msgstr ""
 
-#. type: Content of: <div><p>
-#, 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 "
@@ -326,7 +439,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 "
@@ -339,7 +452,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, "
@@ -350,14 +463,14 @@
 "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 "Слобода да изучавате изворни код и да 
на њему вршите промене"
 
@@ -367,7 +480,7 @@
 # | code of the program.  Therefore, accessibility of source code is a
 # | necessary condition for free software.  {+Obfuscated &ldquo;source
 # | code&rdquo; is not real source code and does not count as source code.+}
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
 #| "In order for freedoms 1 and 3 (the freedom to make changes and the "
@@ -388,7 +501,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 "
@@ -413,7 +526,7 @@
 # | {+module &mdash; for instance,+} if it requires you to be the copyright
 # | holder of any code you [-add,-] {+add &mdash;+} then the license is too
 # | restrictive to qualify as free.
-#. 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 "
@@ -427,7 +540,7 @@
 "захтева да будете власник ауторских права 
кода који додајете &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 "
@@ -437,14 +550,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>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "Слобода да расподељујете програм ако 
желите: основни захтеви"
 
@@ -455,7 +568,7 @@
 # | href=\"#exportcontrol\">anyone anywhere</a>.  Being free to do these
 # | things means (among other things) that you do not have to ask or pay for
 # | [-permission.-] {+permission to do so.+}
-#. 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 "
@@ -469,7 +582,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 "
@@ -481,11 +594,18 @@
 "Уколико ипак објавите ваше измене, од вас 
се не захтева да икога посебно или "
 "на било какав одређен начин о томе 
обавестите."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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 ""
@@ -495,7 +615,7 @@
 "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 "
@@ -514,7 +634,7 @@
 "слобода расподеле таквих облика уколико 
измислите или изградите начин да се "
 "они направе."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Copyleft"
 msgstr "Копилефт"
 
@@ -525,11 +645,19 @@
 # | 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.
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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."
@@ -555,7 +683,7 @@
 # | Free Software</a> for a description of how &ldquo;free software,&rdquo;
 # | &ldquo;copylefted software&rdquo; and other categories of software relate
 # | to each other.
-#. 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/"
@@ -574,7 +702,7 @@
 "categories.html\">Врсте слободног софтвера</a> за 
опис о томе како „слободни "
 "софтвер“, „копилефтовани софтвер“ и 
остале врсте имају везе једне са другима."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Правила за праковање и детаљи 
расподељивања"
 
@@ -594,7 +722,7 @@
 # | [-modifications.-] {+changes, they are acceptable; you're already making
 # | other changes to the program, so you won't have trouble making a few
 # | more.+}
-#. 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 "
@@ -613,7 +741,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 "
@@ -632,7 +760,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 "
@@ -647,7 +775,7 @@
 "затева је прихватљива само ако постоји 
систем пречица којим би се могао "
 "заменити назив оригиналног програма."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "Прописи за извоз"
 
@@ -660,17 +788,28 @@
 # | 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><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>
+#, 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> владе одређене "
 "земље и трговинске санкције могу да 
ограниче вашу слободу међународне "
@@ -681,7 +820,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 "
@@ -697,7 +836,7 @@
 "о извозу могла захтев претворити у нешто 
нетривијално и тиме учинила софтвер "
 "неслободним."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Законске обавезе"
 
@@ -706,7 +845,7 @@
 # | software has the power to revoke the license, {+or retroactively add
 # | restrictions to its terms,+} without your doing anything {+wrong+} to give
 # | cause, the software is not free.
-#. 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 "
@@ -719,7 +858,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 "
@@ -733,7 +872,7 @@
 "неслободне програме морао да се сложи са 
неслободним лиценцама, што лиценцу "
 "чини неслободном."
 
-#. 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."
@@ -741,11 +880,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-"
@@ -766,7 +905,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 "
@@ -779,48 +918,42 @@
 "права), а који није овде наведен као 
легитиман, мораћемо да о томе "
 "размислимо, и вероватно ћемо одлучити да 
дотична лиценца није слободна."
 
-#. 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 ""
-"Када говорите о слободном софтверу, 
најбоље је да избегавате изразе као што "
-"су „на поклон“ (енгл. <em>give away</em>) или 
„бесплатно“ (енгл. <em>for "
-"free</em>), јер такви изрази упућују на то да се 
не ради о слободи, већ "
-"цени. И неки други чести изрази, као што је 
„пиратерија“, оличавају ставове "
-"које се, надамо се, ви нећете подржати. 
Погледајте <a href=\"/philosophy/"
-"words-to-avoid.html\">Збуњујуће речи и синтагме 
које вреди избегавати</a>, "
-"где се говори о таквим изразима. Такође, 
постоји и списак <a href=\"/"
-"philosophy/fs-translations.html\">превода израза 
„слободни софтвер“</a> на "
-"разне језике."
+#. type: Content of: <div><div><h3>
+#, 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>
+#, 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 ""
 "На крају, обратите пажњу на то да 
критеријуми као што су они који су "
 "поменути у овој дефиницији слободног 
софтвера захтевају пажљиво размишљање "
@@ -835,11 +968,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 "
@@ -858,7 +991,7 @@
 # | proliferation of different free software licenses means increased work for
 # | users in understanding the licenses; we may be able to help you find an
 # | existing free software license that meets your needs.
-#. 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 "
@@ -873,7 +1006,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 "
@@ -883,11 +1016,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>
+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 ""
+"Када говорите о слободном софтверу, 
најбоље је да избегавате изразе као што "
+"су „на поклон“ (енгл. <em>give away</em>) или 
„бесплатно“ (енгл. <em>for "
+"free</em>), јер такви изрази упућују на то да се 
не ради о слободи, већ "
+"цени. И неки други чести изрази, као што је 
„пиратерија“, оличавају ставове "
+"које се, надамо се, ви нећете подржати. 
Погледајте <a href=\"/philosophy/"
+"words-to-avoid.html\">Збуњујуће речи и синтагме 
које вреди избегавати</a>, "
+"где се говори о таквим изразима. Такође, 
постоји и списак <a href=\"/"
+"philosophy/fs-translations.html\">превода израза 
„слободни софтвер“</a> на "
+"разне језике."
+
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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 ""
+"Друга група је почела да употребљава 
израз „отворени изворни код“ да означи "
+"нешто блиско (али не и истоветно) 
„слободном софтверу“. Ми се одлучујемо за "
+"израз „слободни софтвер“, јер када 
једном сазнате да се он односи на "
+"слободу, а не на цену, увек ћете се сетити 
слободе. Реч „отворено“ <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 "
@@ -897,18 +1085,24 @@
 "слободна</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 "
+#| "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 ""
 "Исти аргументи имају смисла и за друге 
врсте дела која се практично користе "
 "и која укључују корисно знање, као што су 
образовна дела и енциклопедије. <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/\";> "
@@ -919,37 +1113,10 @@
 "\">слободног културног дела</a>, која је 
примењива на било коју врсту дела."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Отворени изворни код?"
-
-# | 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>.
-#. 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 ""
-"Друга група је почела да употребљава 
израз „отворени изворни код“ да означи "
-"нешто блиско (али не и истоветно) 
„слободном софтверу“. Ми се одлучујемо за "
-"израз „слободни софтвер“, јер када 
једном сазнате да се он односи на "
-"слободу, а не на цену, увек ћете се сетити 
слободе. Реч „отворено“ <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."
@@ -957,7 +1124,7 @@
 "Са времена на време ми ажурирамо ову 
Дефиницију слободног софтвера. Ово је "
 "списак измена уз линкове који показују 
како је она тачно мењана."
 
-#. 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.";
@@ -975,7 +1142,7 @@
 "слобода да покренете програм значи да вас 
ништа не спречава у његовом "
 "покретању."
 
-#. 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.";
@@ -992,7 +1159,7 @@
 "да је слобода број 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.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -1003,7 +1170,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.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
@@ -1013,7 +1180,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 "
@@ -1024,7 +1191,7 @@
 "да је слобода број 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 "
@@ -1034,7 +1201,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 "
@@ -1045,7 +1212,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.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
@@ -1057,7 +1224,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.121&amp;r2=1.122\">Version 1.122</a>: An export control "
@@ -1069,7 +1236,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 "
@@ -1081,7 +1248,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.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -1096,7 +1263,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 "
@@ -1108,7 +1275,7 @@
 "главној тврдњи слободе број 1, аргумент 
(већ наведен у верзији 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 "
@@ -1118,7 +1285,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 "
@@ -1130,7 +1297,7 @@
 "слобода број 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.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -1140,7 +1307,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 "
@@ -1151,7 +1318,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.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -1162,7 +1329,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 "
@@ -1174,7 +1341,7 @@
 "аргумента који нису довољно експлицитни, 
или који су на неким местима "
 "поменути али нигде нису дискутована:"
 
-#. 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 "
@@ -1184,7 +1351,7 @@
 "објавити. Слобода број 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."
@@ -1192,15 +1359,15 @@
 "Право да спојите постојеће модуле се 
односи на оне који су прикладно "
 "лиценцирани."
 
-#. 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 "
@@ -1210,7 +1377,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Верзија 1.57</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.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
@@ -1220,7 +1387,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 "
@@ -1230,7 +1397,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 "
@@ -1242,7 +1409,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.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1254,7 +1421,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 "
@@ -1266,7 +1433,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.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1276,7 +1443,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 "
@@ -1286,7 +1453,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 "
@@ -1298,7 +1465,7 @@
 "слободна лиценца може да захтева да 
пошаљете измењене верзије претходним "
 "градитељима на њихов захтев."
 
-#. 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 "
@@ -1316,13 +1483,13 @@
 "\">cvsweb интерфејсу</a>."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 #, 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 "
@@ -1350,6 +1517,7 @@
 "везе и друге исправке (или предлоге) на 
адресу <a href=\"mailto:mailto:";
 "webmasters@gnu.org\">&lt;mailto: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
@@ -1357,21 +1525,24 @@
 #.         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=\"/server/standards/README.translations.html"
 "\">ПРОЧИТАЈМЕ за преводе</a> за више 
информација о координисању и слању "
-"превода овог чланка. (За допринос српском 
преводу, корисно је да погледате и "
-"<a href=\"http://alas.matf.bg.ac.rs/~mr99164/uput/kakoda-prevodim-gnu-ov-veb.";
-"html\"> КАКОДА прeводим ГНУ-ов веб</a>.)"
+"превода овог чланка."
 
 # | Copyright &copy; 1996, 2002, [-2004-2007-] {+2004-2007, 2009-2017+} Free
 # | Software Foundation, Inc.
@@ -1381,8 +1552,8 @@
 #| "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-2017 Free Software Foundation, "
 "Inc."
@@ -1414,6 +1585,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=\"/server/standards/README.translations.html"
+#~ "\">ПРОЧИТАЈМЕ за преводе</a> за више 
информација о координисању и слању "
+#~ "превода овог чланка. (За допринос 
српском преводу, корисно је да "
+#~ "погледате и <a 
href=\"http://alas.matf.bg.ac.rs/~mr99164/uput/kakoda-";
+#~ "prevodim-gnu-ov-veb.html\"> КАКОДА прeводим ГНУ-ов 
веб</a>.)"
+
 #~ msgid ""
 #~ "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
 #~ "free program must be available for commercial use, commercial "

Index: free-sw.sv.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sv.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- free-sw.sv.po       3 Feb 2021 13:03:04 -0000       1.20
+++ free-sw.sv.po       16 Jul 2021 10:02:24 -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,12 +18,12 @@
 "Outdated-Since: 2004-02-17 12:12+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 ""
 "Definitionen av fri programvara - GNU Projektet - Free Software Foundation"
 
@@ -40,56 +40,14 @@
 "use."
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "What is free software?"
-msgstr ""
-
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Definitionen av fri programvara"
-
-#. 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 ""
-"Vi underhåller denna definition av fri programvara för att tydligt visa vad 
"
-"som gäller för att ett visst mjukvaruprogram skall betraktas som fri "
-"programvara."
-
-#. 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 "Definitionen av fri programvara"
 
-#. 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,
@@ -117,7 +75,30 @@
 "“Fri programvara” handlar om frihet, inte pris. För att förstå 
begreppet, "
 "tänk “fri” som i “yttrandefrihet”, inte som i 
“kostnadsfri/gratis”."
 
-#. 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 ""
+"Således kan du ha betalt pengar för att få kopior av fri programvara eller 
"
+"du kan ha fått tag i dem utan kostnad. Men oberoende av hur du fick dina "
+"kopior har du alltid friheten att kopiera och ändra programvaran, även att "
+"<a href=\"/philosophy/selling.html\">sälja kopior</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 "
@@ -128,11 +109,161 @@
 "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 "Definitionen av fri programvara"
+
+#. 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 as
+# | you [-wish, for any purpose (freedom 0).-] {+wish</a>+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr ""
+"Friheten att köra programmet som du önskar, för ett godtyckligt syfte "
+"(frihet 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 ""
+"Friheten att vidaredistribuera kopior så att användaren kan hjälpa sin 
nästa "
+"(frihet 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 av fri programvara"
+
+#. 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 underhåller denna definition av fri programvara för att tydligt visa vad 
"
+"som gäller för att ett visst mjukvaruprogram skall betraktas som fri "
+"programvara."
+
+#. 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
@@ -151,14 +282,14 @@
 "distribuera, studera, ändra och förbättra programvaran. Mer precist så "
 "handlar det om fyra sorters frihet för användaren av programvaran: "
 
-#. 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 ""
 "Friheten att köra programmet som du önskar, för ett godtyckligt syfte "
 "(frihet 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.
@@ -174,7 +305,7 @@
 "Friheten att studera hur programmet fungerar och att anpassa det för sina "
 "behov (frihet 1). Tillgång till källkoden är ett villkor för detta."
 
-#. 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
@@ -186,7 +317,7 @@
 "Friheten att vidaredistribuera kopior så att användaren kan hjälpa sin 
nästa "
 "(frihet 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
@@ -207,7 +338,7 @@
 "allmänheten så att hela samhället drar nytta (frihet 3). Tillgång till "
 "källkoden är ett villkor för detta."
 
-#. 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 "
@@ -215,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 "
@@ -226,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, "
@@ -235,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 "
@@ -248,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 "
@@ -256,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 "
@@ -267,41 +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>."
+#. type: Content of: <div><div><h3>
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr ""
-"Således kan du ha betalt pengar för att få kopior av fri programvara eller 
"
-"du kan ha fått tag i dem utan kostnad. Men oberoende av hur du fick dina "
-"kopior har du alltid friheten att kopiera och ändra programvaran, även att "
-"<a href=\"/philosophy/selling.html\">sälja kopior</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>
 # | The freedom to run the program as you [-wish, for any purpose (freedom
 # | 0).-] {+wish+}
 #, fuzzy
@@ -312,7 +424,7 @@
 "Friheten att köra programmet som du önskar, för ett godtyckligt syfte "
 "(frihet 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
@@ -343,7 +455,7 @@
 "vilket jobb som helst, och utan att behöva kommunicera med utvecklaren eller 
"
 "någon annan enhet."
 
-#. 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 +464,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, "
@@ -363,18 +475,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
@@ -400,7 +512,7 @@
 "programmet. Därför är tillgängligheten av källkoden ett nödvändigt 
villkor "
 "för fri programvara."
 
-#. 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 "
@@ -412,7 +524,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 "
@@ -421,21 +533,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
@@ -447,7 +559,7 @@
 "Friheten att vidaredistribuera kopior så att användaren kan hjälpa sin 
nästa "
 "(frihet 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
@@ -477,7 +589,7 @@
 "som helst</a>. Att vara fri att göra dessa saker betyder (bland annat) att "
 "du inte behöver fråga efter eller betala för att få tillstånd."
 
-#. 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,16 +601,16 @@
 "ändringar existerar. Om du publicerar dina ändringar, skall du inte vara "
 "skyldig att meddela någon speciell eller på något speciellt sätt."
 
-#. 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
@@ -535,18 +647,19 @@
 "du måste ha friheten att distribuera i dessa format om du kommer på eller "
 "utvecklar ett sätt att skapa sådana binärer."
 
-#. 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 "
@@ -559,7 +672,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."
@@ -572,7 +685,7 @@
 "Denna regel står inte i konflikt med de centrala friheterna utan den snarare 
"
 "skyddar dem."
 
-#. 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\">
@@ -617,11 +730,11 @@
 "“fri programvara”, “copyleftprogramvara” och andra kategorier av 
programvara "
 "relaterar till varandra."
 
-#. 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
@@ -667,7 +780,7 @@
 "skall skicka en kopia om du har distribuerat en förändrar version och en "
 "tidigare utvecklare ber dig om en kopia."
 
-#. 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 "
@@ -679,7 +792,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 "
@@ -689,20 +802,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</"
@@ -713,15 +827,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 ""
 "Ibland har regeringar <a id=\"exportcontrol\">regler för exportkontroll</a> "
 "och handelshinder som kan begränsa din frihet att distribuera kopior av "
@@ -731,7 +845,7 @@
 "kommer inte begränsningarna att påverka aktiviteter och människor utanför 
"
 "dessa regeringars jurisdiktion."
 
-#. 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 +855,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 +883,7 @@
 "möjligheten att häva licensen, utan att du gör något som orsakar det, så 
är "
 "inte programvaran fri."
 
-#. 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 +892,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 +914,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 +922,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 [-\"free
-# | software\"</a>-] {+&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 "
-#| "\"free software\"</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 vi talar om fri programvara är det bäst att undvika termer som “ge 
bort” "
-"eller “gratis” eftersom dessa termer antyder att det handlar om pris, 
inte "
-"frihet. Några vanliga termer som “piratkopiering” innehåller 
uppfattningar "
-"som vi hoppas du inte skriver under på. Se  <a href=\"/philosophy/words-to-"
-"avoid.html\">Förvillande ord och fraser som är värda att undvika</a> för 
en "
-"diskussion om dessa termer. Vi har också en lista över  <a href=\"/"
-"philosophy/fs-translations.html\">översättningar av “fri 
programvara”</a> "
-"för olika språk."
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Definitionen av fri programvara"
 
-#. 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 ""
 "Slutligen, notera att de kriterier som angivits i denna definition av fri "
 "programvara kräver noggrann eftertanke när de skall tolkas. För att 
avgöra "
@@ -882,11 +983,11 @@
 "uppdaterar vi ofta dessa kriterier så att det skall bli enklare att se "
 "varför vissa licenser är kvalificerad och andra inte är det."
 
-#. 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 "
@@ -900,7 +1001,7 @@
 "listad där kan du fråga oss om den genom att skicka oss ett brev till <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 "
@@ -909,56 +1010,66 @@
 "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 [-\"free
+# | software\"</a>-] {+&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 "
+#| "\"free software\"</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 vi talar om fri programvara är det bäst att undvika termer som “ge 
bort” "
+"eller “gratis” eftersom dessa termer antyder att det handlar om pris, 
inte "
+"frihet. Några vanliga termer som “piratkopiering” innehåller 
uppfattningar "
+"som vi hoppas du inte skriver under på. Se  <a href=\"/philosophy/words-to-"
+"avoid.html\">Förvillande ord och fraser som är värda att undvika</a> för 
en "
+"diskussion om dessa termer. Vi har också en lista över  <a href=\"/"
+"philosophy/fs-translations.html\">översättningar av “fri 
programvara”</a> "
+"för olika språk."
 
-#. type: Content of: <div><h3>
-# | Open [-s-]{+S+}ource?
-#, fuzzy
-#| msgid "Open source?"
-msgid "Open Source?"
-msgstr "Open Source?"
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # | Another group [-has started using-] {+uses+} the term [-\"open source\"-]
 # | {+&ldquo;open source&rdquo;+} to mean something close (but not identical)
 # | to [-\"free software\".-] {+&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=\"/philosophy/open-source-misses-the-point.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>.
+# | to mind [-freedom</a>.-] {+freedom.  The word &ldquo;open&rdquo; never
+# | refers to freedom.+}
 #, fuzzy
 #| msgid ""
 #| "Another group has started using the term \"open source\" to mean "
@@ -971,8 +1082,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 annan grupp har börjat använda termen “open source” i meningen 
något nära "
 "(men inte identiskt med) “fri programvara”. Vi föredrar termen “fri "
@@ -980,17 +1090,43 @@
 "än pris, <a href=\"/philosophy/open-source-misses-the-point.html\">så 
väcker "
 "den tanken om frihet</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 "
@@ -999,7 +1135,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 "
@@ -1007,42 +1143,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 "
@@ -1050,7 +1186,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 "
@@ -1058,7 +1194,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 "
@@ -1066,7 +1202,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 "
@@ -1075,7 +1211,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 "
@@ -1083,14 +1219,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 "
@@ -1098,21 +1234,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 "
@@ -1120,7 +1256,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 "
@@ -1128,49 +1264,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 "
@@ -1178,7 +1314,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 "
@@ -1186,7 +1322,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 "
@@ -1194,21 +1330,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 "
@@ -1216,7 +1352,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 "
@@ -1227,11 +1363,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 "
@@ -1266,15 +1402,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 ""
 "Var god läs <a href=\"/server/standards/README.translations.html\">README "
@@ -1283,14 +1427,14 @@
 
 #. type: Content of: <div><p>
 # | Copyright &copy; [-1996-2002,-] {+1996, 2002,+} 2004-2007, [-2009, 2010,
-# | 2012, 2013, 2015-] {+2009-2019, 2021+} Free Software Foundation, Inc.
+# | 2012, 2013, 2015-] {+2009-2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013, 2015 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 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -1323,6 +1467,21 @@
 msgid "Updated:"
 msgstr "Updaterat:"
 
+#, fuzzy
+#~| msgid "Open source?"
+#~ msgid "Open Source?"
+#~ msgstr "Open Source?"
+
+#, 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."
+#~ msgstr ""
+#~ "Var god läs <a href=\"/server/standards/README.translations.html\">README 
"
+#~ "för Översättningar</a> för information om att samarbeta och skicka in "
+#~ "översättningar till den här artikeln."
+
 #~ msgid ""
 #~ "&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
 #~ "free program must be available for commercial use, commercial "

Index: free-sw.ta.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ta.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- free-sw.ta.po       3 Feb 2021 13:03:04 -0000       1.14
+++ free-sw.ta.po       16 Jul 2021 10:02:24 -0000      1.15
@@ -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 AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -19,12 +19,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 "கட்டற்ற மென்பொருள் 
விளக்கம் - குனு திட்டம் - 
கட்டற்ற மென்பொருள் அ
றக்கட்டளை"
 
 #. type: Attribute 'content' of: <meta>
@@ -40,56 +40,14 @@
 "use."
 msgstr ""
 
-#. 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>
+# | [-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 ""
-"ஒரு மென்பொருளின் நிரலானது 
கட்டற்ற மென்பொருளாக கருதப் 
படத் தேவையான அம்சங்கள் 
குறித்த "
-"உண்மையினைத் தெளிவாக 
உணர்த்தும் பொருட்டு நாங்கள் 
கட்டற்ற மென்பொருளுக்கான 
இவ்விளக்கத்தின் மீது "
-"உரிமைக் கொள்கிறோம்."
-
-#. 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>
 # | &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,
@@ -117,7 +75,42 @@
 "“கட்டற்ற மென்பொருள்” என்பது 
விலையினை அடிப்படையாகக் 
கொள்ளாமல் சுதந்தரத்தினை அ
டிப்படையாகக் "
 "கொண்டது. இதனை“இலவசமாகக்” 
கருதாமல் “சுதந்தரமாக” 
தாங்கள் கருத வேண்டும்."
 
-#. 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 ""
+"“கட்டற்ற மென்பொருள்” 
என்பதால் 
“வர்த்தகத்துக்கானது அல்ல” 
என்பது பொருளல்ல. ஒரு கட்டற்ற "
+"மென்பொருள் என்பது 
வர்த்தகத்துக்கு ஏதுவாய், 
வர்த்தக ரீதியில் உருவாக்கப் 
பட வல்லதாய், "
+"வர்த்தரீதியில் 
விநியோகிக்கப் படத் 
தக்கதாகவும் இருத்தல் அ
வசியம். தற்காலத்தில் வர்த்தக 
ரீதியான "
+"கட்டற்ற மென்பொருள் 
உருவாக்கம் என்பதொன்றும் 
விதிவிலக்கானதல்ல. இத்தகைய 
வர்த்தக ரீதியான "
+"மென்பொருட்கள் மிகவும் 
முக்கியமானதும் கூட.தாங்கள் 
கட்டற்ற மென்பொருட்களை 
விலைக்கோ அல்லது "
+"இலவசமாகவோ பெற்றிருக்கலாம். 
எம்முறையில் அதனைத் தாங்கள் 
பெற்றீர்கள் என்பதைச் சாராது 
அதனைப் "
+"படியெடுக்கவும், மாற்றவும் 
மட்டுமல்லாது <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 "
@@ -128,11 +121,152 @@
 "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=\"/doc/doc.html\">Documentation</a>-]
+# | {+href=\"#exportcontrol\">Export regulations</a>+}
+#, fuzzy
+#| msgid "<a href=\"/doc/doc.html\">Documentation</a>"
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr "<a href=\"/doc/doc.html\">ஆவணமாக்கம்</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
@@ -152,7 +286,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
@@ -161,7 +295,7 @@
 "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>
 # | 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.
@@ -178,7 +312,7 @@
 "(இரண்டாவது சுதந்தரம்). 
முதற்கண் நிரலின் மூலத்தினை அ
ணுகக் கூடிய உரிமம் இதற்கு 
கொடுக்கப் "
 "பட்டிருத்தல் வேண்டும்."
 
-#. 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
@@ -189,7 +323,7 @@
 msgstr ""
 "பிறரும் பயனுற வேண்டி படி 
யெடுத்து விநியோகிப்பதற்கான 
சுதந்தரம். (மூன்றாவது 
சுதந்தரம்) "
 
-#. 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
@@ -210,7 +344,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 "
@@ -218,7 +352,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 "
@@ -229,7 +363,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>
 # | [-<q>Free software</q>-]{+&ldquo;Free software&rdquo;+} does not mean
 # | [-<q>non-commercial.</q> A-] {+&ldquo;noncommercial&rdquo;.  On the
 # | contrary, a+} free program must be available for commercial use,
@@ -257,7 +395,7 @@
 "கட்டற்ற மென்பொருள் 
உருவாக்கம் என்பதொன்றும் 
விதிவிலக்கானதல்ல. இத்தகைய 
வர்த்தக ரீதியான "
 "மென்பொருட்கள் மிகவும் 
முக்கியமானதும் கூட."
 
-#. 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 "
@@ -270,7 +408,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 "
@@ -278,7 +416,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 "
@@ -289,57 +427,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 ""
-"“கட்டற்ற மென்பொருள்” 
என்பதால் 
“வர்த்தகத்துக்கானது அல்ல” 
என்பது பொருளல்ல. ஒரு கட்டற்ற "
-"மென்பொருள் என்பது 
வர்த்தகத்துக்கு ஏதுவாய், 
வர்த்தக ரீதியில் உருவாக்கப் 
பட வல்லதாய், "
-"வர்த்தரீதியில் 
விநியோகிக்கப் படத் 
தக்கதாகவும் இருத்தல் அ
வசியம். தற்காலத்தில் வர்த்தக 
ரீதியான "
-"கட்டற்ற மென்பொருள் 
உருவாக்கம் என்பதொன்றும் 
விதிவிலக்கானதல்ல. இத்தகைய 
வர்த்தக ரீதியான "
-"மென்பொருட்கள் மிகவும் 
முக்கியமானதும் கூட.தாங்கள் 
கட்டற்ற மென்பொருட்களை 
விலைக்கோ அல்லது "
-"இலவசமாகவோ பெற்றிருக்கலாம். 
எம்முறையில் அதனைத் தாங்கள் 
பெற்றீர்கள் என்பதைச் சாராது 
அதனைப் "
-"படியெடுக்கவும், மாற்றவும் 
மட்டுமல்லாது <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>
 # | 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
@@ -378,7 +481,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 "
@@ -387,7 +490,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, "
@@ -398,18 +501,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
@@ -434,7 +537,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 "
@@ -446,7 +549,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-]
@@ -472,25 +575,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
@@ -520,7 +623,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 "
@@ -533,16 +636,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 "
@@ -561,18 +664,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 "
@@ -585,7 +689,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."
@@ -597,7 +701,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
@@ -642,11 +746,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>
 # | 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. 
@@ -696,7 +800,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 "
@@ -708,7 +812,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 "
@@ -718,20 +822,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</"
@@ -742,15 +847,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> மற்றும் "
 "வர்த்தக உரிமங்கள் முதலியன 
தாங்கள் மென்பொருட்களை உலக அ
ளவில் விநியோகிக்கும் 
சுதந்தரத்தினைக் "
@@ -759,7 +864,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 "
@@ -769,11 +874,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
@@ -797,7 +902,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 "
@@ -806,17 +911,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>
 # | 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-based license respects freedom in the ways described above, it
@@ -854,7 +959,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 "
@@ -865,65 +970,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 [-<q>piracy</q>-] {+&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 <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 &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 ""
-"கட்டற்ற மென்பொருட்களைப் 
பற்றி பேசுகிற போது “இலவசம்” 
போன்ற பதங்களைப் பிரயோகப் 
படுத்துவதைத் "
-"தவிர்க்க வேண்டும். ஏனெனில் அ
வை இவ்விஷயமனைத்தும் 
சுதந்தரத்தினை விடுத்து பைசா 
சம்பந்தப் "
-"பட்டது என்று கருத வைக்கிறது. 
“தனித்துவத்தினை” 
பிரதிபலிக்கும் கருத்துக்களை 
தாங்கள் "
-"ஏற்றொழுக மாட்டீர்கள் என 
நம்புகிறோம். <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>
+# | [-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 ""
 "கட்டற்ற மென்பொருளுக்கான 
விளக்கத்தில் கொடுக்கப் 
பட்டுள்ள நியதிகள் 
கவனத்துடன் பொருள் கொள்ளப் "
 "படவேண்டியவை. ஒரு 
மென்பொருளுக்கான உரிமம் 
கட்டற்ற மென்பொருளுக்கான 
உரிமத்தினை ஒத்து உள்ளதா "
@@ -935,11 +1029,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 "
@@ -952,7 +1046,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
@@ -978,7 +1072,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 "
@@ -988,11 +1082,82 @@
 "உதவியுடன், பல்வேறு 
நடைமுறைச் சிக்கல்களைத் 
தவிர்த்து தங்களின் உரிமம் 
கட்டற்ற மென்பொருள் "
 "உரிமமாகத் திகழ்வதை 
உறுதிபடுத்திக் கொள்ளலாம்."
 
-#. 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 [-<q>piracy</q>-] {+&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 <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 &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 ""
+"கட்டற்ற மென்பொருட்களைப் 
பற்றி பேசுகிற போது “இலவசம்” 
போன்ற பதங்களைப் பிரயோகப் 
படுத்துவதைத் "
+"தவிர்க்க வேண்டும். ஏனெனில் அ
வை இவ்விஷயமனைத்தும் 
சுதந்தரத்தினை விடுத்து பைசா 
சம்பந்தப் "
+"பட்டது என்று கருத வைக்கிறது. 
“தனித்துவத்தினை” 
பிரதிபலிக்கும் கருத்துக்களை 
தாங்கள் "
+"ஏற்றொழுக மாட்டீர்கள் என 
நம்புகிறோம். <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;-] {+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 "
@@ -1002,18 +1167,28 @@
 "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 ""
 "நடைமுறைக்கு ஏற்ற கல்வி 
முதலிய வேலைப் பாடுகளைப் 
பிரதிபலிக்கின்ற ஏனைய 
செயல்களுக்கும் "
 "இவ்வாதங்கள் பொருந்தும். <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/\";> "
@@ -1024,50 +1199,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;-] {+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 "
@@ -1076,7 +1217,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 "
@@ -1084,42 +1225,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 "
@@ -1127,7 +1268,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 "
@@ -1135,7 +1276,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 "
@@ -1143,7 +1284,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 "
@@ -1152,7 +1293,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 "
@@ -1160,14 +1301,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 "
@@ -1175,21 +1316,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 "
@@ -1197,7 +1338,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 "
@@ -1205,49 +1346,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 "
@@ -1255,7 +1396,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 "
@@ -1263,7 +1404,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 "
@@ -1271,21 +1412,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 "
@@ -1293,7 +1434,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 "
@@ -1304,14 +1445,14 @@
 "view=log\">cvsweb interface</a>."
 msgstr ""
 
-#. 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 "
@@ -1346,15 +1487,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 ""
 "இந்த கட்டுரையின் 
மொழிபெயர்ப்பை 
ஒருங்கிணைப்பது, 
சமர்ப்பிப்பது தொடர்பான 
விவரங்களுக்கு <a "
@@ -1364,8 +1510,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. 
(கட்டற்ற "
 "மென்பொருள் அறக்கட்டளை, 
நிறுவப்பட்டது.)"
@@ -1390,6 +1536,19 @@
 msgid "Updated:"
 msgstr "புதுப்பிக்கப் பட்ட 
விவரம்:"
 
+#~ msgid "Open Source?"
+#~ msgstr "திறந்த மூலம்?"
+
+#, 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."
+#~ msgstr ""
+#~ "இந்த கட்டுரையின் 
மொழிபெயர்ப்பை 
ஒருங்கிணைப்பது, 
சமர்ப்பிப்பது தொடர்பான 
விவரங்களுக்கு <a "
+#~ 
"href=\"/server/standards/README.translations.html\">மொழிபெயர்ப்புகள்
 README "
+#~ "கோப்பைக்</a> காணவும்."
+
 #~ 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.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.tr.po,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- free-sw.tr.po       29 May 2021 10:07:13 -0000      1.93
+++ free-sw.tr.po       16 Jul 2021 10:02:24 -0000      1.94
@@ -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-05-29 12:04+0200\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -19,11 +19,14 @@
 "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: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.2\n"
 
 #. type: Content of: <title>
-msgid "What is 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 "Özgür Yazılım Nedir? - GNU Projesi - Özgür Yazılım Vakfı"
 
 #. type: Attribute 'content' of: <meta>
@@ -44,57 +47,13 @@
 "özgürlüklerine sahip olabilmesi için Unix tarzı özgür GNU işletim 
sistemi "
 "geliştiriliyor."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "What is free software?"
+msgid "What is Free Software?"
 msgstr "Özgür Yazılım Nedir?"
 
-#. type: Content of: <div><h3>
-msgid "The Free Software Definition"
-msgstr "Özgür Yazılım Tanımı"
-
-#. 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 ""
-"Özgür Yazılım lisansları hakkında burada yanıtlanmamış bir sorunuz 
mu var? "
-"Diğer <a href=\"http://www.fsf.org/licensing\";>lisanslama</a> kaynaklarına "
-"bakabilirsiniz ve eğer gerekliyse FSF Uygunluk Labıyla <a href=\"mailto:";
-"licensing@fsf.org\">licensing@fsf.org</a> adresinden bağlantıya "
-"girebilirsiniz."
-
-#. 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 ""
-"Bu özgür yazılım tanımını, belirli bir yazılımın, özgür yazılım 
olarak "
-"sayılmasının koşullarını açıkça göstermek için yapıyoruz. Arada 
sırada "
-"açıklık getirmek veya güç algılanan hususlarla ilgili sorunları 
çözmek "
-"amacıyla bu tanımı yeniden gözden geçiririz. Eğer yaptığımız 
değişikliklere "
-"göz atmak isterseniz, lütfen daha fazla bilgi için aşağıdaki <a href="
-"\"#History\">Tarihçe kısmına</a> bakınız."
-
-#. 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;Açık kaynak&rdquo; farklı bir şey: farklı değerlere dayanan 
oldukça "
-"farklı bir felsefesi var. Uygulamadaki tanımı da farklı, ancak neredeyse "
-"bütün açık kaynak programlar aslında özgür. Farklılığı <a 
href=\"/philosophy/"
-"open-source-misses-the-point.html\"> Neden &ldquo;Açık Kaynak&rdquo; 
Özgür "
-"Yazılımın Noktasını Kaçırıyor</a> yazısında açıklıyoruz."
-
-#. 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, "
@@ -116,7 +75,20 @@
 "alınarak &ldquo;libre&rdquo; yazılım kavramı da, yazılımın bedelsiz 
olduğu "
 "değil özgür olduğunu  kastetmek için kullanılıyor."
 
-#. 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 ""
+"Özgür yazılımın kopyalarına sahip olmak için ücret ödemeniz 
gerekebilir veya "
+"kopyaları hiçbir ücret karşılığı olmadan da edinmiş olabilirsiniz. 
Kopyalara "
+"nasıl sahip olduğunuzdan bağımsız olarak, her zaman için yazılımın "
+"kopyalama, değiştirme ve hatta <a href=\"/philosophy/selling.html"
+"\">kopyalarını satma</a> özgürlüğüne sahipsiniz."
+
+#. 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 "
@@ -135,11 +107,168 @@
 "href=\"/philosophy/free-software-even-more-important.html\">adaletsiz "
 "iktidarın bir aracı</a> kılar."
 
-#. 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;Açık kaynak&rdquo; farklı bir şey: farklı değerlere dayanan 
oldukça "
+"farklı bir felsefesi var. Uygulamadaki tanımı da farklı, ancak neredeyse "
+"bütün açık kaynak programlar aslında özgür. Farklılığı <a 
href=\"/philosophy/"
+"open-source-misses-the-point.html\"> Neden &ldquo;Açık Kaynak&rdquo; 
Özgür "
+"Yazılımın Noktasını Kaçırıyor</a> yazısında açıklıyoruz."
+
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of contents"
+msgstr "İçindekiler"
+
+#. 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 "Özgür Yazılım Tanımı"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "The four essential freedoms"
+msgid "<a href=\"#four-freedoms\">The four essential freedoms</a>"
+msgstr "Dört temel özgürlük"
+
+#. 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>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid ""
+"<a href=\"#clarifying\">Clarifying the Boundary Between Free and Nonfree</a>"
+msgstr "Özgür olanla özgür olmayan arasındaki sınırı açıklığa 
kavuşturmak"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "Programı istediğiniz gibi çalıştırma özgürlüğü"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "Kaynak kodu inceleme ve değişiklikler yapma özgürlüğü"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "İsterseniz yeniden dağıtma özgürlüğü: temel gereksinimler"
+
+#. 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>
+#, fuzzy
+#| msgid "Rules about packaging and distribution details"
+msgid ""
+"<a href=\"#packaging\">Rules about packaging and distribution details</a>"
+msgstr "Paketleme ve dağıtım ayrıntıları hakkındaki kurallar"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "<a href=\"#contributor\" id=\"TOCcontributor\">Contributors</a>"
+msgid "<a href=\"#exportcontrol\">Export regulations</a>"
+msgstr "<a href=\"#contributor\" id=\"TOCcontributor\">Katkıda Bulunanlar</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>
+#, fuzzy
+#| msgid "Contract-based licenses"
+msgid "<a href=\"#contracts\">Contract-based licenses</a>"
+msgstr "Sözleşme tabanlı lisanslar"
+
+#. 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>
+#, fuzzy
+#| msgid "How we interpret these criteria"
+msgid "<a href=\"#interpretation\">How we interpret these criteria</a>"
+msgstr "Bu ölçütler nasıl yorumlanmalı"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, fuzzy
+#| msgid "Get help with free licenses"
+msgid "<a href=\"#get-help\">Get help with free licenses</a>"
+msgstr "Özgür lisanslarla ilgili yardım al"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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 "Özgür yazılım hakkında konuşurken doğru kelimeleri kullanın"
+
+#. 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 ""
+"Özgür Yazılım lisansları hakkında burada yanıtlanmamış bir sorunuz 
mu var? "
+"Diğer <a href=\"http://www.fsf.org/licensing\";>lisanslama</a> kaynaklarına "
+"bakabilirsiniz ve eğer gerekliyse FSF Uygunluk Labıyla <a href=\"mailto:";
+"licensing@fsf.org\">licensing@fsf.org</a> adresinden bağlantıya "
+"girebilirsiniz."
+
+#. type: Content of: <div><div><h3>
+msgid "The Free Software Definition"
+msgstr "Özgür Yazılım Tanımı"
+
+#. 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 ""
+"Bu özgür yazılım tanımını, belirli bir yazılımın, özgür yazılım 
olarak "
+"sayılmasının koşullarını açıkça göstermek için yapıyoruz. Arada 
sırada "
+"açıklık getirmek veya güç algılanan hususlarla ilgili sorunları 
çözmek "
+"amacıyla bu tanımı yeniden gözden geçiririz. Eğer yaptığımız 
değişikliklere "
+"göz atmak isterseniz, lütfen daha fazla bilgi için aşağıdaki <a href="
+"\"#History\">Tarihçe kısmına</a> bakınız."
+
+#. type: Content of: <div><div><h4>
 msgid "The four essential freedoms"
 msgstr "Dört temel özgürlük"
 
-#. 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>"
@@ -147,14 +276,14 @@
 "Bir program, eğer kullanıcıları dört temel özgürlüğe sahipse bir 
özgür "
 "yazılımdır: <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 ""
 "Herhangi bir amaç için, istediğiniz şekilde yazılımı çalıştırma 
özgürlüğü (0 "
 "numaralı özgürlük)."
 
-#. 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 "
@@ -164,13 +293,13 @@
 "ve onu değiştirme özgürlüğü (1 numaralı özgürlük). Yazılımın 
kaynak koduna "
 "ulaşmak, bu iş için ön koşuldur."
 
-#. 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 ""
 "Kopyaları dağıtma özgürlüğü, böylece başkalarına yardım 
edebilirsiniz (2 "
 "numaralı özgürlük)."
 
-#. 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 "
@@ -181,7 +310,7 @@
 "özgürlük). Böylece değişikliklerinizden yararlanması için tüm 
topluma bir "
 "şans vermiş olursunuz. Kaynak koduna erişmek, bunun için bir ön 
koşuldur."
 
-#. 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 "
@@ -193,7 +322,7 @@
 "şemalarını, hangi açılardan özgür olmadıkları konusunda ayırt 
edebilsek de, "
 "hepsini eşit derecede etik dışı kabul ediyoruz."
 
-#. 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 +342,11 @@
 "değiştirmeyi düşünüyorsak, bu durumda sadece A'nın özgür olması 
yetecektir; "
 "B'nin bu planla bir ilgisi yoktur."
 
-#. 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, "
@@ -226,7 +359,7 @@
 "dağıtım için de mevcut olmalıdır. Bu politika, temel önemdedir, bu 
politika "
 "olmadan özgür yazılım amaçlarına ulaşamaz."
 
-#. 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 "
@@ -248,7 +381,7 @@
 "dışı değil; bu gibi ticari özgür yazılımlar oldukça önemli. Özgür 
yazılımın "
 "ücretli, profesyonel desteği, önemli bir boşluğu dolduruyor."
 
-#. 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 "
@@ -260,7 +393,7 @@
 "olacaktır. Sonuç olarak bu gibi kısıtlamalarla lisanslanmış bir program 
"
 "özgür yazılım niteliğine sahip değildir."
 
-#. 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,24 +411,13 @@
 "özgürlükleri vermemekle aynı şeydir ve dolayısıyla program özgür 
olmayan bir "
 "program haline gelir."
 
-#. 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 ""
-"Özgür yazılımın kopyalarına sahip olmak için ücret ödemeniz 
gerekebilir veya "
-"kopyaları hiçbir ücret karşılığı olmadan da edinmiş olabilirsiniz. 
Kopyalara "
-"nasıl sahip olduğunuzdan bağımsız olarak, her zaman için yazılımın "
-"kopyalama, değiştirme ve hatta <a href=\"/philosophy/selling.html"
-"\">kopyalarını satma</a> özgürlüğüne sahipsiniz."
-
-#. type: Content of: <div><h3>
-msgid "Clarifying the boundary between free and nonfree"
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+msgid "Clarifying the Boundary Between Free and Nonfree"
 msgstr "Özgür olanla özgür olmayan arasındaki sınırı açıklığa 
kavuşturmak"
 
-#. 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 "
@@ -305,11 +427,11 @@
 "olabilmesi için özgürlüklerin ne dereceye kadar genişletilmesi 
gerektiğini "
 "daha açık olarak anlatıyoruz."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "Programı istediğiniz gibi çalıştırma özgürlüğü"
 
-#. 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 "
@@ -329,7 +451,7 @@
 "da kendi amaçları için programı çalıştırmaya özgürdür, ama kendi 
amaçlarınız "
 "için onu zorlayamazsınız."
 
-#. 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 +465,7 @@
 "belirli hesaplama faaliyeti olsun, hangi işlevsellikleri 
barındırdığından "
 "bağımsızdır."
 
-#. 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, "
@@ -362,7 +484,7 @@
 "sıkıntılı kodları kaldırarak değiştirilmiş sürümleri oluşturma ve 
dağıtma "
 "olanağı sunar."
 
-#. 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 "
@@ -372,11 +494,11 @@
 "&ldquo;asla&rdquo;yı da içerektir. Dolayısıyla ayrı bir &ldquo;programı 
"
 "çalıştırmama özgürlüğüne&rdquo; ihtiyaç yoktur."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to study the source code and make changes"
 msgstr "Kaynak kodu inceleme ve değişiklikler yapma özgürlüğü"
 
-#. 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 "
@@ -391,7 +513,7 @@
 "kod&rdquo; gerçek bir kaynak kod değildir ve kaynak kod olarak "
 "değerlendirilemez."
 
-#. 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 "
@@ -411,7 +533,7 @@
 "uygulanabilen bir özgürlük yerine bir yalan olacaktır. Bu ikili kodlar, "
 "derlendikleri kaynak kodları özgür olsa ile özgür bir yazılım 
değillerdir."
 
-#. 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 "
@@ -425,7 +547,7 @@
 "eklediğiniz her kodun telif hakkı sahibi olmanız gerektiğini 
söylüyorsa, o "
 "lisans, özgür olarak tanımlamak için çok kısıtlayıcıdır."
 
-#. 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 "
@@ -435,7 +557,7 @@
 "değişiklik yapmanız, esasında, başka birinin iyileştirme olarak "
 "tanımladığıyla sınırlıysa, bu program özgür değildir."
 
-#. 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 "
@@ -446,11 +568,11 @@
 "sağlamaktır. Bu yüzden, 1 numaralı özgürlük &ldquo;programı silme "
 "özgürlüğünü&rdquo; de içerir."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "İsterseniz yeniden dağıtma özgürlüğü: temel gereksinimler"
 
-#. 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 "
@@ -466,7 +588,7 @@
 "için başkasından izin almak veya birine bir ücret ödemek zorunda 
olmadığınız "
 "anlamına gelir."
 
-#. 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 "
@@ -477,11 +599,18 @@
 "veya oyununuzda kullanma özgürlüğünüz de olmalı. Değişikliklerinizi "
 "yayımladığınızda da, hiç kimseyi haberdar etmenize gerek olmamalıdır."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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 ""
@@ -492,7 +621,7 @@
 "olmayan olmasını gerektiren bir lisans, özgür bir lisans olarak "
 "değerlendirilemez."
 
-#. 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 "
@@ -511,15 +640,23 @@
 "ancak, program, bu biçimlerden herhangi birine sokmanın bir yolunu "
 "bulduğunuzda, programı yeniden dağıtmaya hakkınızın olması gerekir."
 
-#. 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>
+#, 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."
@@ -530,7 +667,7 @@
 "insanların özgürlüklerini hiçe sayan kısıtlamalar eklenememesi için 
konmuş "
 "kuraldır. Bu kural, merkezi özgürlükler ile çelişmez; aksine onları 
korur."
 
-#. 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/"
@@ -551,11 +688,11 @@
 "href=\"/philosophy/categories.html\">Özgür Yazılım Kategorileri</a> "
 "sayfasını inceleyebilirsiniz."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Rules about packaging and distribution details"
 msgstr "Paketleme ve dağıtım ayrıntıları hakkındaki kurallar"
 
-#. 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 "
@@ -576,7 +713,7 @@
 "makuldur; zaten programa başka değişiklikler yapıyorsunuz, bir kaç "
 "değişiklik daha yapmanız sorun olmayacaktır."
 
-#. 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 "
@@ -596,7 +733,7 @@
 "unutmayın). Kamusal kullanıma koyduğunuz sürümlerin kullanıcılarına 
da "
 "yayınlamanızı gerektiren kurallar da kabul edilebilirdir."
 
-#. 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 "
@@ -613,21 +750,32 @@
 "takma bir ad olarak belirtmenize olanak sağlayan uygun bir takma adlandırma 
"
 "yapısının olması durumunda kabul edilebilirdir."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Export regulations"
 msgstr "İhracat düzenlemeleri"
 
-#. 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>
+#, 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 ""
 "Bazen devletin <a id=\"exportcontrol\">ihracat denetimi yasaları</a> ve "
 "ticari yaptırımları, yazılımınızın kopyalarını uluslararası 
dağıtma "
@@ -640,7 +788,7 @@
 "kontrolü yasasına uyma zorunluluğunu, bu olmazsa olmaz özgürlüklerin "
 "uygulanması için bir koşul olarak gereksinim duymamalıdır."
 
-#. 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 "
@@ -657,11 +805,11 @@
 "bir değişiklik, bu gereksinimi önemli hale getirebilir ve yazılım 
özgür "
 "olmayan bir yazılım kılabilir."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Legal considerations"
 msgstr "Yasal hususlar"
 
-#. 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 "
@@ -675,7 +823,7 @@
 "hükümsüz kılma veya geçmişe dönük olarak koşullarına yeni şartlar 
ekleme "
 "gücüne sahipse, o yazılım özgür değildir."
 
-#. 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 "
@@ -690,7 +838,7 @@
 "programların lisanslarıyla da bir uyum gerektireceği için, bu lisans 
özgür "
 "olmayan bir lisans olmuş olur."
 
-#. 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."
@@ -698,11 +846,11 @@
 "Özgür bir lisansın hangi yargı hukukunun geçerli olduğunu veya hukuki "
 "davaların nerede görülmesi gerektiğini veya her ikisini belirtmesi 
uygundur."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Contract-based licenses"
 msgstr "Sözleşme tabanlı lisanslar"
 
-#. 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-"
@@ -723,7 +871,7 @@
 "da, bir lisansın kabul edilemez kısıtlamalara ve özgür olarak kabul "
 "edilmemesine dair mümkün birçok yol olduğunu belirtir."
 
-#. 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 "
@@ -736,49 +884,42 @@
 "açıklanmamışsa, o halde bu konu hakkında düşünmemiz gerekir ve bunu "
 "herhalde, özgür olmayan bir lisans olarak tanımlayacağızdır."
 
-#. type: Content of: <div><h4>
-msgid "Use the right words when talking about free software"
-msgstr "Özgür yazılım hakkında konuşurken doğru kelimeleri kullanın"
-
-#. 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 ""
-"Özgür yazılım hakkında konuşurken &ldquo;bedava&rdquo; veya &ldquo;"
-"hibe&rdquo; gibi terimler kullanmaktan kaçınmak en iyisidir. Çünkü bu "
-"terimler konunun özgürlükle ilgili değil, parayla ilgili olduğunu ima "
-"edebilir. &ldquo;Korsanlık&rdquo; gibi bazı genel terimler, "
-"desteklemeyeceğinizi umduğumuz bazı düşünceleri içeriyor. Bu terimler 
ile "
-"ilgili bir tartışma için <a href=\"/philosophy/words-to-avoid.html"
-"\">Kullanmaktan Kaçınılması Gereken Kelimeler ve Deyimler</a> sayfasına "
-"bakabilirsiniz. &ldquo;<a href=\"/philosophy/fs-translations.html\">Özgür "
-"yazılım</a>&rdquo; kavramının birçok dile çevirisini içeren bir 
listemiz de "
-"var."
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "The Free Software Definition"
+msgid "The Free Software Definition in Practice"
+msgstr "Özgür Yazılım Tanımı"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "How we interpret these criteria"
 msgstr "Bu ölçütler nasıl yorumlanmalı"
 
-#. 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 ""
 "Son olarak, özgür yazılım tanımında belirtilen kıstaslar gibi 
açıklamaların "
 "dikkatli çevrilmesi gerektiğine dikkat çekmek istiyoruz. Bir yazılım "
@@ -792,11 +933,11 @@
 "mevcut lisansların neyi sınırladığını ya da sınırlamadığını 
açıkça belirtmek "
 "için bu kıstaslar sıklıkla güncelliyoruz."
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "Get help with free licenses"
 msgstr "Özgür lisanslarla ilgili yardım al"
 
-#. 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 "
@@ -811,7 +952,7 @@
 "licensing@gnu.org\">&lt;licensing@gnu.org&gt;</a> adresine eposta yollayarak "
 "sorabilirsiniz."
 
-#. 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 "
@@ -825,7 +966,7 @@
 "edeceği anlamına gelir; belki size, gereksinimlerinizi karşılayabilecek "
 "mevcut bir Özgür Yazılım lisansı bulmanızda yardımcı olabiliriz."
 
-#. 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 "
@@ -835,11 +976,61 @@
 "bizim yardımımızla, lisansınızın bir özgür yazılım lisansı 
olduğunu temin "
 "edebilir ve olası uygulama sorunlarından kurtulabilirsiniz."
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h4>
+msgid "Use the right words when talking about free software"
+msgstr "Özgür yazılım hakkında konuşurken doğru kelimeleri kullanın"
+
+#. 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 ""
+"Özgür yazılım hakkında konuşurken &ldquo;bedava&rdquo; veya &ldquo;"
+"hibe&rdquo; gibi terimler kullanmaktan kaçınmak en iyisidir. Çünkü bu "
+"terimler konunun özgürlükle ilgili değil, parayla ilgili olduğunu ima "
+"edebilir. &ldquo;Korsanlık&rdquo; gibi bazı genel terimler, "
+"desteklemeyeceğinizi umduğumuz bazı düşünceleri içeriyor. Bu terimler 
ile "
+"ilgili bir tartışma için <a href=\"/philosophy/words-to-avoid.html"
+"\">Kullanmaktan Kaçınılması Gereken Kelimeler ve Deyimler</a> sayfasına "
+"bakabilirsiniz. &ldquo;<a href=\"/philosophy/fs-translations.html\">Özgür "
+"yazılım</a>&rdquo; kavramının birçok dile çevirisini içeren bir 
listemiz de "
+"var."
+
+#. type: Content of: <div><div><p>
+#, 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 ""
+"Diğer bir grup, &ldquo;özgür yazılım&rdquo; kavramına yakın (ancak 
aynısı "
+"olmayan) &ldquo;açık kaynak&rdquo; terimini kullanıyor. Biz, 
&ldquo;özgür "
+"yazılım&rdquo; terimini tercih ediyoruz, çünkü bu terimin ücret yerine "
+"özgürlüğü simgelediğini bir kere duyduğunuzda, bu terim artık size 
düşünce "
+"özgürlüğünü çağrıştırır. Ancak &ldquo;açık&rdquo; kelimesi <a 
href=\"/"
+"philosophy/open-source-misses-the-point.html\">asla özgürlüğe işaret 
etmez</"
+"a>."
+
+#. type: Content of: <div><div><h3>
 msgid "Beyond Software"
 msgstr "Yazılımın Yanında"
 
-#. 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 "
@@ -849,18 +1040,24 @@
 "yazılımın bir etkili parçası olmasından dolayı <a 
href=\"/philosophy/free-"
 "doc.html\">yazılım kılavuzları da özgür olmalıdır</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 "
+#| "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 ""
 "Aynı görüşler diğer kullanışlı uygulamalar için de mantıklıdır 
&mdash; yani, "
 "öğrenim ve başvuru işleri gibi kullanışlı bilgi sunan işler. <a href="
 "\"http://wikipedia.org\";>Wikipedia</a> en iyi bilinen örnek."
 
-#. 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/\";> "
@@ -871,31 +1068,10 @@
 "kültürel çalışmalar</a> tanımına genişletildi."
 
 #. type: Content of: <div><h3>
-msgid "Open Source?"
-msgstr "Açık Kaynak?"
-
-#. 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 ""
-"Diğer bir grup, &ldquo;özgür yazılım&rdquo; kavramına yakın (ancak 
aynısı "
-"olmayan) &ldquo;açık kaynak&rdquo; terimini kullanıyor. Biz, 
&ldquo;özgür "
-"yazılım&rdquo; terimini tercih ediyoruz, çünkü bu terimin ücret yerine "
-"özgürlüğü simgelediğini bir kere duyduğunuzda, bu terim artık size 
düşünce "
-"özgürlüğünü çağrıştırır. Ancak &ldquo;açık&rdquo; kelimesi <a 
href=\"/"
-"philosophy/open-source-misses-the-point.html\">asla özgürlüğe işaret 
etmez</"
-"a>."
-
-#. type: Content of: <h3>
 msgid "History"
 msgstr "Tarihçe"
 
-#. 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."
@@ -904,7 +1080,7 @@
 "önemli değişikliklerin bir listesini, tam olarak neyin değiştiğini 
gösteren "
 "bağlantılarla birlikte görebilirsiniz."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -919,7 +1095,7 @@
 "kastetmediği, bu yüzden bunları ayrı gereksinimler olarak ifade etmeye 
gerek "
 "olmadığı açıklandı."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -932,7 +1108,7 @@
 "özgürlüklerin kullanıcıların bu sıkıntıları kaldırmasına olanak 
sağladığı "
 "açıklandı."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -943,7 +1119,7 @@
 "özgürlüğünün, hiçbir şeyin onu çalıştırmaktan alıkoyamayacağı 
anlamına "
 "geldiği açıklandı."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -953,7 +1129,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Sürüm 1.141</a>: Hangi kodun özgür "
 "olması gerektiği açıklandı."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -963,7 +1139,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Sürüm 1.135</a>: Her seferinde 0. "
 "özgürlüğün programı istediğiniz gibi çalıştırma özgürlüğü 
olduğu söylendi."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -973,7 +1149,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Sürüm 1.134</a>: 0. Özgürlük 
programın "
 "işlevselliğiyle ilgili bir husus değildir."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -983,7 +1159,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Sürüm 1.131</a>: Özgür bir lisansın 
"
 "başka bir programın özgür olmayan lisansıyla uygunluk gerektirmeyebilir."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -994,7 +1170,7 @@
 "root=www&amp;r1=1.128&amp;r2=1.129\">Sürüm 1.129</a>: Yasa seçimi ve forum 
"
 "tariflerinin seçimi açıkça belirtildi (bu her zaman politikamızdı)."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1006,7 +1182,7 @@
 "gereksinimi, eğer gereksinim kolay değilse gerçek bir sorundur; aksi 
durumda "
 "sadece olası bir sorundur."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1018,7 +1194,7 @@
 "değiştirme hakkınızı sınırlıyor, ne değişiklik yaptığınızı 
değil. Ve "
 "değişiklik dediğimiz şey &ldquo;iyileştirmelerle&rdquo; sınırlı 
değildir"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1032,7 +1208,7 @@
 "belirtildi. Telif hakkı sahipleri, her zaman, çalışmanın kullanımı 
için "
 "paralelde başka şekillerde yayınlamaya ilişkin ek <em>izinler</em> 
verebilir."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1045,7 +1221,7 @@
 "olan) aslında kendi değiştirilmiş sürümünüzü kendi bilgi işleminiz 
için "
 "kullanmayı içerdiği hakkındaki husus ifade edildi."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1055,7 +1231,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Sürüm 1.92</a>: Gizlenmiş kodun kaynak "
 "kod olarak değerlendirilemeyeceği açıklandı."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1068,7 +1244,7 @@
 "hakkı anlamına geldiği, başkasının geliştirme projesinde yer alma 
hakkı "
 "olmadığı açıklandı."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1078,7 +1254,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Sürüm 1.89</a>: 3 numaralı özgürlük, 
"
 "değiştirilmiş sürümleri özgür yazılım olarak yayınlama hakkını 
içerir."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1088,7 +1264,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Sürüm 1.80</a>: 1 numaralı özgürlük "
 "uygulanabilir olmalıdır, yalnızca teorik değil; örn., tivolaştırma 
olmamalı."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1100,7 +1276,7 @@
 "olmasa bile, lisansda geriye dönük değişiklikler yapmanın 
kabuledilebilir "
 "olmadığını açıklığa kavuştur."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1112,7 +1288,7 @@
 "veya bazı yerlerde sözü geçen ancak heryerde belirtilmemiş olan dört "
 "noktanın açıklamaları:"
 
-#. 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 "
@@ -1123,7 +1299,7 @@
 "numaralı özgürlük yalnızca değişikliklerin değil, aynı zamanda 
değiştirilmiş "
 "sürümlerin de dağıtılmasını içerir."
 
-#. 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."
@@ -1131,18 +1307,18 @@
 "Varolan modüllerin birleştirilmesi ile, uygun şekilde lisansları olanlar "
 "kastedilmiştir."
 
-#. 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 ""
 "Dışarı aktarım kontrolleriyle ilgili noktanın neticesini açıkca 
belirt."
 
-#. 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 ""
 "Bir lisans değişikliğini yürüre koymak eski lisansı feshetmeyi meydana "
 "getirir."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1152,7 +1328,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Sürüm 1.57</a>: &quot;Yazılımın "
 "Ötesinde&quot; kısmını ekle."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1162,7 +1338,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Sürüm 1.46</a>: Özgürlükte kimin 
hangi "
 "neden için olursa olsun programı çalıştırmasının önemini açıkla."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1172,7 +1348,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Sürüm 1.41</a>: Kontrata dayalı 
lisanslar "
 "hakkındaki sözleri açıklığa kavuştur."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1184,7 +1360,7 @@
 "değişikliklerinizi yaratmak için diğer mevcut özgür lisansları 
kullanmanıza "
 "izin vermesi gerektiğini anlat."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1196,7 +1372,7 @@
 "kullanıma açık koyulan bir yazılımın sürümleri için kaynak kodunu 
sağlamayı "
 "gerekli kılmasının kabul edilebilir olduğunu belirt."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1208,7 +1384,7 @@
 "değişikliklerin sahibi olarak sizin kendinizi göstermenizi mecbur 
kılmasının "
 "kabul edilebilir olduğunu belirt."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1218,7 +1394,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Sürüm 1.23</a>: Kontrat tabanlı 
lisanslar "
 "hakkındaki olası sorunlara işaret et."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1228,7 +1404,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Sürüm 1.16</a>: Çalıştırılabilir "
 "dosyaların dağıtılmasının neden önemli olduğunu açıkla."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1240,7 +1416,7 @@
 "dağıttığınız sürümlerin bir kopyasını talep durumunda programın 
sahibine "
 "göndermenizi zorunlu kılabileceği belirtildi."
 
-#. 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 "
@@ -1259,11 +1435,11 @@
 "arayüzümüzden</a> yapabilirsiniz."
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnote"
 msgstr "Dipnotlar"
 
-#. 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,14 +1497,19 @@
 #.         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 "
+#| "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 ""
 "Çevirilerimizde bulmuş olabileceğiniz hataları, aklınızdaki soru ve "
@@ -1342,9 +1523,13 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
+#, 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."
@@ -1381,5 +1566,8 @@
 msgid "Updated:"
 msgstr "Son Güncelleme:"
 
+#~ msgid "Open Source?"
+#~ msgstr "Açık Kaynak?"
+
 #~ msgid "Clarifying the line at various points"
 #~ msgstr "Konuyu farklı noktalar açıklığa kavuşturmak"

Index: free-sw.uk-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.uk-diff.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- free-sw.uk-diff.html        8 Jun 2021 08:44:42 -0000       1.13
+++ free-sw.uk-diff.html        16 Jul 2021 10:02:24 -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:24 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: free-sw.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.uk.po,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- free-sw.uk.po       30 May 2021 08:31:19 -0000      1.77
+++ free-sw.uk.po       16 Jul 2021 10:02:24 -0000      1.78
@@ -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: 2018-05-23 20:20+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\n"
@@ -21,7 +21,9 @@
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
-msgid "What is 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 - Фонд 
вільного програмного "
 "забезпечення"
@@ -44,56 +46,13 @@
 "користувачів комп'ютерів могла бути 
свобода обмінюватися програмами, якими "
 "вони користуються, і покращувати їх."
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+#, 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;Відкритий джерельний код&rdquo; 
становить собою дещо інше: у нього "
-"зовсім інша філософія, заснована на інших 
цінностях. Його практичне "
-"визначення також інше, але майже всі 
програми із відкритим джерельним кодом "
-"справді є вільними. Різницю ми пояснюємо у 
статті <a href=\"/philosophy/open-"
-"source-misses-the-point.html\">Чому &ldquo; відкритий  
джерельний код&rdquo; "
-"не передає суть поняття &ldquo;вільна 
програма&rdquo;</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 +73,33 @@
 "називаємо його &ldquo;libre software&rdquo;, щоби 
підкреслити, що слово "
 "&ldquo;libre software&rdquo; не означає 
безкоштовність."
 
-#. 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;Вільна програма&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 "
@@ -132,11 +117,163 @@
 "програму; це робить програму <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;Відкритий джерельний код&rdquo; 
становить собою дещо інше: у нього "
+"зовсім інша філософія, заснована на інших 
цінностях. Його практичне "
+"визначення також інше, але майже всі 
програми із відкритим джерельним кодом "
+"справді є вільними. Різницю ми пояснюємо у 
статті <a href=\"/philosophy/open-"
+"source-misses-the-point.html\">Чому &ldquo; відкритий  
джерельний код&rdquo; "
+"не передає суть поняття &ldquo;вільна 
програма&rdquo;</a>."
+
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>
+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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>"
@@ -144,13 +281,13 @@
 "Програма вільна, якщо у її користувачів є 
чотири свободи: <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 ""
 "Свобода виконувати програму як вам 
завгодно в будь-яких цілях (свобода 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 "
@@ -160,11 +297,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 "
@@ -175,7 +312,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 "
@@ -187,7 +324,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 "
@@ -206,7 +343,11 @@
 "плануємо змінити А так, щоб у ній не 
застосовувалася Б, то вільною потрібно "
 "бути лише програмі А; Б ми можемо не 
розглядати."
 
-#. 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, "
@@ -215,7 +356,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 "
@@ -228,7 +369,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 "
@@ -236,7 +377,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 "
@@ -247,48 +388,22 @@
 "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;Вільна програма&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 "
@@ -308,7 +423,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 "
@@ -322,7 +437,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, "
@@ -333,18 +448,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 freedoms 1 and 3 (the freedom to make changes and the "
@@ -367,7 +482,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 "
@@ -388,7 +503,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 +517,7 @@
 "потрібно бути правовласником всіх 
текстів, які ви додаєте&nbsp;&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 +527,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 "
@@ -437,7 +552,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 "
@@ -449,11 +564,18 @@
 "існують. Якщо ж ви публікуєте свої зміни, 
від вас не повинні вимагати "
 "сповіщати про це когось конкретно або 
якимось конкретним способом."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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 ""
@@ -463,7 +585,7 @@
 "\"/copyleft/copyleft.html\">копілефту</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 "
@@ -482,15 +604,23 @@
 "поширювати програму в такому вигляді, 
якщо ви знайдете або розробите спосіб "
 "такого перетворення."
 
-#. 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 ""
+#| "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."
@@ -502,7 +632,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/"
@@ -522,11 +652,11 @@
 "співвідносяться між собою &ldquo;вільні 
програми&rdquo;, &ldquo;програми з "
 "копілефтом&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>
 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 "
@@ -546,7 +676,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 "
@@ -566,7 +696,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 "
@@ -582,21 +712,32 @@
 "засіб перепризначення, що дозволяє вам 
задати ім'я первісної програми як "
 "перенаправлення на змінену версію."
 
-#. 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>
+#, 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> торгові "
 "санкції можуть обмежити вашу свободу 
передавати копії програм на "
@@ -607,7 +748,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 "
@@ -623,11 +764,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 "
@@ -641,7 +782,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 "
@@ -656,7 +797,7 @@
 "дотримання ліцензій цих невільних 
програм; тим самим ліцензія стала б "
 "ліцензією невільних програм. "
 
-#. 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."
@@ -664,11 +805,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-"
@@ -688,7 +829,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 "
@@ -701,48 +842,42 @@
 "правомірний, нам доведеться подумати про 
це, і ми, ймовірно, прийдемо до "
 "висновку, що вона не вільна."
 
-#. 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 ""
-"Коли мова йде про вільні програми, краще 
всього уникати вживання таких "
-"термінів, як &ldquo;роздавати&rdquo; 
&ldquo;безкоштовно &rdquo;,тому що ці "
-"терміни мають на увазі, що справа у 
вартості, а не у свободі. Деякі "
-"загальноприйняті терміни, наприклад, 
&ldquo;піратство&rdquo;, несуть в собі "
-"точку зору, яку ви, як ми сподіваємося, не 
схвалюєте. Ці терміни "
-"обговорюються на сторінці <a 
href=\"/philosophy/words-to-avoid.html\">&ldquo;"
-"Заплутують слова та вирази, яких варто 
уникати&rdquo;</a>. У нас є також "
-"список вірних <a 
href=\"/philosophy/fs-translations.html\">перекладів "
-"словосполучення &ldquo;вільні 
програми&rdquo;</a> на різні мови."
+#. type: Content of: <div><div><h3>
+#, 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>
+#, 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 ""
 "Нарешті, зверніть увагу, що критерії, 
подібні тим, що прийняті в цьому "
 "визначенні вільної програми, вимагають 
обережного осмислення при "
@@ -756,11 +891,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 "
@@ -774,7 +909,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 "
@@ -788,7 +923,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 "
@@ -798,11 +933,59 @@
 "допомогою ви зможете гарантувати, що 
ліцензія дійсно є ліцензією вільних "
 "програм і не несе в собі різних практичних 
проблем."
 
-#. 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 ""
+"Коли мова йде про вільні програми, краще 
всього уникати вживання таких "
+"термінів, як &ldquo;роздавати&rdquo; 
&ldquo;безкоштовно &rdquo;,тому що ці "
+"терміни мають на увазі, що справа у 
вартості, а не у свободі. Деякі "
+"загальноприйняті терміни, наприклад, 
&ldquo;піратство&rdquo;, несуть в собі "
+"точку зору, яку ви, як ми сподіваємося, не 
схвалюєте. Ці терміни "
+"обговорюються на сторінці <a 
href=\"/philosophy/words-to-avoid.html\">&ldquo;"
+"Заплутують слова та вирази, яких варто 
уникати&rdquo;</a>. У нас є також "
+"список вірних <a 
href=\"/philosophy/fs-translations.html\">перекладів "
+"словосполучення &ldquo;вільні 
програми&rdquo;</a> на різні мови."
+
+#. type: Content of: <div><div><p>
+#, 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 ""
+"Інша група почала вживати термін 
&ldquo;відкритий вихідний код&rdquo; для "
+"позначення близького (але не тотожного) 
&ldquo;вільним програмами&rdquo; "
+"поняття. Ми воліємо термін &ldquo;вільна 
програма&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 "
@@ -812,11 +995,17 @@
 "вільні</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 "
+#| "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 ""
 "Ті ж самі аргументи мають сенс для інших 
різновидів прикладних творів - "
@@ -824,7 +1013,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/\";> "
@@ -835,30 +1024,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 ""
-"Інша група почала вживати термін 
&ldquo;відкритий вихідний код&rdquo; для "
-"позначення близького (але не тотожного) 
&ldquo;вільним програмами&rdquo; "
-"поняття. Ми воліємо термін &ldquo;вільна 
програма&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."
@@ -867,7 +1036,7 @@
 "Тут розміщений список істотних змін з 
посиланнями на сторінці, де в точності "
 "показано, що змінилося."
 
-#. 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.";
@@ -884,7 +1053,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>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
@@ -900,7 +1069,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Версія 1.135</a>:Щоразу 
йде мова, що "
 "свобода&nbsp;0&nbsp;&mdash; це свобода виконувати 
програму як вам завгодно."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -910,7 +1079,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 "
@@ -920,7 +1089,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 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 "
@@ -930,7 +1099,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Версія 1.135</a>:Щоразу 
йде мова, що "
 "свобода&nbsp;0&nbsp;&mdash; це свобода виконувати 
програму як вам завгодно."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -940,7 +1109,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 "
@@ -950,7 +1119,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 "
@@ -961,7 +1130,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 "
@@ -973,7 +1142,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 "
@@ -985,7 +1154,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 "
@@ -999,7 +1168,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 "
@@ -1012,7 +1181,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.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
@@ -1022,7 +1191,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 "
@@ -1034,7 +1203,7 @@
 "свобода&nbsp;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.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -1044,7 +1213,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 "
@@ -1054,7 +1223,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">Версія 1.80</a>: Свобода 1 
повинна бути "
 "практичною, а не тільки теоретичною; т.&nbsp; 
тобто ніякої тівоїзації."
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1066,7 +1235,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.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
@@ -1078,7 +1247,7 @@
 "положень, які були недостатньо явні або 
висловлювалися в деяких місцях, але "
 "не були відображені скрізь:"
 
-#. 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 "
@@ -1088,7 +1257,7 @@
 "роду модифікації ви можете випускати. 
Свобода&nbsp;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."
@@ -1096,15 +1265,15 @@
 "Право об'єднання з існуючими модулями 
відноситься до модулів з відповідною "
 "ліцензією."
 
-#. 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 "
@@ -1114,7 +1283,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 "
@@ -1124,7 +1293,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 "
@@ -1134,7 +1303,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 "
@@ -1146,7 +1315,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.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
@@ -1158,7 +1327,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 "
@@ -1170,7 +1339,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.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
@@ -1180,7 +1349,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 "
@@ -1190,7 +1359,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 "
@@ -1202,7 +1371,7 @@
 "ліцензія може вимагати від вас 
пересилання копії версій, які ви поширюєте, 
"
 "попереднім розробникам за запитом."
 
-#. 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 "
@@ -1220,11 +1389,11 @@
 "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 "
@@ -1264,14 +1433,19 @@
 #.         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 "
+#| "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 ""
 "Ми намагалися зробити цей переклад точним 
та якісним, але виключити "
@@ -1287,8 +1461,8 @@
 #| "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 ""
 "Copyright &copy; 1996, 2002, 2004-2007, 2009-2018 Free Software Foundation, "
 "Inc. (Фонд вільного програмного 
забезпечення, Inc.)"
@@ -1315,6 +1489,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\">&ldquo;Посібнику 
з "
+#~ "перекладу&rdquo;</a>."
+
 #~ msgid ""
 #~ "The rest of this page clarifies certain points about what makes specific "
 #~ "freedoms adequate or not."

Index: free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- free-sw.zh-cn.po    4 Feb 2021 08:32:19 -0000       1.46
+++ free-sw.zh-cn.po    16 Jul 2021 10:02:24 -0000      1.47
@@ -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: 2021-02-04 16:03+0800\n"
 "Last-Translator: Wensheng XIE <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -15,10 +15,13 @@
 "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 1.7.5\n"
 
 #. type: Content of: <title>
-msgid "What is 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工程 - 自由软件基金会"
 
 #. type: Attribute 'content' of: <meta>
@@ -38,51 +41,13 @@
 
"始于1983年,致力于开发自由的类UNIX系统:GNU操作系统。捍卫计算机用户分享和改进"
 "软件的自由。"
 
-#. type: Content of: <h2>
-msgid "What is free software?"
+#. type: Content of: <div><h2>
+#, 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>联系 FSF 合规实验室。"
-
-#. 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;开源&rdquo;是另外一回事:它有基于不同价值观的非常不同的哲学。å
…¶å®žé™…定"
-"义也不同,但是几
乎所有的开源程序事实上都是自由软件。我们在<a href=\"/"
-"philosophy/open-source-misses-the-point.html\">为什么&ldquo;开源&rdquo;错失了"
-"自由软件的重点</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, "
@@ -101,7 +66,18 @@
 "的自由,而非&ldquo;免费&rdquo;这一意项。为避å…
æ­§ä¹‰ï¼Œåœ¨ä½¿ç”¨è‹±æ–‡æ—¶ï¼Œæˆ‘们也会借"
 "用法语或西班牙语的&ldquo;Libre Software&rdquo;来指自由软件。"
 
-#. 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 ""
+"你可能花钱购买了自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你如何获得你的拷贝,"
+"你都有自由复制和修改该软件,乃至 <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 "
@@ -118,11 +94,160 @@
 "的开发者则掌控着软件。这使得非自由软件成为了<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;开源&rdquo;是另外一回事:它有基于不同价值观的非常不同的哲学。å
…¶å®žé™…定"
+"义也不同,但是几
乎所有的开源程序事实上都是自由软件。我们在<a href=\"/"
+"philosophy/open-source-misses-the-point.html\">为什么&ldquo;开源&rdquo;错失了"
+"自由软件的重点</a>一文中阐述了这些不同。"
+
+#. type: Content of: <div><div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+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>
+#, 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>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+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 as you wish"
+msgid ""
+"<a href=\"#run-the-program\">The freedom to run the program as you wish</a>"
+msgstr "自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿è‡ªç”±åœ°è¿è¡Œè¯¥è½¯ä»¶ã€‚"
+
+#. type: Content of: <div><div><div><ul><li><ul><li>
+#, 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>
+#, 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 "自由度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>
+#, 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>
+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>
+#, 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>
+#, 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>
+#, 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>
+#, 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>联系 FSF 合规实验室。"
+
+#. 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>"
@@ -130,13 +255,13 @@
 "如果一个软件是自由软件,那么它必
须为用户提供以下四项基本自由:<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 ""
 "自由度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 "
@@ -145,11 +270,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 "
@@ -159,7 +284,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 "
@@ -170,7 +295,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 "
@@ -186,7 +311,11 @@
 "的。如果通过修改甲程序,使其不再依赖乙程序,那么仅仅
以自由软件的形式发布甲程"
 "序即可。"
 
-#. 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, "
@@ -198,7 +327,7 @@
 
"可以商用、可以商业开发、可以商业发布。这个政策非常重要&mdash;缺乏这æ
 ·çš„政策,"
 "自由软件将无法实现自己的目标。"
 
-#. 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 "
@@ -216,7 +345,7 @@
 
"由软件的商业开发不再那么不寻常;这些自由的商业软件非常重要。付费的、专业的自"
 "由软件技术支持填补了重要的需求空白。"
 
-#. 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 "
@@ -226,7 +355,7 @@
 "因
此,把商业使用、商业开发或商业发布排除在外会羁绊自由软件社区并阻碍å
…¶èµ°å‘成"
 
"功之路。我们一定要明确使用带有这种限制的许可证发布的软件不是自由软件。"
 
-#. 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,22 +370,13 @@
 "面对用户加以限制或者
要求付费才能实践这些自由和不赋予用户自由没有什么两æ 
·ï¼Œå› "
 "此这样的程序不是自由软件。"
 
-#. 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 ""
-"你可能花钱购买了自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你如何获得你的拷贝,"
-"你都有自由复制和修改该软件,乃至 <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>
+#, fuzzy
+#| msgid "Clarifying the boundary between free and nonfree"
+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 "
@@ -265,11 +385,11 @@
 
"在本文的以下部分,我们会进一步准确地解释这些自由针对各种问题会如何扩展才能使"
 "软件自由。"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to run the program as you wish"
 msgstr "自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿è‡ªç”±åœ°è¿è¡Œè¯¥è½¯ä»¶ã€‚"
 
-#. 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 "
@@ -287,7 +407,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 "
@@ -299,7 +419,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, "
@@ -315,7 +435,7 @@
 "户可以克服这些无用之处,因为自由之一和自由之三å…
è®¸ç”¨æˆ·å’Œç¤¾åŒºä¿®æ”¹å’Œå‘表不带有"
 "随意代码的改进版本。"
 
-#. 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 "
@@ -325,11 +445,11 @@
 "(如果你希望如此)。所以没有必要再有一个单独的 
&ldquo;不运行程序的自由"
 "&rdquo;。"
 
-#. 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>
 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 "
@@ -342,7 +462,7 @@
 "&ldquo;源代码&rdquo;不是真正的源代ç 
ï¼Œä¸èƒ½è¢«ç®—作此处讨论的源代码。"
 
 # This part may need a tranlator's note explaining details about Tivo.
-#. 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 "
@@ -360,7 +480,7 @@
 "程序也将不被视为自由软件,即使它们的源代ç 
æ˜¯è‡ªç”±çš„。"
 
 # suitably licensed? How can I translate this in a short but meaningful phrase?
-#. 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 "
@@ -373,7 +493,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 "
@@ -383,7 +503,7 @@
 "观的事情
。自由软件许可证不能对用户修改软件做任何限制,例如,不能ä»
…仅因为某人"
 "觉得哪处修改不够好,就禁止用户自己做这个改动。"
 
-#. 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 "
@@ -392,11 +512,11 @@
 "自由之一有一个特殊的案例就是删除程序的代ç 
è®©å®ƒä¸æ‰§è¡Œä»»ä½•åŠ¨ä½œï¼Œæˆ–者让它直接调"
 "用另外的程序。因此,自由之一包含有 &ldquo;删
除程序的自由&rdquo;。"
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h4>
 msgid "The freedom to redistribute if you wish: basic requirements"
 msgstr "自由度2:用户可以自由地分发该软件的拷贝。"
 
-#. 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 "
@@ -410,7 +530,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 "
@@ -421,11 +541,18 @@
 "那么你没有义务将该行为公开给任何人。如果你
发布了自己修改后的程序,那么你也没"
 
"有任何义务将该修改行为告知给哪个或哪些指定的人或组织。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
+#, 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 ""
@@ -434,7 +561,7 @@
 
"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 "
@@ -451,15 +578,23 @@
 
"程语言的实现可能并不支持,例如某些脚本语言),但是用户å¿
…须有权利以任何方式生"
 "成二进制或可执行文件,并且发布这些生成的软件。"
 
-#. 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>
+#, 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."
@@ -469,7 +604,7 @@
 "一种限制。简言之,copyleft要求软件的修改版必须同æ 
·ä»¥è‡ªç”±è½¯ä»¶çš„形式发布。这条"
 "限制与æ 
¸å¿ƒè‡ªç”±å¹¶ä¸å†²çªï¼Œç›¸åï¼Œcopyleft可以用来很好地保护软件用户的自由。"
 
-#. 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/"
@@ -487,11 +622,11 @@
 "件分类</a>来了解更多å…
³äºŽ&ldquo;自由软件&rdquo;、&ldquo;copyleft软件&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>
 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 "
@@ -509,7 +644,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 "
@@ -527,7 +662,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 "
@@ -542,21 +677,32 @@
 
"而文件名则是这种调用的基础。别名机制可以保证用户在遵守该要求的前提下,顺利将"
 
"原版软件替换成修改版,并且不会影响依赖该软件的第三方程序。"
 
-#. 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>
+#, 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>或贸易制裁可能会影响到软件用户"
 "在国际范围内发布软件的自由。软件开发者
也许没有能力去改变这些现实,但是我们可"
@@ -564,7 +710,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 "
@@ -579,11 +725,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 "
@@ -596,7 +742,7 @@
 "么该软件也不被视为自由软件。"
 
 # "may not" or "should not"?
-#. 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 "
@@ -609,7 +755,7 @@
 "非自由软件,而要求用户遵守å…
¨éƒ¨ä½¿ç”¨çš„软件的许可证则意味着需要遵守非自由软件许"
 "可证,这要的要求将被视作非自由的。"
 
-#. 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."
@@ -617,11 +763,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-"
@@ -638,7 +784,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 "
@@ -649,46 +795,42 @@
 "一些额外限制,并且这些限制是不可能包
含在一份基于版权的许可证中的,那么我们就"
 "需要再三考虑它是否可以被视作自由许可证。很多情
况下,这些许可证都是非自由的。"
 
-#. 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 ""
-"在讨论自由软件的时候,尽量避免使用&ldquo;赠
送&rdquo;或&ldquo;免费&rdquo;一类"
-"的词汇。因为这会让人们联想到价æ 
¼ï¼Œè€Œéžè‡ªç”±ã€‚一些常见的词汇,例如&ldquo;盗版"
-"&rdquo;,其中包含了或褒或贬的感情色彩,而这些感情
体现的价值观并不被我们接受。"
-"参见<a 
href=\"/philosophy/words-to-avoid.html\">歧义词汇列表</a>,里面列举了"
-"我们不推荐使用的词汇以及相关的讨论。我们还有一个<a 
href=\"/philosophy/fs-"
-"translations.html\">列表</a>,包
含了&ldquo;自由软件&rdquo;一词在不同语言中的"
-"推荐翻译。"
+#. type: Content of: <div><div><h3>
+#, 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>
+#, 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 ""
 "最后请注意,在实践中,本文中提及的各种å…
³äºŽè‡ªç”±è½¯ä»¶çš„界定标准都需要仔细思考后"
 
"再做出解释。在决定一个软件许可证是否是自由软件的时候,我们会仔细查看该许可证"
@@ -698,11 +840,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 "
@@ -715,7 +857,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 "
@@ -728,7 +870,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 "
@@ -737,11 +879,55 @@
 "如果您真的需要自己创造
一个新许可证,那么我们会尽力帮助您。在我们的帮助下,我"
 "们会保证您的许可证是自由的,并且帮助您避å…
ä¸€äº›å¸¸è§çš„问题。"
 
-#. 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 ""
+"在讨论自由软件的时候,尽量避免使用&ldquo;赠
送&rdquo;或&ldquo;免费&rdquo;一类"
+"的词汇。因为这会让人们联想到价æ 
¼ï¼Œè€Œéžè‡ªç”±ã€‚一些常见的词汇,例如&ldquo;盗版"
+"&rdquo;,其中包含了或褒或贬的感情色彩,而这些感情
体现的价值观并不被我们接受。"
+"参见<a 
href=\"/philosophy/words-to-avoid.html\">歧义词汇列表</a>,里面列举了"
+"我们不推荐使用的词汇以及相关的讨论。我们还有一个<a 
href=\"/philosophy/fs-"
+"translations.html\">列表</a>,包
含了&ldquo;自由软件&rdquo;一词在不同语言中的"
+"推荐翻译。"
+
+#. type: Content of: <div><div><p>
+#, 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 ""
+"现在还有另外一伙人,使用&ldquo;开源&rdquo;一词来表达与&ldquo;自由软件&rdquo;"
+"类似,但不完å…
¨ç›¸åŒçš„概念。我们更倾向于使用&ldquo;自由软件&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 "
@@ -750,18 +936,24 @@
 "基于同样的原则,<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 "
+#| "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 ""
 "同理,相同的原则也适用于其他的具有实用功能的作品中 
&mdash; 所谓实用功能的作"
 "品,是指作品中包
含实用的知识,例如教育材料或参考材料。<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/\";> "
@@ -771,28 +963,10 @@
 "方面的材料,请参见<a 
href=\"http://freedomdefined.org/\";>自由文化作品</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 ""
-"现在还有另外一伙人,使用&ldquo;开源&rdquo;一词来表达与&ldquo;自由软件&rdquo;"
-"类似,但不完å…
¨ç›¸åŒçš„概念。我们更倾向于使用&ldquo;自由软件&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."
@@ -800,7 +974,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 "
@@ -813,7 +987,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.164&amp;r2=1.165\">Version 1.165</a>: Clarify that "
@@ -824,7 +998,7 @@
 "root=www&amp;r1=1.164&amp;r2=1.165\">Version 1.165</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.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -834,7 +1008,7 @@
 "root=www&amp;r1=1.152&amp;r2=1.153\">Version 
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 "
@@ -844,7 +1018,7 @@
 "root=www&amp;r1=1.140&amp;r2=1.141\">Version 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 "
@@ -854,7 +1028,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">Version 
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 "
@@ -864,7 +1038,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">Version 
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 "
@@ -874,7 +1048,7 @@
 "root=www&amp;r1=1.130&amp;r2=1.131\">Version 
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 "
@@ -885,7 +1059,7 @@
 "root=www&amp;r1=1.128&amp;r2=1.129\">Version 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 "
@@ -896,7 +1070,7 @@
 "root=www&amp;r1=1.121&amp;r2=1.122\">Version 
1.122</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.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -906,7 +1080,7 @@
 "<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>:澄清
修改不等于改进。"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -919,7 +1093,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 "
@@ -930,7 +1104,7 @@
 "root=www&amp;r1=1.104&amp;r2=1.105\">Version 
1.105</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.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
@@ -940,7 +1114,7 @@
 "root=www&amp;r1=1.91&amp;r2=1.92\">Version 
1.92</a>:阐明混淆(obfuscated)后"
 "的代码不被视作源代码。"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -951,7 +1125,7 @@
 "root=www&amp;r1=1.89&amp;r2=1.90\">Version 
1.90</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.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -961,7 +1135,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">Version 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 "
@@ -973,7 +1147,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.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
@@ -984,7 +1158,7 @@
 "root=www&amp;r1=1.76&amp;r2=1.77\">Version 
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 "
@@ -995,7 +1169,7 @@
 "root=www&amp;r1=1.73&amp;r2=1.74\">Version 
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 "
@@ -1004,7 +1178,7 @@
 
"\"改进\"并不意味着许可证可以限制用户只能做哪些方面的修改。自由度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."
@@ -1012,17 +1186,17 @@
 "用户有权利在自由软件中使用第三方的代ç 
ï¼Œä½†æ˜¯å‰ææ˜¯ç¬¬ä¸‰æ–¹ä»£ç çš„许可证与该自由"
 "软件的许可证兼容。"
 
-#. 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 "
@@ -1032,7 +1206,7 @@
 "root=www&amp;r1=1.56&amp;r2=1.57\">Version 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 "
@@ -1042,7 +1216,7 @@
 "root=www&amp;r1=1.45&amp;r2=1.46\">Version 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 "
@@ -1052,7 +1226,7 @@
 "root=www&amp;r1=1.40&amp;r2=1.41\">Version 
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 "
@@ -1063,7 +1237,7 @@
 "root=www&amp;r1=1.39&amp;r2=1.40\">Version 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 "
@@ -1075,7 +1249,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 "
@@ -1086,7 +1260,7 @@
 "root=www&amp;r1=1.30&amp;r2=1.31\">Version 
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 "
@@ -1096,7 +1270,7 @@
 "root=www&amp;r1=1.22&amp;r2=1.23\">Version 
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 "
@@ -1106,7 +1280,7 @@
 "root=www&amp;r1=1.15&amp;r2=1.16\">Version 
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 "
@@ -1118,7 +1292,7 @@
 "件发布者给原作者提供一份发布的拷贝。该发布者
可以是发布原软件,也可能是发布修"
 "改后的版本。"
 
-#. 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 "
@@ -1134,11 +1308,11 @@
 "root=www&amp;view=log\">CVS日志</a>。"
 
 # type: Content of: <h4>
-#. 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 "
@@ -1169,9 +1343,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
@@ -1179,23 +1351,32 @@
 #.         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 "
+#| "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 ""
-"若您想翻译本文,请参看<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."
 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."
@@ -1224,6 +1405,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=\"/server/standards/README.translations.html"
+#~ "\">翻译手册</a>。"
+
 #~ msgid "Clarifying the line at various points"
 #~ msgstr "澄清几点"
 

Index: free-sw.zh-tw-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-tw-diff.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- free-sw.zh-tw-diff.html     3 Feb 2021 13:03:05 -0000       1.46
+++ free-sw.zh-tw-diff.html     16 Jul 2021 10:02:24 -0000      1.47
@@ -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/02/03 13:03:05 $
+$Date: 2021/07/16 10:02:24 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: free-sw.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-tw.po,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- free-sw.zh-tw.po    3 Feb 2021 13:03:05 -0000       1.67
+++ free-sw.zh-tw.po    16 Jul 2021 10:02:24 -0000      1.68
@@ -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: 2020-02-08 17:05+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Traditional Chinese <www-zh-tw-translators@gnu.org>\n"
@@ -20,7 +20,11 @@
 "X-Generator: Poedit 2.2.4\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 專案 - 自由軟體基金會"
 
 #. type: Attribute 'content' of: <meta>
@@ -41,52 +45,14 @@
 "起源於1983年,持續不斷開發自由的 Unix 風作業系統 
GNU,使電腦使用者能擁有分享"
 "這些軟體並改善的自由。"
 
-#. 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> 向 FSF 合規ç 
”究室詢問相關"
-"事宜。"
-
-#. 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 ""
-"自由軟體(free 
software)的定義界定了一特定軟體是否能合乎自由軟體的準則。為了"
-"更清楚說明或解決一些細微問題,我們會不時修訂這項
定義。請見下方的<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 ""
-"「開放源碼」講的是不一樣的東西:這個詞彙背後代表的價值觀和理念思想大為不同。"
-"即便它在實務上的定義也不相同,但可以說幾乎所有的開源軟體實際上都是自由軟體。"
-"我們在<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, "
@@ -104,7 +70,39 @@
 "借用法文或西班牙文的「libre 
software」來描述自由的「free」,藉此表明這裡講的"
 "並非是免除費用的軟體。"
 
-#. 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 ""
+"「自由軟體」不代表「非商業行為」。自由軟體必é 
ˆèƒ½ä½œç‚ºå•†æ¥­ä½¿ç”¨ã€å•†æ¥­é–‹ç™¼ã€èˆ‡å•†"
+"業散布等。如今商業開發的自由軟體已經相當常見,有這樣的自由商業軟體至關重要。"
+"你可能需要付費取得某自由軟體的副本,但你也可能å…
è²»å–得;無論你是怎樣取得軟體"
+"副本的,你必然享有複製與改動該軟體的自由,甚至也能<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 "
@@ -121,11 +119,184 @@
 
"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 ""
+"「開放源碼」講的是不一樣的東西:這個詞彙背後代表的價值觀和理念思想大為不同。"
+"即便它在實務上的定義也不相同,但可以說幾乎所有的開源軟體實際上都是自由軟體。"
+"我們在<a 
href=\"/philosophy/open-source-misses-the-point.html\">為什麼說「開"
+"源」亡失自由軟體的重點</a>這篇文章中解釋了兩者
間的差異。"
+
+#. 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>
+# | [-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=\"#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>
+# | [-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> 向 FSF 合規ç 
”究室詢問相關"
+"事宜。"
+
+#. 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 ""
+"自由軟體(free 
software)的定義界定了一特定軟體是否能合乎自由軟體的準則。為了"
+"更清楚說明或解決一些細微問題,我們會不時修訂這項
定義。請見下方的<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>"
@@ -133,14 +304,14 @@
 "如果軟體使用者能擁有以下四項
自由,則該程式軟體就是自由軟體︰<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 ""
 "依照你
的想法執行該程式的自由,無論任何目的(自由之零)<a 
href=\"#trans2\">[按"
 "2]</a>。"
 
-#. 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 "
@@ -149,11 +320,11 @@
 "研究該程式如何運作的自由,並依照你
的想法修改它以符合你的運算所需(自由之"
 "壹)。能存取程式的源始碼 (source code) 是這項自由的å…
ˆæ±ºæ¢ä»¶ã€‚"
 
-#. 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 "再次散布程式副本的自由,如此你
就能幫助他人(自由之貳)。"
 
-#. 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 "
@@ -163,7 +334,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 "
@@ -174,7 +345,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 "
@@ -190,7 +361,11 @@
 
"判斷是否甲程式、乙程式皆是自由軟體。然而,如果我們打算修改甲程式讓它不會用到"
 
"乙程式,那麼只有甲程式需要是自由軟體,而乙程式對這樣的做法就不會產生影響。"
 
-#. 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, "
@@ -199,7 +374,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 "
@@ -212,7 +387,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 "
@@ -220,7 +395,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 "
@@ -231,54 +406,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 ""
-"「自由軟體」不代表「非商業行為」。自由軟體必é 
ˆèƒ½ä½œç‚ºå•†æ¥­ä½¿ç”¨ã€å•†æ¥­é–‹ç™¼ã€èˆ‡å•†"
-"業散布等。如今商業開發的自由軟體已經相當常見,有這樣的自由商業軟體至關重要。"
-"你可能需要付費取得某自由軟體的副本,但你也可能å…
è²»å–得;無論你是怎樣取得軟體"
-"副本的,你必然享有複製與改動該軟體的自由,甚至也能<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 "
@@ -295,7 +438,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 "
@@ -307,7 +450,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, "
@@ -318,18 +461,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,
@@ -355,7 +498,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 "
@@ -372,7 +515,7 @@
 
"boot)」——自由之壹便成空中樓閣,而非真實不虛。這樣的二進位檔並非自由軟體,即使"
 "軟體的編譯用源始碼是自由的亦是如此。"
 
-#. 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 "
@@ -384,7 +527,7 @@
 "你合併適當授權的既有模組,例如:要求你必須是你所加å…
¥çš„任意代碼之著作權人——那"
 "麼這樣的授權條款限制性過大,稱不上自由的授權。"
 
-#. 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 "
@@ -393,18 +536,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 "
@@ -417,7 +560,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 "
@@ -427,11 +570,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 ""
@@ -440,7 +597,7 @@
 "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 "
@@ -456,15 +613,30 @@
 "不支援該功能之故)則沒有關係,但當你
發現或發展出解決這個問題的方法時,就必須"
 "擁有再次散布該種軟體形式的自由。"
 
-#. 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>
+# | 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."
@@ -474,7 +646,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/"
@@ -492,11 +664,11 @@
 "自由軟體</a>亦合乎道德。請見<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>
 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 "
@@ -513,7 +685,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 "
@@ -530,7 +702,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 "
@@ -544,21 +716,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>和貿易制裁會限制你在國際"
 "散布軟體的自由。軟體開發者
並沒有權力消除或凌駕這些限制,但他們可以做、且必須"
@@ -566,7 +759,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 "
@@ -580,11 +773,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 "
@@ -596,7 +789,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 "
@@ -608,7 +801,7 @@
 "求你遵循「你
使用之所有軟體程式」的授權條款,剛好使用者
有執行非自由的軟體程"
 
"式,這就需要遵守那些非自由軟體的授權條款;那麼這樣的授權條款便非自由授權。"
 
-#. 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."
@@ -616,11 +809,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-"
@@ -637,7 +830,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 "
@@ -648,44 +841,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 ""
 "最後,當你
在詮釋本篇自由軟體定義中所陳述的準則時請務必謹æ…
Žæ€è€ƒã€‚若要判定某特"
 "定軟體授權是否符合自由軟體授權的定義時,我們便æ 
¹æ“šé€™äº›æº–則來判斷它是否合乎自"
@@ -695,11 +898,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 "
@@ -712,7 +915,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 "
@@ -724,7 +927,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 "
@@ -733,11 +936,60 @@
 "如果真的無法做到,萬一你
真的需要新的授權條款,我們可以協助你確保新的授權條款"
 "成為真正的自由軟體授權,同時避免許多實務上的問題。"
 
-#. 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 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 ""
+"有另一群人開始用「開放源始碼」或「開源」等這些詞彙來表示類同(但並非å
…¨å®Œç­‰"
+"同)「自由軟體」的東西。我們更偏愛「自由軟體」一詞,å›
 ç‚ºä¸€æ—¦ä½ çž­è§£å®ƒæ‰€æè¿°çš„"
+"是自由而非價æ 
¼å¾Œï¼Œé€™æœƒå–šèµ·äººå€‘對自由的關注。至於「開放」一詞,<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 "
@@ -746,18 +998,28 @@
 "跟軟體必須自由一樣,<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 ""
 
"這些論點也同樣適用於日常生活的作品——像是承載有用知識的作品,åŒ
…括教育著作和參"
 "考書等。其中以<a 
href=\"http://zh.wikipedia.org/zh-tw/\";>維基百科</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/\";> "
@@ -767,28 +1029,10 @@
 
"freedomdefined.org/\">自由文化作品</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 ""
-"有另一群人開始用「開放源始碼」或「開源」等這些詞彙來表示類同(但並非å
…¨å®Œç­‰"
-"同)「自由軟體」的東西。我們更偏愛「自由軟體」一詞,å›
 ç‚ºä¸€æ—¦ä½ çž­è§£å®ƒæ‰€æè¿°çš„"
-"是自由而非價æ 
¼å¾Œï¼Œé€™æœƒå–šèµ·äººå€‘對自由的關注。至於「開放」一詞,<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."
@@ -796,7 +1040,7 @@
 
"我們會不時修訂「自由軟體」的定義。這裡是有實際更改的紀錄æ¸
…單,隨附確實指出修"
 "改何處的連結。"
 
-#. 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-]
@@ -822,7 +1066,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>
 # | <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-]
@@ -845,7 +1089,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">1.135 
版</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.152&amp;r2=1.153\">Version 1.153</a>: Clarify that freedom "
@@ -855,7 +1099,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 "
@@ -864,7 +1108,7 @@
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.40&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 "
@@ -874,7 +1118,7 @@
 "root=www&amp;r1=1.134&amp;r2=1.135\">1.135 
版</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.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
@@ -884,7 +1128,7 @@
 "root=www&amp;r1=1.133&amp;r2=1.134\">1.134 
版</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.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
@@ -894,7 +1138,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 "
@@ -905,7 +1149,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 "
@@ -916,7 +1160,7 @@
 "root=www&amp;r1=1.121&amp;r2=1.122\">1.122 
版</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.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
@@ -927,7 +1171,7 @@
 "root=www&amp;r1=1.117&amp;r2=1.118\">1.118 版</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.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -940,7 +1184,7 @@
 "的<em>限制</em>不可接受。著作權持有人永遠
有權同時以不同方式發行著作並賦予額外"
 "<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 "
@@ -951,7 +1195,7 @@
 "root=www&amp;r1=1.104&amp;r2=1.105\">1.105 
版</a>:在自由之壹的簡要聲明中,反"
 "映出(已在 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 "
@@ -961,7 +1205,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 "
@@ -972,7 +1216,7 @@
 "root=www&amp;r1=1.89&amp;r2=1.90\">1.90 版</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.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
@@ -982,7 +1226,7 @@
 "root=www&amp;r1=1.88&amp;r2=1.89\">1.89 版</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.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
@@ -992,7 +1236,7 @@
 "root=www&amp;r1=1.79&amp;r2=1.80\">1.80 版</a>:自由之壹必
得實現,不能只是空"
 "談。例如︰不能接受 Tivo 行為。"
 
-#. type: Content of: <ul><li>
+#. type: Content 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 "
@@ -1003,7 +1247,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 "
@@ -1014,7 +1258,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 "
@@ -1023,21 +1267,21 @@
 "「改善」並不代表授權可實質限制你
可發行何種修改後版本的類型。自由之參包含散布"
 "修改後的版本,不只是更改而已。"
 
-#. 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 "
@@ -1046,7 +1290,7 @@
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.56&amp;r2=1.57\">1.57 
版</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.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
@@ -1056,7 +1300,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 "
@@ -1066,7 +1310,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 "
@@ -1077,7 +1321,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 "
@@ -1088,7 +1332,7 @@
 "root=www&amp;r1=1.38&amp;r2=1.39\">1.39 
版</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.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
@@ -1099,7 +1343,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 "
@@ -1109,7 +1353,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 "
@@ -1119,7 +1363,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 "
@@ -1130,7 +1374,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 "
@@ -1146,11 +1390,11 @@
 "free-sw.html?root=www&amp;view=log\">cvs 網頁界面</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 "
@@ -1194,14 +1438,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 ""
 
"我們努力盡所能提供貼切、品質良善的翻譯。然而,我們無法十å
…¨åç¾Žï¼Œé‚„請將你的意"
@@ -1211,15 +1464,15 @@
 "宜。"
 
 #. 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."
@@ -1250,6 +1503,9 @@
 msgid "Updated:"
 msgstr "更新時間︰"
 
+#~ msgid "Open Source?"
+#~ msgstr "開放源始碼?"
+
 #~ msgid ""
 #~ "The rest of this page clarifies certain points about what makes specific "
 #~ "freedoms adequate or not."



reply via email to

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